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

am 9701b3d5: Merge change 5979 into donut

Browse Source 
Merge commit '9701b3d594868bd6750d5887af560c6295ea091b'

* commit '9701b3d594868bd6750d5887af560c6295ea091b':
  Remove the constraint to assign new uid when code path changes for system packages
This commit is contained in:
Android (Google) Code Review
2009-07-06 11:02:59 -07:00
committed by The Android Open Source Project
parent f77b4112ea 9701b3d594
commit 3042bb6238
1 changed files with 5 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
services/java/com/android/server/PackageManagerService.java
View File

@@ -5808,24 +5808,15 @@ class PackageManagerService extends IPackageManager.Stub {
// Check to see if its a disabled system app
PackageSetting ps = mDisabledSysPackages.get(name);
if((ps != null) && ((ps.pkgFlags & ApplicationInfo.FLAG_SYSTEM) != 0)) {
// Could be a replaced system package
// Note that if the user replaced a system app, the user has to physically
// delete the new one in order to revert to the system app. So even
// if the user updated the system app via an update, the user still
// has to delete the one installed in the data partition in order to pick up the
// new system package.
// This is an updated system app with versions in both system
// and data partition. Just let the most recent version
// take precedence.
return p;
} else if ((p.pkg != null) && (p.pkg.applicationInfo != null) &&
((p.pkg.applicationInfo.flags & ApplicationInfo.FLAG_SYSTEM) == 0)) {
// Check for non-system apps
} else if ((p.pkg != null) && (p.pkg.applicationInfo != null)) {
// Let the app continue with previous uid if code path changes.
reportSettingsProblem(Log.WARN,
"Package " + name + " codePath changed from " + p.codePath
+ " to " + codePath + "; Retaining data and using new code");
} else {
reportSettingsProblem(Log.WARN,
"Package " + name + " codePath changed from " + p.codePath
+ " to " + codePath + "; replacing with new");
p = null;
}
} else if (p.sharedUser != sharedUser) {
reportSettingsProblem(Log.WARN,