From 88fb2c7e2aa4845d3c8a8b90bf7c742194d5e8b4 Mon Sep 17 00:00:00 2001 From: Songchun Fan Date: Tue, 9 May 2023 10:20:59 -0700 Subject: [PATCH] [pm] fix sharedUserSetting during reconcile requestSharedUserSetting and resultSharedUserSetting are sometimes different. BUG: 281626378 Test: presubmit Change-Id: I09a7c762b6d41daaf62f472d23159bf432f0cef0 --- .../core/java/com/android/server/pm/InstallPackageHelper.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/services/core/java/com/android/server/pm/InstallPackageHelper.java b/services/core/java/com/android/server/pm/InstallPackageHelper.java index 5932929a69c4c..d5b0c749303cd 100644 --- a/services/core/java/com/android/server/pm/InstallPackageHelper.java +++ b/services/core/java/com/android/server/pm/InstallPackageHelper.java @@ -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