diff options
author | Song Chun Fan <schfan@google.com> | 2022-12-01 15:47:19 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2022-12-01 15:47:19 +0000 |
commit | fc3e64a2ffc1a3f1f0553d44f831e1f28ec93857 (patch) | |
tree | d0f321f23de815493b679c275b7c2eae8b8ee4b8 | |
parent | 8a1b8047389d9c68ac6875cae89be02d74c43c48 (diff) | |
parent | 2d62797e6a7b80cdf8ee41a63401c3a452fdde68 (diff) | |
download | base-fc3e64a2ffc1a3f1f0553d44f831e1f28ec93857.tar.gz |
Merge "[Bugfix]Switch back to the application on /system when UID and path changed" am: 2d62797e6a
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2319751
Change-Id: I4673d6d0b9c0618cbeca1286a55c01822637e949
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-rw-r--r-- | services/core/java/com/android/server/pm/InstallPackageHelper.java | 9 |
1 files changed, 8 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 7da5f51bcbc2..3816b07042dc 100644 --- a/services/core/java/com/android/server/pm/InstallPackageHelper.java +++ b/services/core/java/com/android/server/pm/InstallPackageHelper.java @@ -3837,13 +3837,20 @@ final class InstallPackageHelper { && !pkgSetting.getPathString().equals(parsedPackage.getPath()); final boolean newPkgVersionGreater = pkgAlreadyExists && parsedPackage.getLongVersionCode() > pkgSetting.getVersionCode(); + final boolean newSharedUserSetting = pkgAlreadyExists + && (initialScanRequest.mOldSharedUserSetting + != initialScanRequest.mSharedUserSetting); final boolean isSystemPkgBetter = scanSystemPartition && isSystemPkgUpdated - && newPkgChangedPaths && newPkgVersionGreater; + && newPkgChangedPaths && (newPkgVersionGreater || newSharedUserSetting); if (isSystemPkgBetter) { // The version of the application on /system is greater than the version on // /data. Switch back to the application on /system. // It's safe to assume the application on /system will correctly scan. If not, // there won't be a working copy of the application. + // Also, if the sharedUserSetting of the application on /system is different + // from the sharedUserSetting on /data, switch back to the application on /system. + // We should trust the sharedUserSetting on /system, even if the application + // version on /system is smaller than the version on /data. synchronized (mPm.mLock) { // just remove the loaded entries from package lists mPm.mPackages.remove(pkgSetting.getPackageName()); |