Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit df1d9b98 authored by Mohammad Samiul Islam's avatar Mohammad Samiul Islam Committed by Android (Google) Code Review
Browse files

Merge "Remove use of INSTALL_DISABLE_VERIFICATION for staged install"

parents 661018ab c39590bf

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

+3 −4
Original line number Diff line number Diff line
@@ -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;

        }

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

+0 −4
Original line number Diff line number Diff line
@@ -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) {