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

Merge "Do not call noteOp if checkPermission fails"

Browse Source 
am: bc9b1b6f94

Change-Id: I53347c7a897b079268d9c8af704664a832eae581
This commit is contained in:
Chad Brubaker
2019-03-07 01:10:53 -08:00
committed by android-build-merger
parent dc1077d5db bc9b1b6f94
commit e23da7135a
1 changed files with 15 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
telephony/java/android/telephony/LocationAccessPolicy.java
View File

@@ -174,22 +174,22 @@ public final class LocationAccessPolicy {
boolean hasManifestPermission = checkManifestPermission(context, query.callingPid, boolean hasManifestPermission = checkManifestPermission(context, query.callingPid,
query.callingUid, permissionToCheck); query.callingUid, permissionToCheck);
int appOpMode = context.getSystemService(AppOpsManager.class)
.noteOpNoThrow(AppOpsManager.permissionToOpCode(permissionToCheck),
query.callingUid, query.callingPackage);
if (hasManifestPermission && appOpMode == AppOpsManager.MODE_ALLOWED) {
// If the app did everything right, return without logging.
return LocationPermissionResult.ALLOWED;
}
// If the app has the manifest permission but not the app-op permission, it means that
// it's aware of the requirement and the user denied permission explicitly. If we see
// this, don't let any of the overrides happen.
if (hasManifestPermission) { if (hasManifestPermission) {
Log.i(TAG, query.callingPackage + " is aware of " + locationTypeForLog + " but the" // Only check the app op if the app has the permission.
+ " app-ops permission is specifically denied."); int appOpMode = context.getSystemService(AppOpsManager.class)
return appOpsModeToPermissionResult(appOpMode); .noteOpNoThrow(AppOpsManager.permissionToOpCode(permissionToCheck),
query.callingUid, query.callingPackage);
if (appOpMode == AppOpsManager.MODE_ALLOWED) {
// If the app did everything right, return without logging.
return LocationPermissionResult.ALLOWED;
} else {
// If the app has the manifest permission but not the app-op permission, it means
// that it's aware of the requirement and the user denied permission explicitly.
// If we see this, don't let any of the overrides happen.
Log.i(TAG, query.callingPackage + " is aware of " + locationTypeForLog + " but the"
+ " app-ops permission is specifically denied.");
return appOpsModeToPermissionResult(appOpMode);
}
} }
int minSdkVersion = Manifest.permission.ACCESS_FINE_LOCATION.equals(permissionToCheck) int minSdkVersion = Manifest.permission.ACCESS_FINE_LOCATION.equals(permissionToCheck)