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

Merge "When the sharedUserSetting of the application on /system is different from the sharedUserSetting on /data, we should trust the sharedUserSetting on /system" am: b51e99de88 am: a1dd9bec9e am: 382b1220de

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2481897

Change-Id: I981e3fd9dad7d4cdac804939715c0fac4f8e1d82
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Song Chun Fan
2023-03-23 00:19:06 +00:00
committed by Automerger Merge Worker
parent ab0b751aef 382b1220de
commit aed299868b
1 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -4276,10 +4276,14 @@ final class InstallPackageHelper {
deletePackageHelper.deletePackageLIF(parsedPackage.getPackageName(), null, true,
mPm.mUserManager.getUserIds(), 0, null, false);
}
} else if (newPkgVersionGreater) {
} else if (newPkgVersionGreater || newSharedUserSetting) {
// The application on /system is newer than the application on /data.
// Simply remove the application on /data [keeping application data]
// and replace it with the version on /system.
// Also, if the sharedUserSetting of the application on /system is different
// from the sharedUserSetting on data, we should trust the sharedUserSetting
// on /system, even if the application version on /system is smaller than
// the version on /data.
logCriticalInfo(Log.WARN,
"System package enabled;"
+ " name: " + pkgSetting.getPackageName()