From a5d70a17ebd1b3ffe026879c5d9d96f04d10d4f2 Mon Sep 17 00:00:00 2001 From: Chad Brubaker Date: Thu, 23 Mar 2017 11:04:50 -0700 Subject: [PATCH] Allow permissions to be runtime-only. This adds the new runtime protection level flag that if set means the permission can only be granted to apps that target runtime permissions (>= M). ANSWER_PHONE_CALLS has also been made runtime-only. Bug: 30932767 Test: cts-tradefed run commandAndExit cts-dev -m CtsPermission2TestCases Change-Id: I42b30414c808730f2d5961ca31b6e3db740b8cf7 --- api/current.txt | 1 + api/system-current.txt | 1 + api/test-current.txt | 1 + core/java/android/content/pm/PackageParser.java | 1 + core/java/android/content/pm/PermissionInfo.java | 10 ++++++++++ core/res/AndroidManifest.xml | 2 +- core/res/res/values/attrs_manifest.xml | 4 ++++ .../java/com/android/server/pm/BasePermission.java | 4 ++++ .../com/android/server/pm/PackageManagerService.java | 11 +++++++++-- 9 files changed, 32 insertions(+), 3 deletions(-) diff --git a/api/current.txt b/api/current.txt index c99f3251a28e9..642a1d2f7c257 100644 --- a/api/current.txt +++ b/api/current.txt @@ -10801,6 +10801,7 @@ package android.content.pm { field public static final int PROTECTION_FLAG_PRE23 = 128; // 0x80 field public static final int PROTECTION_FLAG_PREINSTALLED = 1024; // 0x400 field public static final int PROTECTION_FLAG_PRIVILEGED = 16; // 0x10 + field public static final int PROTECTION_FLAG_RUNTIME_ONLY = 8192; // 0x2000 field public static final int PROTECTION_FLAG_SETUP = 2048; // 0x800 field public static final deprecated int PROTECTION_FLAG_SYSTEM = 16; // 0x10 field public static final int PROTECTION_FLAG_VERIFIER = 512; // 0x200 diff --git a/api/system-current.txt b/api/system-current.txt index 222f706fb4c80..23615193eb48b 100644 --- a/api/system-current.txt +++ b/api/system-current.txt @@ -11519,6 +11519,7 @@ package android.content.pm { field public static final int PROTECTION_FLAG_PRE23 = 128; // 0x80 field public static final int PROTECTION_FLAG_PREINSTALLED = 1024; // 0x400 field public static final int PROTECTION_FLAG_PRIVILEGED = 16; // 0x10 + field public static final int PROTECTION_FLAG_RUNTIME_ONLY = 8192; // 0x2000 field public static final int PROTECTION_FLAG_SETUP = 2048; // 0x800 field public static final deprecated int PROTECTION_FLAG_SYSTEM = 16; // 0x10 field public static final int PROTECTION_FLAG_VERIFIER = 512; // 0x200 diff --git a/api/test-current.txt b/api/test-current.txt index 387d14c651474..e9ed54466dfce 100644 --- a/api/test-current.txt +++ b/api/test-current.txt @@ -10841,6 +10841,7 @@ package android.content.pm { field public static final int PROTECTION_FLAG_PRE23 = 128; // 0x80 field public static final int PROTECTION_FLAG_PREINSTALLED = 1024; // 0x400 field public static final int PROTECTION_FLAG_PRIVILEGED = 16; // 0x10 + field public static final int PROTECTION_FLAG_RUNTIME_ONLY = 8192; // 0x2000 field public static final int PROTECTION_FLAG_SETUP = 2048; // 0x800 field public static final deprecated int PROTECTION_FLAG_SYSTEM = 16; // 0x10 field public static final int PROTECTION_FLAG_VERIFIER = 512; // 0x200 diff --git a/core/java/android/content/pm/PackageParser.java b/core/java/android/content/pm/PackageParser.java index 9457d158b139a..47735683548bd 100644 --- a/core/java/android/content/pm/PackageParser.java +++ b/core/java/android/content/pm/PackageParser.java @@ -3114,6 +3114,7 @@ public class PackageParser { if ((perm.info.protectionLevel&PermissionInfo.PROTECTION_MASK_FLAGS) != 0) { if ( (perm.info.protectionLevel&PermissionInfo.PROTECTION_FLAG_EPHEMERAL) == 0 + && (perm.info.protectionLevel&PermissionInfo.PROTECTION_FLAG_RUNTIME_ONLY) == 0 && (perm.info.protectionLevel&PermissionInfo.PROTECTION_MASK_BASE) != PermissionInfo.PROTECTION_SIGNATURE) { outError[0] = " protectionLevel specifies a non-ephemeral flag but is " diff --git a/core/java/android/content/pm/PermissionInfo.java b/core/java/android/content/pm/PermissionInfo.java index 0703138287ba1..694e607815465 100644 --- a/core/java/android/content/pm/PermissionInfo.java +++ b/core/java/android/content/pm/PermissionInfo.java @@ -130,6 +130,13 @@ public class PermissionInfo extends PackageItemInfo implements Parcelable { @TestApi public static final int PROTECTION_FLAG_EPHEMERAL = 0x1000; + /** + * Additional flag for {@link #protectionLevel}, corresponding + * to the runtime value of + * {@link android.R.attr#protectionLevel}. + */ + public static final int PROTECTION_FLAG_RUNTIME_ONLY = 0x2000; + /** * Mask for {@link #protectionLevel}: the basic protection type. */ @@ -250,6 +257,9 @@ public class PermissionInfo extends PackageItemInfo implements Parcelable { if ((level&PermissionInfo.PROTECTION_FLAG_EPHEMERAL) != 0) { protLevel += "|ephemeral"; } + if ((level&PermissionInfo.PROTECTION_FLAG_RUNTIME_ONLY) != 0) { + protLevel += "|runtime"; + } return protLevel; } diff --git a/core/res/AndroidManifest.xml b/core/res/AndroidManifest.xml index e7a447c54aefe..8e7f9d2119a54 100644 --- a/core/res/AndroidManifest.xml +++ b/core/res/AndroidManifest.xml @@ -913,7 +913,7 @@ android:permissionGroup="android.permission-group.PHONE" android:label="@string/permlab_answerPhoneCalls" android:description="@string/permdesc_answerPhoneCalls" - android:protectionLevel="dangerous" /> + android:protectionLevel="dangerous|runtime" /> diff --git a/core/res/res/values/attrs_manifest.xml b/core/res/res/values/attrs_manifest.xml index ed5a42b707f72..3e4b66d780adf 100644 --- a/core/res/res/values/attrs_manifest.xml +++ b/core/res/res/values/attrs_manifest.xml @@ -245,6 +245,10 @@ + + diff --git a/services/core/java/com/android/server/pm/BasePermission.java b/services/core/java/com/android/server/pm/BasePermission.java index 07c9dec7b3532..21000388e7464 100644 --- a/services/core/java/com/android/server/pm/BasePermission.java +++ b/services/core/java/com/android/server/pm/BasePermission.java @@ -98,4 +98,8 @@ final class BasePermission { public boolean isInstant() { return (protectionLevel & PermissionInfo.PROTECTION_FLAG_EPHEMERAL) != 0; } + + public boolean isRuntimeOnly() { + return (protectionLevel & PermissionInfo.PROTECTION_FLAG_RUNTIME_ONLY) != 0; + } } diff --git a/services/core/java/com/android/server/pm/PackageManagerService.java b/services/core/java/com/android/server/pm/PackageManagerService.java index d89b12e352151..965e28ec234ca 100644 --- a/services/core/java/com/android/server/pm/PackageManagerService.java +++ b/services/core/java/com/android/server/pm/PackageManagerService.java @@ -2052,6 +2052,7 @@ public class PackageManagerService extends IPackageManager.Stub { } if (bp != null && (bp.isRuntime() || bp.isDevelopment()) && (!instantApp || bp.isInstant()) + && (supportsRuntimePermissions || !bp.isRuntimeOnly()) && (grantedPermissions == null || ArrayUtils.contains(grantedPermissions, permission))) { final int flags = permissionsState.getPermissionFlags(permission, userId); @@ -11384,6 +11385,8 @@ public class PackageManagerService extends IPackageManager.Stub { for (int i=0; i= Build.VERSION_CODES.M; if (DEBUG_INSTALL) { Log.i(TAG, "Package " + pkg.packageName + " checking " + name + ": " + bp); @@ -11405,6 +11408,12 @@ public class PackageManagerService extends IPackageManager.Stub { continue; } + if (bp.isRuntimeOnly() && !appSupportsRuntimePermissions) { + Log.i(TAG, "Denying runtime-only permission " + bp.name + " for package " + + pkg.packageName); + continue; + } + final String perm = bp.name; boolean allowedSig = false; int grant = GRANT_DENIED; @@ -11420,8 +11429,6 @@ public class PackageManagerService extends IPackageManager.Stub { } final int level = bp.protectionLevel & PermissionInfo.PROTECTION_MASK_BASE; - final boolean appSupportsRuntimePermissions = pkg.applicationInfo.targetSdkVersion - >= Build.VERSION_CODES.M; switch (level) { case PermissionInfo.PROTECTION_NORMAL: { // For all apps normal permissions are install time ones.