From c39590bf9f41fa537a741ef5f6b9fb54ae0befe3 Mon Sep 17 00:00:00 2001 From: Mohammad Samiul Islam Date: Fri, 14 Aug 2020 13:49:34 +0100 Subject: [PATCH] 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 --- .../com/android/server/pm/PackageInstallerService.java | 7 +++---- .../java/com/android/server/pm/PackageManagerService.java | 4 ---- 2 files changed, 3 insertions(+), 8 deletions(-) diff --git a/services/core/java/com/android/server/pm/PackageInstallerService.java b/services/core/java/com/android/server/pm/PackageInstallerService.java index 31ee59717dba8..da31c8c71f30d 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 @@ public class PackageInstallerService extends IPackageInstaller.Stub implements 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 cc1ef86bfb1a5..8638165b76aea 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 @@ public class PackageManagerService extends IPackageManager.Stub 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) {