diff options
| author | TreeHugger Robot <treehugger-gerrit@google.com> | 2017-08-14 23:18:45 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2017-08-14 23:18:45 +0000 |
| commit | ef2e7d27aecf5f1f86171ffe77c98b14bdaa4f6d (patch) | |
| tree | bf4c485f359e496d7c8d2b0dc0232231283a0377 /core/java | |
| parent | d57287be19ec9db9eca1e72f8ae69d677a3a1b88 (diff) | |
| parent | c247fa136639dd07278b1954e5fba78ade60614c (diff) | |
Merge "Change protection level from ephemeral to instant" into oc-mr1-dev
Diffstat (limited to 'core/java')
| -rw-r--r-- | core/java/android/content/pm/PackageParser.java | 4 | ||||
| -rw-r--r-- | core/java/android/content/pm/PermissionInfo.java | 11 |
2 files changed, 6 insertions, 9 deletions
diff --git a/core/java/android/content/pm/PackageParser.java b/core/java/android/content/pm/PackageParser.java index 7cc02b4f1668..9b9499cd602d 100644 --- a/core/java/android/content/pm/PackageParser.java +++ b/core/java/android/content/pm/PackageParser.java @@ -3235,11 +3235,11 @@ public class PackageParser { perm.info.protectionLevel = PermissionInfo.fixProtectionLevel(perm.info.protectionLevel); if ((perm.info.protectionLevel&PermissionInfo.PROTECTION_MASK_FLAGS) != 0) { - if ( (perm.info.protectionLevel&PermissionInfo.PROTECTION_FLAG_EPHEMERAL) == 0 + if ( (perm.info.protectionLevel&PermissionInfo.PROTECTION_FLAG_INSTANT) == 0 && (perm.info.protectionLevel&PermissionInfo.PROTECTION_FLAG_RUNTIME_ONLY) == 0 && (perm.info.protectionLevel&PermissionInfo.PROTECTION_MASK_BASE) != PermissionInfo.PROTECTION_SIGNATURE) { - outError[0] = "<permission> protectionLevel specifies a non-ephemeral flag but is " + outError[0] = "<permission> protectionLevel specifies a non-instnat flag but is " + "not based on signature type"; mParseError = PackageManager.INSTALL_PARSE_FAILED_MANIFEST_MALFORMED; return false; diff --git a/core/java/android/content/pm/PermissionInfo.java b/core/java/android/content/pm/PermissionInfo.java index 694e60781546..797db5497390 100644 --- a/core/java/android/content/pm/PermissionInfo.java +++ b/core/java/android/content/pm/PermissionInfo.java @@ -122,13 +122,10 @@ public class PermissionInfo extends PackageItemInfo implements Parcelable { /** * Additional flag for {@link #protectionLevel}, corresponding - * to the <code>ephemeral</code> value of + * to the <code>instant</code> value of * {@link android.R.attr#protectionLevel}. - * @hide */ - @SystemApi - @TestApi - public static final int PROTECTION_FLAG_EPHEMERAL = 0x1000; + public static final int PROTECTION_FLAG_INSTANT = 0x1000; /** * Additional flag for {@link #protectionLevel}, corresponding @@ -254,8 +251,8 @@ public class PermissionInfo extends PackageItemInfo implements Parcelable { if ((level&PermissionInfo.PROTECTION_FLAG_SETUP) != 0) { protLevel += "|setup"; } - if ((level&PermissionInfo.PROTECTION_FLAG_EPHEMERAL) != 0) { - protLevel += "|ephemeral"; + if ((level&PermissionInfo.PROTECTION_FLAG_INSTANT) != 0) { + protLevel += "|instant"; } if ((level&PermissionInfo.PROTECTION_FLAG_RUNTIME_ONLY) != 0) { protLevel += "|runtime"; |