summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Song Chun Fan <schfan@google.com> 2023-05-11 20:38:22 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 2023-05-11 20:38:22 +0000
commit37d419b7d0eeb74dff47df1d61dcf242b271cef8 (patch)
tree667ab2bc9103857ba07d7d7b9776fb3d373caf01
parent20a482cb6edc1ef0acec592cbb84eb73076e0f98 (diff)
parent88fb2c7e2aa4845d3c8a8b90bf7c742194d5e8b4 (diff)
Merge "[pm] fix sharedUserSetting during reconcile" into udc-dev
-rw-r--r--services/core/java/com/android/server/pm/InstallPackageHelper.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/services/core/java/com/android/server/pm/InstallPackageHelper.java b/services/core/java/com/android/server/pm/InstallPackageHelper.java
index 5979b12e4a30..e18b2e87222d 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