Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9d820c58 authored by destradaa's avatar destradaa Committed by Android Git Automerger
Browse files

am 55a70777: am f8a910fb: Merge "Fix exceptions in the Flp Hal layer: - JNI... 

am 55a70777: 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

* commit '55a70777':
  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
parents a395e701 55a70777

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

+7 −1
Original line number Diff line number Diff line
@@ -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

+1 −1
Original line number Diff line number Diff line
@@ -318,7 +318,7 @@ static void TranslateGeofenceFromGeofenceHardwareRequestParcelable( 
  jmethodID getNotificationResponsiveness = env->GetMethodID(

      geofenceRequestClass,

      "getNotificationResponsiveness",

      "()D");

      "()I");

  options->notification_responsivenes_ms = env->CallIntMethod(

      geofenceRequestObject,

      getNotificationResponsiveness);