Merge "Remove usage of DELETE_SHOW_DIALOG flag" into main (9810440d) · Commits · e / os / android_frameworks_base

core/api/current.txt

+1 −2

Original line number	Diff line number	Diff line
		@@ -12445,7 +12445,7 @@ package android.content.pm {
		method public void registerSessionCallback(@NonNull android.content.pm.PackageInstaller.SessionCallback);
		method public void registerSessionCallback(@NonNull android.content.pm.PackageInstaller.SessionCallback, @NonNull android.os.Handler);
		method @FlaggedApi("android.content.pm.archiving") @RequiresPermission(anyOf={android.Manifest.permission.INSTALL_PACKAGES, android.Manifest.permission.REQUEST_INSTALL_PACKAGES}) public void reportUnarchivalStatus(int, int, long, @Nullable android.app.PendingIntent) throws android.content.pm.PackageManager.NameNotFoundException;
		method @FlaggedApi("android.content.pm.archiving") @RequiresPermission(anyOf={android.Manifest.permission.DELETE_PACKAGES, android.Manifest.permission.REQUEST_DELETE_PACKAGES}) public void requestArchive(@NonNull String, @NonNull android.content.IntentSender, int) throws android.content.pm.PackageManager.NameNotFoundException;
		method @FlaggedApi("android.content.pm.archiving") @RequiresPermission(anyOf={android.Manifest.permission.DELETE_PACKAGES, android.Manifest.permission.REQUEST_DELETE_PACKAGES}) public void requestArchive(@NonNull String, @NonNull android.content.IntentSender) throws android.content.pm.PackageManager.NameNotFoundException;
		method @FlaggedApi("android.content.pm.archiving") @RequiresPermission(anyOf={android.Manifest.permission.INSTALL_PACKAGES, android.Manifest.permission.REQUEST_INSTALL_PACKAGES}) public void requestUnarchive(@NonNull String, @NonNull android.content.IntentSender) throws java.io.IOException, android.content.pm.PackageManager.NameNotFoundException;
		method @RequiresPermission(anyOf={android.Manifest.permission.DELETE_PACKAGES, android.Manifest.permission.REQUEST_DELETE_PACKAGES}) public void uninstall(@NonNull String, @NonNull android.content.IntentSender);
		method @RequiresPermission(anyOf={android.Manifest.permission.DELETE_PACKAGES, android.Manifest.permission.REQUEST_DELETE_PACKAGES}) public void uninstall(@NonNull android.content.pm.VersionedPackage, @NonNull android.content.IntentSender);
		@@ -12872,7 +12872,6 @@ package android.content.pm {
		field public static final int COMPONENT_ENABLED_STATE_DISABLED_USER = 3; // 0x3
		field public static final int COMPONENT_ENABLED_STATE_ENABLED = 1; // 0x1
		field @FlaggedApi("android.content.pm.archiving") public static final int DELETE_ARCHIVE = 16; // 0x10
		field @FlaggedApi("android.content.pm.archiving") public static final int DELETE_SHOW_DIALOG = 32; // 0x20
		field public static final int DONT_KILL_APP = 1; // 0x1
		field public static final String EXTRA_VERIFICATION_ID = "android.content.pm.extra.VERIFICATION_ID";
		field public static final String EXTRA_VERIFICATION_RESULT = "android.content.pm.extra.VERIFICATION_RESULT";

core/java/android/content/pm/IPackageInstaller.aidl

+1 −1

Original line number	Diff line number	Diff line
		@@ -80,7 +80,7 @@ interface IPackageInstaller {
		long timeout);

		@JavaPassthrough(annotation="@android.annotation.RequiresPermission(anyOf={android.Manifest.permission.DELETE_PACKAGES,android.Manifest.permission.REQUEST_DELETE_PACKAGES})")
		void requestArchive(String packageName, String callerPackageName, in IntentSender statusReceiver, in UserHandle userHandle, int flags);
		void requestArchive(String packageName, String callerPackageName, in IntentSender statusReceiver, in UserHandle userHandle);

		@JavaPassthrough(annotation="@android.annotation.RequiresPermission(anyOf={android.Manifest.permission.INSTALL_PACKAGES,android.Manifest.permission.REQUEST_INSTALL_PACKAGES})")
		void requestUnarchive(String packageName, String callerPackageName, in IntentSender statusReceiver, in UserHandle userHandle);

core/java/android/content/pm/PackageInstaller.java

+2 −4

Original line number	Diff line number	Diff line
		@@ -2352,7 +2352,6 @@ public class PackageInstaller {
		* communicated.
		*
		* @param statusReceiver Callback used to notify when the operation is completed.
		* @param flags Flags for archiving. Can be 0 or {@link PackageManager#DELETE_SHOW_DIALOG}.
		* @throws PackageManager.NameNotFoundException If {@code packageName} isn't found or not
		* available to the caller or isn't archived.
		*/
		@@ -2360,12 +2359,11 @@ public class PackageInstaller {
		Manifest.permission.DELETE_PACKAGES,
		Manifest.permission.REQUEST_DELETE_PACKAGES})
		@FlaggedApi(Flags.FLAG_ARCHIVING)
		public void requestArchive(@NonNull String packageName, @NonNull IntentSender statusReceiver,
		@DeleteFlags int flags)
		public void requestArchive(@NonNull String packageName, @NonNull IntentSender statusReceiver)
		throws PackageManager.NameNotFoundException {
		try {
		mInstaller.requestArchive(packageName, mInstallerPackageName, statusReceiver,
		new UserHandle(mUserId), flags);
		new UserHandle(mUserId));
		} catch (ParcelableException e) {
		e.maybeRethrow(PackageManager.NameNotFoundException.class);
		} catch (RemoteException e) {

core/java/android/content/pm/PackageManager.java

+0 −7

Original line number	Diff line number	Diff line
		@@ -2596,7 +2596,6 @@ public abstract class PackageManager {
		DELETE_SYSTEM_APP,
		DELETE_DONT_KILL_APP,
		DELETE_CHATTY,
		DELETE_SHOW_DIALOG,
		})
		@Retention(RetentionPolicy.SOURCE)
		public @interface DeleteFlags {}
		@@ -2648,12 +2647,6 @@ public abstract class PackageManager {
		@FlaggedApi(android.content.pm.Flags.FLAG_ARCHIVING)
		public static final int DELETE_ARCHIVE = 0x00000010;

		/**
		* Show a confirmation dialog to the user when app is being deleted.
		*/
		@FlaggedApi(android.content.pm.Flags.FLAG_ARCHIVING)
		public static final int DELETE_SHOW_DIALOG = 0x00000020;

		/**
		* Flag parameter for {@link #deletePackage} to indicate that package deletion
		* should be chatty.

services/core/java/com/android/server/pm/PackageArchiver.java

+2 −4

Original line number	Diff line number	Diff line
		@@ -58,7 +58,6 @@ import android.content.pm.LauncherActivityInfo;
		import android.content.pm.LauncherApps;
		import android.content.pm.PackageInstaller;
		import android.content.pm.PackageManager;
		import android.content.pm.PackageManager.DeleteFlags;
		import android.content.pm.ParceledListSlice;
		import android.content.pm.ResolveInfo;
		import android.content.pm.VersionedPackage;
		@@ -183,8 +182,7 @@ public class PackageArchiver {
		@NonNull String packageName,
		@NonNull String callerPackageName,
		@NonNull IntentSender intentSender,
		@NonNull UserHandle userHandle,
		@DeleteFlags int flags) {
		@NonNull UserHandle userHandle) {
		Objects.requireNonNull(packageName);
		Objects.requireNonNull(callerPackageName);
		Objects.requireNonNull(intentSender);
		@@ -224,7 +222,7 @@ public class PackageArchiver {
		new VersionedPackage(packageName,
		PackageManager.VERSION_CODE_HIGHEST),
		callerPackageName,
		DELETE_ARCHIVE \| DELETE_KEEP_DATA \| flags,
		DELETE_ARCHIVE \| DELETE_KEEP_DATA,
		intentSender,
		userId,
		binderUid);