Disable PIA v2 for archiving until it's supported.
Bug: 318521110
Test: ArchiveTest
Change-Id: Iba97dc8be67d9e6de2931dcddae4c3bfd666a861
diff --git a/packages/PackageInstaller/src/com/android/packageinstaller/UninstallerActivity.java b/packages/PackageInstaller/src/com/android/packageinstaller/UninstallerActivity.java
index 170cb45..9ad3e3c 100644
--- a/packages/PackageInstaller/src/com/android/packageinstaller/UninstallerActivity.java
+++ b/packages/PackageInstaller/src/com/android/packageinstaller/UninstallerActivity.java
@@ -91,7 +91,8 @@
// be stale, if e.g. the app was uninstalled while the activity was destroyed.
super.onCreate(null);
- if (usePiaV2() && !isTv()) {
+ // TODO(b/318521110) Enable PIA v2 for archive dialog.
+ if (usePiaV2() && !isTv() && !isArchiveDialog(getIntent())) {
Log.i(TAG, "Using Pia V2");
boolean returnResult = getIntent().getBooleanExtra(Intent.EXTRA_RETURN_RESULT, false);
@@ -224,6 +225,11 @@
showConfirmationDialog();
}
+ private boolean isArchiveDialog(Intent intent) {
+ return (intent.getIntExtra(PackageInstaller.EXTRA_DELETE_FLAGS, 0)
+ & PackageManager.DELETE_ARCHIVE) != 0;
+ }
+
/**
* Parses specific {@link android.content.pm.PackageManager.DeleteFlags} from {@link Intent}
* to archive an app if requested.