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

Merge "Added defensive code to prevent system crash" into nyc-dev

Browse Source
This commit is contained in:
Lifu Tang
2016-04-20 22:19:17 +00:00
committed by Android (Google) Code Review
parent e1b51715bd 8b7ad976bf
commit a381455472
1 changed files with 10 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
services/core/jni/com_android_server_location_FlpHardwareProvider.cpp
View File

@@ -661,6 +661,16 @@ static void GeofenceMonitorStatusCallback(
TranslateToObject(lastLocation, locationObject); TranslateToObject(lastLocation, locationObject);
} }
// sCallbacksObject is created when FlpHardwareProvider on Java side is
// initialized. Sometimes the hardware may call this function before the Java
// side is ready. In order to prevent the system crash, check whether
// sCallbacksObj has been created. If not, simply ignore this event from
// hardware.
if (sCallbacksObj == NULL) {
ALOGE("FlpHardwareProvider hasn't been initialized.");
return;
}
sCallbackEnv->CallVoidMethod( sCallbackEnv->CallVoidMethod(
sCallbacksObj, sCallbacksObj,
sOnGeofenceMonitorStatus, sOnGeofenceMonitorStatus,