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

Commit 36070b41 authored by rich cannings's avatar rich cannings
Browse files

Fix verfication bypassed for adb installs 

ADB installs appear as UserHandle.USER_ALL, and can only be performed by
UserHandle.USER_OWNER, so use the package verifier for UserHandle.USER_OWNER.
This returns a valid userId to call PackageManagerService.getPackageUid.

Bug: 7293091
Change-Id: I7a5497cfe5fa2e7aa804345cf9f507ec26a0db21
parent 8215ddb4

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

+11 −1
Original line number Diff line number Diff line
@@ -6374,12 +6374,22 @@ public class PackageManagerService extends IPackageManager.Stub { 
            mArgs = args;



            if (ret == PackageManager.INSTALL_SUCCEEDED) {

                 /*

                 * ADB installs appear as UserHandle.USER_ALL, and can only be performed by

                 * UserHandle.USER_OWNER, so use the package verifier for UserHandle.USER_OWNER.

                 */

                int userIdentifier = getUser().getIdentifier();

                if (userIdentifier == UserHandle.USER_ALL

                        && ((flags & PackageManager.INSTALL_FROM_ADB) != 0)) {

                    userIdentifier = UserHandle.USER_OWNER;

                }



                /*

                 * Determine if we have any installed package verifiers. If we

                 * do, then we'll defer to them to verify the packages.

                 */

                final int requiredUid = mRequiredVerifierPackage == null ? -1

                        : getPackageUid(mRequiredVerifierPackage, getUser().getIdentifier());

                        : getPackageUid(mRequiredVerifierPackage, userIdentifier);

                if (requiredUid != -1 && isVerificationEnabled(flags)) {

                    final Intent verification = new Intent(

                            Intent.ACTION_PACKAGE_NEEDS_VERIFICATION);