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

ContextHubService: Avoid uninitialized handle

Browse Source 
am: 9d4d881cc5

Change-Id: I51c7914c86596c0f9bffc48b6fd08981ef7ea5d9
This commit is contained in:
Greg Kaiser
2016-08-26 05:59:45 +00:00
committed by android-build-merger
parent a0ce60d36f 9d4d881cc5
commit b70ed04911
1 changed files with 27 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
core/jni/android_hardware_location_ContextHubService.cpp
View File

@@ -35,6 +35,7 @@
#include "core_jni_helpers.h" #include "core_jni_helpers.h"
static constexpr jint OS_APP_ID = -1; static constexpr jint OS_APP_ID = -1;
static constexpr jint INVALID_APP_ID = -2;
static constexpr uint64_t ALL_APPS = UINT64_C(0xFFFFFFFFFFFFFFFF); static constexpr uint64_t ALL_APPS = UINT64_C(0xFFFFFFFFFFFFFFFF);
static constexpr jint MIN_APP_ID = 1; static constexpr jint MIN_APP_ID = 1;
@@ -665,7 +666,7 @@ void closeUnloadTxn(bool success) {
closeTxn(); closeTxn();
} }
void closeLoadTxn(bool success, jint *appInstanceHandle) { static bool closeLoadTxn(bool success, jint *appInstanceHandle) {
void *txnData; void *txnData;
hub_messages_e txnId; hub_messages_e txnId;
@@ -679,13 +680,17 @@ void closeLoadTxn(bool success, jint *appInstanceHandle) {
add_app_instance(&info->appInfo, info->hubHandle, info->instanceId, env); add_app_instance(&info->appInfo, info->hubHandle, info->instanceId, env);
} else { } else {
ALOGW("Could not attach to JVM !"); ALOGW("Could not attach to JVM !");
success = false;
} }
sendQueryForApps(info->appInfo.app_name.id); sendQueryForApps(info->appInfo.app_name.id);
} else { } else {
ALOGW("Could not load the app successfully ! Unexpected failure"); ALOGW("Could not load the app successfully ! Unexpected failure");
*appInstanceHandle = INVALID_APP_ID;
success = false;
} }
closeTxn(); closeTxn();
return success;
} }
static bool isValidOsStatus(const uint8_t *msg, size_t msgLen, static bool isValidOsStatus(const uint8_t *msg, size_t msgLen,
@@ -742,8 +747,27 @@ static int handle_os_message(uint32_t msgType, uint32_t hubHandle,
case CONTEXT_HUB_UNLOAD_APP: case CONTEXT_HUB_UNLOAD_APP:
if (isValidOsStatus(msg, msgLen, &rsp)) { if (isValidOsStatus(msg, msgLen, &rsp)) {
if (msgType == CONTEXT_HUB_LOAD_APP) { if (msgType == CONTEXT_HUB_LOAD_APP) {
jint appInstanceHandle; jint appInstanceHandle = INVALID_APP_ID;
closeLoadTxn(rsp.result == 0, &appInstanceHandle); bool appRunningOnHub = (rsp.result == 0);
if (!(closeLoadTxn(appRunningOnHub, &appInstanceHandle))) {
if (appRunningOnHub) {
// Now we're in an odd situation. Our nanoapp
// is up and running on the Context Hub. However,
// something went wrong in our Service code so that
// we're not able to properly track this nanoapp
// in our Service code. If we tell the Java layer
// things are good, it's a lie because the handle
// we give them will fail when used with the Service.
// If we tell the Java layer this failed, it's kind
// of a lie as well, since this nanoapp is running.
//
// We leave a more robust fix for later, and for
// now just tell the user things have failed.
//
// TODO(b/30835981): Make this situation better.
rsp.result = -1;
}
}
passOnOsResponse(hubHandle, msgType, &rsp, (int8_t *)(&appInstanceHandle), passOnOsResponse(hubHandle, msgType, &rsp, (int8_t *)(&appInstanceHandle),
sizeof(appInstanceHandle)); sizeof(appInstanceHandle));
} else if (msgType == CONTEXT_HUB_UNLOAD_APP) { } else if (msgType == CONTEXT_HUB_UNLOAD_APP) {