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

am b63ea5f7: am c928a11e: Merge "Fix 2672155 Check the code path when enabling disabling packages." into froyo

Browse Source 
Merge commit 'b63ea5f784b7862a7ab28e0134f6da47f6275810' into kraken

* commit 'b63ea5f784b7862a7ab28e0134f6da47f6275810':
  Fix 2672155
This commit is contained in:
Suchi Amalapurapu
2010-05-13 16:05:54 -07:00
committed by Android Git Automerger
parent cf67d18a1d b63ea5f784
commit 3f5ed04f7f
2 changed files with 49 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -5340,13 +5340,13 @@ class PackageManagerService extends IPackageManager.Stub {
}
SdInstallArgs(String cid) {
super(null, null, PackageManager.INSTALL_EXTERNAL, null);
this.cid = cid;
this((Uri)null, cid);
}
SdInstallArgs(Uri packageURI, String cid) {
super(packageURI, null, PackageManager.INSTALL_EXTERNAL, null);
this.cid = cid;
cachePath = PackageHelper.getSdDir(cid);
}
void createCopyFile() {
@@ -9608,7 +9608,10 @@ class PackageManagerService extends IPackageManager.Stub {
}
if (DEBUG_SD_INSTALL) Log.i(TAG, "Looking for pkg : " + pkgName);
PackageSetting ps = mSettings.mPackages.get(pkgName);
if (ps != null && ps.codePathString != null) {
// The package status is changed only if the code path
// matches between settings and the container id.
if (ps != null && ps.codePathString != null &&
ps.codePathString.equals(args.getCodePath())) {
if (DEBUG_SD_INSTALL) Log.i(TAG, "Container : " + cid +
" corresponds to pkg : " + pkgName +
" at code path: " + ps.codePathString);