Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "ContextHubService: Don't change app handle on load" into nyc-mr1-dev

Browse Source
This commit is contained in:
Greg Kaiser
2016-09-08 05:37:25 +00:00
committed by Android (Google) Code Review
parent 23af4ec04b b0604ecc91
commit a519a5fb34
1 changed files with 2 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
core/jni/android_hardware_location_ContextHubService.cpp
View File

@@ -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;