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

Commit 532a1cc1 authored by Nikhil Kumar's avatar Nikhil Kumar Committed by Automerger Merge Worker
Browse files

Merge "Use current user to verify the app getting installed on all users" into... 

Merge "Use current user to verify the app getting installed on all users" into udc-dev am: 639da499

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/22628298



Change-Id: I2689427d6e4cedc7137ba0f3e997e11aad548661
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 0913be84 639da499

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

+2 −3
Original line number Diff line number Diff line
@@ -353,11 +353,10 @@ final class VerifyingSession { 
            PackageInfoLite pkgLite,

            PackageVerificationState verificationState) {



        // TODO: http://b/22976637

        // Apps installed for "all" users use the device owner to verify the app

        // Apps installed for "all" users use the current user to verify the app

        UserHandle verifierUser = getUser();

        if (verifierUser == UserHandle.ALL) {

            verifierUser = UserHandle.SYSTEM;

            verifierUser = UserHandle.of(mPm.mUserManager.getCurrentUserId());

        }

        final int verifierUserId = verifierUser.getIdentifier();