Fix a bug in the scoped permission grant
Change-Id: Iaed201396217f3d982a9454676b4a82fa6102754
(cherry picked from commit 36edb5cbd75b91176912e294b7effc0dbd688557)
diff --git a/src/com/android/packageinstaller/permission/ui/GrantPermissionsActivity.java b/src/com/android/packageinstaller/permission/ui/GrantPermissionsActivity.java
index eea9a0a..2800a1e 100644
--- a/src/com/android/packageinstaller/permission/ui/GrantPermissionsActivity.java
+++ b/src/com/android/packageinstaller/permission/ui/GrantPermissionsActivity.java
@@ -433,18 +433,18 @@
private static String[] computeAffectedPermissions(PackageInfo callingPkg,
String permission) {
- // For M apps all permissions are affected.
- if (callingPkg.applicationInfo.targetSdkVersion <= Build.VERSION_CODES.M) {
+ // For <= N_MR1 apps all permissions are affected.
+ if (callingPkg.applicationInfo.targetSdkVersion <= Build.VERSION_CODES.N_MR1) {
return null;
}
- // For M+ apps only the requested permission is affected with addition
- // to splits of this permission applicable to apps targeting M.
+ // For N_MR1+ apps only the requested permission is affected with addition
+ // to splits of this permission applicable to apps targeting N_MR1.
String[] permissions = new String[] {permission};
for (PackageParser.SplitPermissionInfo splitPerm : PackageParser.SPLIT_PERMISSIONS) {
- if (splitPerm.targetSdk <= Build.VERSION_CODES.M
+ if (splitPerm.targetSdk <= Build.VERSION_CODES.N_MR1
|| callingPkg.applicationInfo.targetSdkVersion >= splitPerm.targetSdk
- || !ArrayUtils.contains(callingPkg.requestedPermissions, splitPerm.rootPerm)) {
+ || !permission.equals(splitPerm.rootPerm)) {
continue;
}
for (int i = 0; i < splitPerm.newPerms.length; i++) {
