ContextHubService: Don't change app handle on load am: b0604ecc91 am: 0bffa9bd65

am: f28d584fab

Change-Id: I5ff853da7ce350919546ba2eb93f4fe4df987558

1 files changed, 2 insertions, 10 deletions

diff --git a/core/jni/android_hardware_location_ContextHubService.cpp b/core/jni/android_hardware_location_ContextHubService.cpp
index 36444102fb07..a24aa3191dc1 100644
--- a/core/jni/android_hardware_location_ContextHubService.cpp
+++ b/core/jni/android_hardware_location_ContextHubService.cpp
@@ -393,16 +393,8 @@ static jint add_app_instance(const hub_app_info *appInfo, uint32_t hubHandle,
     app_instance_info_s entry;
     assert(appInfo);
 
-    const char *action = "Updated";
-    if (db.appInstances.count(appInstanceHandle) == 0) {
-        action = "Added";
-        appInstanceHandle = generate_id();
-        if (appInstanceHandle < 0) {
-            ALOGE("Cannot find resources to add app instance %" PRId32,
-                  appInstanceHandle);
-            return -1;
-        }
-    }
+    const char *action =
+        (db.appInstances.count(appInstanceHandle) == 0) ? "Added" : "Updated";
 
     entry.appInfo = *appInfo;