diff options
| author | TreeHugger Robot <treehugger-gerrit@google.com> | 2017-11-15 01:09:06 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2017-11-15 01:09:06 +0000 |
| commit | 07201a792257fee77287c280919c5a6c5ad0a8dd (patch) | |
| tree | f6caffc9283ef61a9c6b7865ba3e17e16fb1471b /core/java | |
| parent | 38ca5ccb6a3d8f1e0175ccbb3bd6234b7e20d72d (diff) | |
| parent | d9bb39abdfeb62c36edee7e5e6a155e5d611eea3 (diff) | |
Merge "Enforce REQUEST_DELETE_PACKAGES for PackageInstaller.uninstall()"
Diffstat (limited to 'core/java')
| -rw-r--r-- | core/java/android/content/Intent.java | 3 | ||||
| -rw-r--r-- | core/java/android/content/pm/PackageInstaller.java | 6 |
2 files changed, 9 insertions, 0 deletions
diff --git a/core/java/android/content/Intent.java b/core/java/android/content/Intent.java index dd729a36875d..bad452cef977 100644 --- a/core/java/android/content/Intent.java +++ b/core/java/android/content/Intent.java @@ -1728,6 +1728,9 @@ public class Intent implements Parcelable, Cloneable { * <p> * Output: If {@link #EXTRA_RETURN_RESULT}, returns whether the install * succeeded. + * <p> + * Requires {@link android.Manifest.permission#REQUEST_DELETE_PACKAGES} + * since {@link Build.VERSION_CODES#P}. */ @SdkConstant(SdkConstantType.ACTIVITY_INTENT_ACTION) public static final String ACTION_UNINSTALL_PACKAGE = "android.intent.action.UNINSTALL_PACKAGE"; diff --git a/core/java/android/content/pm/PackageInstaller.java b/core/java/android/content/pm/PackageInstaller.java index 5673361420cc..86288396ad84 100644 --- a/core/java/android/content/pm/PackageInstaller.java +++ b/core/java/android/content/pm/PackageInstaller.java @@ -444,6 +444,9 @@ public class PackageInstaller { * @param packageName The package to uninstall. * @param statusReceiver Where to deliver the result. */ + @RequiresPermission(anyOf = { + Manifest.permission.DELETE_PACKAGES, + Manifest.permission.REQUEST_DELETE_PACKAGES}) public void uninstall(@NonNull String packageName, @NonNull IntentSender statusReceiver) { uninstall(packageName, 0 /*flags*/, statusReceiver); } @@ -476,6 +479,9 @@ public class PackageInstaller { * @param versionedPackage The versioned package to uninstall. * @param statusReceiver Where to deliver the result. */ + @RequiresPermission(anyOf = { + Manifest.permission.DELETE_PACKAGES, + Manifest.permission.REQUEST_DELETE_PACKAGES}) public void uninstall(@NonNull VersionedPackage versionedPackage, @NonNull IntentSender statusReceiver) { uninstall(versionedPackage, 0 /*flags*/, statusReceiver); |