diff options
| author | 2018-01-04 21:38:29 +0000 | |
|---|---|---|
| committer | 2018-01-04 21:38:29 +0000 | |
| commit | dfaa392fd5646f7dc0781e91198b0a363021a2bb (patch) | |
| tree | 1c1f37ea66fcc41b8ebe91d4fbf86c660ee3b70b | |
| parent | def6d70aee4cd2210c63a9ed9b051e5fbaf1925e (diff) | |
| parent | c8728e964b32a226749d56589e65762f08073908 (diff) | |
Merge changes I1a61a5c9,I7e0dc28f,If0c923b3
* changes:
Rethrow RemoteException instead of log in ContextHubManager
Remove unnecessary log from ContextHubManager
Remove legacy bug comment in NanoAppInstanceInfo
| -rw-r--r-- | core/java/android/hardware/location/ContextHubManager.java | 4 | ||||
| -rw-r--r-- | core/java/android/hardware/location/NanoAppInstanceInfo.java | 5 |
2 files changed, 1 insertions, 8 deletions
diff --git a/core/java/android/hardware/location/ContextHubManager.java b/core/java/android/hardware/location/ContextHubManager.java index be1efdea0260..de13c8132a65 100644 --- a/core/java/android/hardware/location/ContextHubManager.java +++ b/core/java/android/hardware/location/ContextHubManager.java @@ -744,8 +744,6 @@ public final class ContextHubManager { synchronized (this) { mLocalCallback.onMessageReceipt(hubId, nanoAppId, message); } - } else { - Log.d(TAG, "Context hub manager client callback is NULL"); } } }; @@ -759,7 +757,7 @@ public final class ContextHubManager { try { mService.registerCallback(mClientCallback); } catch (RemoteException e) { - Log.w(TAG, "Could not register callback:" + e); + throw e.rethrowFromSystemServer(); } } } diff --git a/core/java/android/hardware/location/NanoAppInstanceInfo.java b/core/java/android/hardware/location/NanoAppInstanceInfo.java index f73fd87b1a19..c00819bde6dc 100644 --- a/core/java/android/hardware/location/NanoAppInstanceInfo.java +++ b/core/java/android/hardware/location/NanoAppInstanceInfo.java @@ -90,11 +90,6 @@ public class NanoAppInstanceInfo { /** * Get the application version * - * NOTE: There is a race condition where shortly after loading, this - * may return -1 instead of the correct version. - * - * TODO(b/30970527): Fix this race condition. - * * @return int - version of the app */ public int getAppVersion() { |