diff options
| author | Greg Kaiser <gkaiser@google.com> | 2016-08-26 03:29:19 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2016-08-26 03:29:21 +0000 |
| commit | 6ef2cee6058e2ee61a2cb60b0cc0f02343bba14c (patch) | |
| tree | 678e5adfcd2a371ffba267f482cb5dfd3a29bf4d /core/java/android | |
| parent | 592552220ba7bdb4b8c5847aead02e60968c9ed5 (diff) | |
| parent | 10163d0dd25d637ac91f91cb8138d7dce07503fb (diff) | |
Merge changes I896af608,I2e2a65bc,I8d9ae8b9,Ibb07666a into nyc-mr1-dev
* changes:
ContextHubService: Fix app query
ContextHubService: Don't double report app loads
ContextHubService: Make app handle size match Java
ContextHubService: Update caches on nanoapp unload
Diffstat (limited to 'core/java/android')
| -rw-r--r-- | core/java/android/hardware/location/ContextHubService.java | 11 | ||||
| -rw-r--r-- | core/java/android/hardware/location/NanoAppInstanceInfo.java | 7 |
2 files changed, 15 insertions, 3 deletions
diff --git a/core/java/android/hardware/location/ContextHubService.java b/core/java/android/hardware/location/ContextHubService.java index 062c9580c1e4..a699b687918b 100644 --- a/core/java/android/hardware/location/ContextHubService.java +++ b/core/java/android/hardware/location/ContextHubService.java @@ -322,9 +322,16 @@ public class ContextHubService extends IContextHubService.Stub { appInfo.setNeededReadMemBytes(PRE_LOADED_APP_MEM_REQ); appInfo.setNeededWriteMemBytes(PRE_LOADED_APP_MEM_REQ); + String action; + if (mNanoAppHash.containsKey(appInstanceHandle)) { + action = "Updated"; + } else { + action = "Added"; + } + mNanoAppHash.put(appInstanceHandle, appInfo); - Log.d(TAG, "Added app instance " + appInstanceHandle + " with id " + appId - + " version " + appVersion); + Log.d(TAG, action + " app instance " + appInstanceHandle + " with id " + + appId + " version " + appVersion); return 0; } diff --git a/core/java/android/hardware/location/NanoAppInstanceInfo.java b/core/java/android/hardware/location/NanoAppInstanceInfo.java index 71a5a8816f58..ac6d83f622b2 100644 --- a/core/java/android/hardware/location/NanoAppInstanceInfo.java +++ b/core/java/android/hardware/location/NanoAppInstanceInfo.java @@ -113,7 +113,12 @@ public class NanoAppInstanceInfo { } /** - * Set the application version + * 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 */ |