am 41bfe121
: am 16678ac6
: Merge "Fixed upgrading from forward-lock application to system application"
* commit '41bfe121cfa889df803a8916000e1fd0fbe87d5a': Fixed upgrading from forward-lock application to system application
This commit is contained in:
@ -3707,6 +3707,7 @@ public class PackageManagerService extends IPackageManager.Stub {
|
||||
updatedPkg = mSettings.getDisabledSystemPkgLPr(ps != null ? ps.name : pkg.packageName);
|
||||
if (DEBUG_INSTALL && updatedPkg != null) Slog.d(TAG, "updatedPkg = " + updatedPkg);
|
||||
}
|
||||
boolean updatedPkgBetter = false;
|
||||
// First check if this is a system package that may involve an update
|
||||
if (updatedPkg != null && (parseFlags&PackageParser.PARSE_IS_SYSTEM) != 0) {
|
||||
if (ps != null && !ps.codePath.equals(scanFile)) {
|
||||
@ -3761,6 +3762,7 @@ public class PackageManagerService extends IPackageManager.Stub {
|
||||
synchronized (mPackages) {
|
||||
mSettings.enableSystemPackageLPw(ps.name);
|
||||
}
|
||||
updatedPkgBetter = true;
|
||||
}
|
||||
}
|
||||
}
|
||||
@ -3837,7 +3839,7 @@ public class PackageManagerService extends IPackageManager.Stub {
|
||||
|
||||
String codePath = null;
|
||||
String resPath = null;
|
||||
if ((parseFlags & PackageParser.PARSE_FORWARD_LOCK) != 0) {
|
||||
if ((parseFlags & PackageParser.PARSE_FORWARD_LOCK) != 0 && !updatedPkgBetter) {
|
||||
if (ps != null && ps.resourcePathString != null) {
|
||||
resPath = ps.resourcePathString;
|
||||
} else {
|
||||
|
Reference in New Issue
Block a user