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

am f8a910fb: Merge "Fix exceptions in the Flp Hal layer: - JNI exception accessing a geofence method with wrong signature - FlpHardwareProvider exception when the monitoring status contains no location information" into klp-dev

Browse Source 
* commit 'f8a910fbd5b72e3350740d224b36db49dc3170e6':
  Fix exceptions in the Flp Hal layer: - JNI exception accessing a geofence method with wrong signature - FlpHardwareProvider exception when the monitoring status contains no location information
This commit is contained in:
destradaa
2013-09-11 14:17:52 -07:00
committed by Android Git Automerger
parent 18149fcf86 f8a910fbd5
commit 55a7077756
2 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
services/java/com/android/server/location/FlpHardwareProvider.java
View File

@@ -141,10 +141,16 @@ public class FlpHardwareProvider {
}
private void onGeofenceMonitorStatus(int status, int source, Location location) {
// allow the location to be optional in this event
Location updatedLocation = null;
if(location != null) {
updatedLocation = updateLocationInformation(location);
}
getGeofenceHardwareSink().reportGeofenceMonitorStatus(
GeofenceHardware.MONITORING_TYPE_FUSED_HARDWARE,
status,
updateLocationInformation(location),
updatedLocation,
source);
}

2
services/jni/com_android_server_location_FlpHardwareProvider.cpp
View File

@@ -318,7 +318,7 @@ static void TranslateGeofenceFromGeofenceHardwareRequestParcelable(
jmethodID getNotificationResponsiveness = env->GetMethodID(
geofenceRequestClass,
"getNotificationResponsiveness",
"()D");
"()I");
options->notification_responsivenes_ms = env->CallIntMethod(
geofenceRequestObject,
getNotificationResponsiveness);