diff options
| -rw-r--r-- | core/java/android/hardware/location/GeofenceHardwareService.java | 24 | ||||
| -rw-r--r-- | core/java/android/hardware/location/IGeofenceHardware.aidl | 8 |
2 files changed, 16 insertions, 16 deletions
diff --git a/core/java/android/hardware/location/GeofenceHardwareService.java b/core/java/android/hardware/location/GeofenceHardwareService.java index c0bcb273f9b7..106bfd56a7af 100644 --- a/core/java/android/hardware/location/GeofenceHardwareService.java +++ b/core/java/android/hardware/location/GeofenceHardwareService.java @@ -75,76 +75,68 @@ public class GeofenceHardwareService extends Service { mGeofenceHardwareImpl.setFusedGeofenceHardware(service); } + @android.annotation.EnforcePermission(android.Manifest.permission.LOCATION_HARDWARE) @Override public int[] getMonitoringTypes() { - mContext.enforceCallingPermission(Manifest.permission.LOCATION_HARDWARE, - "Location Hardware permission not granted to access hardware geofence"); return mGeofenceHardwareImpl.getMonitoringTypes(); } + @android.annotation.EnforcePermission(android.Manifest.permission.LOCATION_HARDWARE) @Override public int getStatusOfMonitoringType(int monitoringType) { - mContext.enforceCallingPermission(Manifest.permission.LOCATION_HARDWARE, - "Location Hardware permission not granted to access hardware geofence"); return mGeofenceHardwareImpl.getStatusOfMonitoringType(monitoringType); } + @android.annotation.EnforcePermission(android.Manifest.permission.LOCATION_HARDWARE) @Override public boolean addCircularFence( int monitoringType, GeofenceHardwareRequestParcelable request, IGeofenceHardwareCallback callback) { - mContext.enforceCallingPermission(Manifest.permission.LOCATION_HARDWARE, - "Location Hardware permission not granted to access hardware geofence"); checkPermission(Binder.getCallingPid(), Binder.getCallingUid(), monitoringType); return mGeofenceHardwareImpl.addCircularFence(monitoringType, request, callback); } + @android.annotation.EnforcePermission(android.Manifest.permission.LOCATION_HARDWARE) @Override public boolean removeGeofence(int id, int monitoringType) { - mContext.enforceCallingPermission(Manifest.permission.LOCATION_HARDWARE, - "Location Hardware permission not granted to access hardware geofence"); checkPermission(Binder.getCallingPid(), Binder.getCallingUid(), monitoringType); return mGeofenceHardwareImpl.removeGeofence(id, monitoringType); } + @android.annotation.EnforcePermission(android.Manifest.permission.LOCATION_HARDWARE) @Override public boolean pauseGeofence(int id, int monitoringType) { - mContext.enforceCallingPermission(Manifest.permission.LOCATION_HARDWARE, - "Location Hardware permission not granted to access hardware geofence"); checkPermission(Binder.getCallingPid(), Binder.getCallingUid(), monitoringType); return mGeofenceHardwareImpl.pauseGeofence(id, monitoringType); } + @android.annotation.EnforcePermission(android.Manifest.permission.LOCATION_HARDWARE) @Override public boolean resumeGeofence(int id, int monitoringType, int monitorTransitions) { - mContext.enforceCallingPermission(Manifest.permission.LOCATION_HARDWARE, - "Location Hardware permission not granted to access hardware geofence"); checkPermission(Binder.getCallingPid(), Binder.getCallingUid(), monitoringType); return mGeofenceHardwareImpl.resumeGeofence(id, monitoringType, monitorTransitions); } + @android.annotation.EnforcePermission(android.Manifest.permission.LOCATION_HARDWARE) @Override public boolean registerForMonitorStateChangeCallback(int monitoringType, IGeofenceHardwareMonitorCallback callback) { - mContext.enforceCallingPermission(Manifest.permission.LOCATION_HARDWARE, - "Location Hardware permission not granted to access hardware geofence"); checkPermission(Binder.getCallingPid(), Binder.getCallingUid(), monitoringType); return mGeofenceHardwareImpl.registerForMonitorStateChangeCallback(monitoringType, callback); } + @android.annotation.EnforcePermission(android.Manifest.permission.LOCATION_HARDWARE) @Override public boolean unregisterForMonitorStateChangeCallback(int monitoringType, IGeofenceHardwareMonitorCallback callback) { - mContext.enforceCallingPermission(Manifest.permission.LOCATION_HARDWARE, - "Location Hardware permission not granted to access hardware geofence"); checkPermission(Binder.getCallingPid(), Binder.getCallingUid(), monitoringType); return mGeofenceHardwareImpl.unregisterForMonitorStateChangeCallback(monitoringType, diff --git a/core/java/android/hardware/location/IGeofenceHardware.aidl b/core/java/android/hardware/location/IGeofenceHardware.aidl index 0e840c4906fd..41804addbcba 100644 --- a/core/java/android/hardware/location/IGeofenceHardware.aidl +++ b/core/java/android/hardware/location/IGeofenceHardware.aidl @@ -26,17 +26,25 @@ import android.hardware.location.IGeofenceHardwareMonitorCallback; interface IGeofenceHardware { void setGpsGeofenceHardware(in IGpsGeofenceHardware service); void setFusedGeofenceHardware(in IFusedGeofenceHardware service); + @EnforcePermission("LOCATION_HARDWARE") int[] getMonitoringTypes(); + @EnforcePermission("LOCATION_HARDWARE") int getStatusOfMonitoringType(int monitoringType); + @EnforcePermission("LOCATION_HARDWARE") boolean addCircularFence( int monitoringType, in GeofenceHardwareRequestParcelable request, in IGeofenceHardwareCallback callback); + @EnforcePermission("LOCATION_HARDWARE") boolean removeGeofence(int id, int monitoringType); + @EnforcePermission("LOCATION_HARDWARE") boolean pauseGeofence(int id, int monitoringType); + @EnforcePermission("LOCATION_HARDWARE") boolean resumeGeofence(int id, int monitoringType, int monitorTransitions); + @EnforcePermission("LOCATION_HARDWARE") boolean registerForMonitorStateChangeCallback(int monitoringType, IGeofenceHardwareMonitorCallback callback); + @EnforcePermission("LOCATION_HARDWARE") boolean unregisterForMonitorStateChangeCallback(int monitoringType, IGeofenceHardwareMonitorCallback callback); } |