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

Commit 8b441de4 authored by Song Chun Fan's avatar Song Chun Fan Committed by Automerger Merge Worker
Browse files

Merge "[pm] fix sharedUserSetting during reconcile" into udc-dev am: 37d419b7 

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



Change-Id: I53c71058b3db5fbe0bd90da7353f7b6fe15f6933
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents bfdfaa38 37d419b7

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

+1 −1
Original line number Diff line number Diff line
@@ -280,7 +280,7 @@ final class InstallPackageHelper { 
            SharedUserSetting requestSharedUserSetting = mPm.mSettings.getSharedUserSettingLPr(

                    request.getScanRequestPackageSetting());

            SharedUserSetting resultSharedUserSetting = mPm.mSettings.getSharedUserSettingLPr(

                    request.getScanRequestPackageSetting());

                    request.getScannedPackageSetting());

            if (requestSharedUserSetting != null

                    && requestSharedUserSetting != resultSharedUserSetting) {

                // shared user changed, remove from old shared user