Remove use of INSTALL_DISABLE_VERIFICATION for staged install
Seems like INSTALL_DISABLE_VERIFICATION is now also being used to allow
test builds to optionally skip verification (introduced in ag/10057782).
As such, it is not possible to remove the flag completely anymore. I
removed the instances of the flag that were intended for staged
install flow. Now that we completely bypass verification using explicit
api, this check is no longer needed.
Bug: 10057782
Test: atest PackageVerifierTest
Test: atest StagedInstallTest
Change-Id: I7bc4df5c3afda59f6f37ea5379ee47c9ed8b09bb
diff --git a/services/core/java/com/android/server/pm/PackageInstallerService.java b/services/core/java/com/android/server/pm/PackageInstallerService.java
index 31ee597..da31c8c 100644
--- a/services/core/java/com/android/server/pm/PackageInstallerService.java
+++ b/services/core/java/com/android/server/pm/PackageInstallerService.java
@@ -592,10 +592,9 @@
params.installFlags &= ~PackageManager.INSTALL_REQUEST_DOWNGRADE;
}
- if (callingUid != Process.SYSTEM_UID
- && (params.installFlags & ADB_DEV_MODE) != ADB_DEV_MODE) {
- // Only system_server or tools under specific conditions (test app installed
- // through ADB, and verification disabled flag specified) can disable verification.
+ if ((params.installFlags & ADB_DEV_MODE) != ADB_DEV_MODE) {
+ // Only tools under specific conditions (test app installed through ADB, and
+ // verification disabled flag specified) can disable verification.
params.installFlags &= ~PackageManager.INSTALL_DISABLE_VERIFICATION;
}
diff --git a/services/core/java/com/android/server/pm/PackageManagerService.java b/services/core/java/com/android/server/pm/PackageManagerService.java
index cc1ef86..8638165 100644
--- a/services/core/java/com/android/server/pm/PackageManagerService.java
+++ b/services/core/java/com/android/server/pm/PackageManagerService.java
@@ -14255,10 +14255,6 @@
Global.PACKAGE_VERIFIER_INCLUDE_ADB, 1) != 0;
}
- if ((installFlags & PackageManager.INSTALL_DISABLE_VERIFICATION) != 0) {
- return false;
- }
-
// only when not installed from ADB, skip verification for instant apps when
// the installer and verifier are the same.
if ((installFlags & PackageManager.INSTALL_INSTANT_APP) != 0) {