Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Remove use of INSTALL_DISABLE_VERIFICATION for staged install"

Browse Source
This commit is contained in:
Mohammad Samiul Islam
2020-10-23 11:59:14 +00:00
committed by Android (Google) Code Review
parent 661018ab45 c39590bf9f
commit df1d9b98d6
2 changed files with 3 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
services/core/java/com/android/server/pm/PackageInstallerService.java
View File

@@ -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;
}

4
services/core/java/com/android/server/pm/PackageManagerService.java
View File

@@ -14322,10 +14322,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) {