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

services/java/com/android/server/location/FlpHardwareProvider.java

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

services/jni/com_android_server_location_FlpHardwareProvider.cpp

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