Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "[Bugfix]Switch back to the application on /system when UID and path changed"

Browse Source
This commit is contained in:
Song Chun Fan
2022-12-01 15:33:14 +00:00
committed by Gerrit Code Review
parent a8e835c4da 26222f03ef
commit 2d62797e6a
1 changed files with 8 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
services/core/java/com/android/server/pm/InstallPackageHelper.java
View File

@@ -3837,13 +3837,20 @@ final class InstallPackageHelper {
&& !pkgSetting.getPathString().equals(parsedPackage.getPath()); && !pkgSetting.getPathString().equals(parsedPackage.getPath());
final boolean newPkgVersionGreater = pkgAlreadyExists final boolean newPkgVersionGreater = pkgAlreadyExists
&& parsedPackage.getLongVersionCode() > pkgSetting.getVersionCode(); && parsedPackage.getLongVersionCode() > pkgSetting.getVersionCode();
final boolean newSharedUserSetting = pkgAlreadyExists
&& (initialScanRequest.mOldSharedUserSetting
!= initialScanRequest.mSharedUserSetting);
final boolean isSystemPkgBetter = scanSystemPartition && isSystemPkgUpdated final boolean isSystemPkgBetter = scanSystemPartition && isSystemPkgUpdated
&& newPkgChangedPaths && newPkgVersionGreater; && newPkgChangedPaths && (newPkgVersionGreater || newSharedUserSetting);
if (isSystemPkgBetter) { if (isSystemPkgBetter) {
// The version of the application on /system is greater than the version on // The version of the application on /system is greater than the version on
// /data. Switch back to the application on /system. // /data. Switch back to the application on /system.
// It's safe to assume the application on /system will correctly scan. If not, // It's safe to assume the application on /system will correctly scan. If not,
// there won't be a working copy of the application. // 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) { synchronized (mPm.mLock) {
// just remove the loaded entries from package lists // just remove the loaded entries from package lists
mPm.mPackages.remove(pkgSetting.getPackageName()); mPm.mPackages.remove(pkgSetting.getPackageName());