diff options
author | Wen Zhang <zhangwen8@xiaomi.corp-partner.google.com> | 2022-11-29 12:47:34 +0000 |
---|---|---|
committer | Wen Zhang <zhangwen8@xiaomi.corp-partner.google.com> | 2022-12-01 01:38:00 +0000 |
commit | 26222f03ef27746971bd0b47205a52d6e603bff6 (patch) | |
tree | 960d8eebeef6bd11dc4e4ad3f8db996e46ec0f6d | |
parent | a6971bc969b5e30d7378507ac0e5f2227f8ee650 (diff) | |
download | base-26222f03ef27746971bd0b47205a52d6e603bff6.tar.gz |
[Bugfix]Switch back to the application on /system when UID and path changed
If the application is a system update app, and the UID of application on /system is changed by OTA, and the version on /system is smaller than the version on /data.
It will remove disabledPkgSetting, and install as a normal app, so need swich back to the application on /system.
Bug: 260683094
Change-Id: I90431cac15c8dde66eee81c42c91841bd92a96cf
Test: mamual
-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()); |