Merge "Ignore sharedUserId when package already left shared UID" into tm-dev am: bb2e856381

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

Change-Id: I4e3e083d5e86c94c913201946b6a50580ecb8be4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
John Wu
2022-07-28 21:50:43 +00:00
committed by Automerger Merge Worker

View File

@@ -3701,8 +3701,9 @@ final class InstallPackageHelper {
parsedPackage.getPackageName()); parsedPackage.getPackageName());
boolean ignoreSharedUserId = false; boolean ignoreSharedUserId = false;
if (installedPkgSetting == null) { if (installedPkgSetting == null || !installedPkgSetting.hasSharedUser()) {
// We can directly ignore sharedUserSetting for new installs // Directly ignore sharedUserSetting for new installs, or if the app has
// already left shared UID
ignoreSharedUserId = parsedPackage.isLeavingSharedUid(); ignoreSharedUserId = parsedPackage.isLeavingSharedUid();
} }