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

Commit 1c52d026 authored by destradaa's avatar destradaa Committed by Android (Google) Code Review
Browse files

Merge "Mark FLP constants as public, so they can be consumed by geofencing."

parents 633f0e87 17ff2b2b

api/current.txt

+2 −0
Original line number Diff line number Diff line
@@ -12995,12 +12995,14 @@ package android.hardware.location { 
    field public static final int GEOFENCE_ENTERED = 1; // 0x1

    field public static final int GEOFENCE_ERROR_ID_EXISTS = 2; // 0x2

    field public static final int GEOFENCE_ERROR_ID_UNKNOWN = 3; // 0x3

    field public static final int GEOFENCE_ERROR_INSUFFICIENT_MEMORY = 6; // 0x6

    field public static final int GEOFENCE_ERROR_INVALID_TRANSITION = 4; // 0x4

    field public static final int GEOFENCE_ERROR_TOO_MANY_GEOFENCES = 1; // 0x1

    field public static final int GEOFENCE_EXITED = 2; // 0x2

    field public static final int GEOFENCE_FAILURE = 5; // 0x5

    field public static final int GEOFENCE_SUCCESS = 0; // 0x0

    field public static final int GEOFENCE_UNCERTAIN = 4; // 0x4

    field public static final int MONITORING_TYPE_FUSED_HARDWARE = 1; // 0x1

    field public static final int MONITORING_TYPE_GPS_HARDWARE = 0; // 0x0

    field public static final int MONITOR_CURRENTLY_AVAILABLE = 0; // 0x0

    field public static final int MONITOR_CURRENTLY_UNAVAILABLE = 1; // 0x1

core/java/android/hardware/location/GeofenceHardware.java

+0 −4
Original line number Diff line number Diff line
@@ -56,8 +56,6 @@ public final class GeofenceHardware { 


    /**

     * Constant for geofence monitoring done by the Fused hardware.

     *

     * @hide

     */

    public static final int MONITORING_TYPE_FUSED_HARDWARE = 1;
@@ -128,8 +126,6 @@ public final class GeofenceHardware { 


    /**

     * The constant used to indicate that the operation failed due to insufficient memory.

     *

     * @hide

     */

    public static final int GEOFENCE_ERROR_INSUFFICIENT_MEMORY = 6;

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

+2 −3
Original line number Diff line number Diff line
@@ -420,9 +420,8 @@ public class FlpHardwareProvider { 
                return GeofenceHardware.GEOFENCE_SUCCESS;

            case FLP_RESULT_ERROR:

                return GeofenceHardware.GEOFENCE_FAILURE;

            // TODO: uncomment this once the ERROR definition is marked public

            //case FLP_RESULT_INSUFFICIENT_MEMORY:

            //    return GeofenceHardware.GEOFENCE_ERROR_INSUFFICIENT_MEMORY;

            case FLP_RESULT_INSUFFICIENT_MEMORY:

                return GeofenceHardware.GEOFENCE_ERROR_INSUFFICIENT_MEMORY;

            case FLP_RESULT_TOO_MANY_GEOFENCES:

                return GeofenceHardware.GEOFENCE_ERROR_TOO_MANY_GEOFENCES;

            case FLP_RESULT_ID_EXISTS: