drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am 41bfe121: am 16678ac6: Merge "Fixed upgrading from forward-lock application to system application"

Browse Source 
* commit '41bfe121cfa889df803a8916000e1fd0fbe87d5a':
  Fixed upgrading from forward-lock application to system application
This commit is contained in:
Christopher Tate
2014-02-27 22:09:18 +00:00
committed by Android Git Automerger
parent 7aeb43072a 41bfe121cf
commit a58c03f603
1 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
services/core/java/com/android/server/pm/PackageManagerService.java
View File

@ -3707,6 +3707,7 @@ public class PackageManagerService extends IPackageManager.Stub {
updatedPkg = mSettings.getDisabledSystemPkgLPr(ps != null ? ps.name : pkg.packageName); updatedPkg = mSettings.getDisabledSystemPkgLPr(ps != null ? ps.name : pkg.packageName);
if (DEBUG_INSTALL && updatedPkg != null) Slog.d(TAG, "updatedPkg = " + updatedPkg); 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 // First check if this is a system package that may involve an update
if (updatedPkg != null && (parseFlags&PackageParser.PARSE_IS_SYSTEM) != 0) { if (updatedPkg != null && (parseFlags&PackageParser.PARSE_IS_SYSTEM) != 0) {
if (ps != null && !ps.codePath.equals(scanFile)) { if (ps != null && !ps.codePath.equals(scanFile)) {
@ -3761,6 +3762,7 @@ public class PackageManagerService extends IPackageManager.Stub {
synchronized (mPackages) { synchronized (mPackages) {
mSettings.enableSystemPackageLPw(ps.name); mSettings.enableSystemPackageLPw(ps.name);
} }
updatedPkgBetter = true;
} }
} }
} }
@ -3837,7 +3839,7 @@ public class PackageManagerService extends IPackageManager.Stub {
String codePath = null; String codePath = null;
String resPath = 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) { if (ps != null && ps.resourcePathString != null) {
resPath = ps.resourcePathString; resPath = ps.resourcePathString;
} else { } else {