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

@EnforcePermission migrations - framework-minus-apex

Browse Source 
Immediate calls to Context.enforceCallingOrPermission.  Fixes
applied by Android Lint (cl/18432857).

Bug: 232058525
Test: N/A
Change-Id: I1f53b24fe870a95aaacb97164138bb6dd2afaafc
This commit is contained in:
mattgilbride
2022-07-06 01:41:05 +00:00
parent 5f27b968ca
commit d038c746f1
2 changed files with 16 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
core/java/android/hardware/location/GeofenceHardwareService.java
View File

@@ -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,

8
core/java/android/hardware/location/IGeofenceHardware.aidl
View File

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