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

am 9a212adc: Fix 2641875 Initialize the cache path only if the container exists. This did exist before but was somehow removed. Fix a known test failure as well.

Browse Source 
Merge commit '9a212adcffbc4b32d51f512889b33ba584647aa9' into froyo-plus-aosp

* commit '9a212adcffbc4b32d51f512889b33ba584647aa9':
  Fix 2641875
This commit is contained in:
Suchi Amalapurapu
2010-05-18 13:16:13 -07:00
committed by Android Git Automerger
parent 3aecdb9d7e 9a212adcff
commit aa4db173a2
2 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
core/tests/coretests/src/android/content/pm/PackageManagerTests.java
View File

@ -1444,7 +1444,7 @@ public class PackageManagerTests extends AndroidTestCase {
int result = PackageManager.MOVE_FAILED_FORWARD_LOCKED; int result = PackageManager.MOVE_FAILED_FORWARD_LOCKED;
sampleMoveFromRawResource(installFlags, moveFlags, fail, result); sampleMoveFromRawResource(installFlags, moveFlags, fail, result);
} }
//TODO: To be reenabled after investigation @MediumTest
public void testMoveAppFailInternalToExternalDelete() { public void testMoveAppFailInternalToExternalDelete() {
int installFlags = 0; int installFlags = 0;
int moveFlags = PackageManager.MOVE_EXTERNAL_MEDIA; int moveFlags = PackageManager.MOVE_EXTERNAL_MEDIA;
@ -1461,7 +1461,8 @@ public class PackageManagerTests extends AndroidTestCase {
ip = installFromRawResource("install.apk", R.raw.install, installFlags, false, ip = installFromRawResource("install.apk", R.raw.install, installFlags, false,
false, -1, PackageInfo.INSTALL_LOCATION_UNSPECIFIED); false, -1, PackageInfo.INSTALL_LOCATION_UNSPECIFIED);
// Delete the package now retaining data. // Delete the package now retaining data.
pm.deletePackage(ip.pkg.packageName, null, PackageManager.DONT_DELETE_DATA); GenericReceiver receiver = new DeleteReceiver(ip.pkg.packageName);
invokeDeletePackage(ip.pkg.packageName, PackageManager.DONT_DELETE_DATA, receiver);
assertTrue(invokeMovePackageFail(ip.pkg.packageName, moveFlags, result)); assertTrue(invokeMovePackageFail(ip.pkg.packageName, moveFlags, result));
} catch (Exception e) { } catch (Exception e) {
failStr(e); failStr(e);

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

@ -5057,7 +5057,8 @@ class PackageManagerService extends IPackageManager.Stub {
} }
} }
private InstallArgs createInstallArgs(Uri packageURI, int flags, String pkgName) { private InstallArgs createInstallArgs(Uri packageURI, int flags,
String pkgName) {
if (installOnSd(flags)) { if (installOnSd(flags)) {
String cid = getNextCodePath(null, pkgName, "/" + SdInstallArgs.RES_FILE_NAME); String cid = getNextCodePath(null, pkgName, "/" + SdInstallArgs.RES_FILE_NAME);
return new SdInstallArgs(packageURI, cid); return new SdInstallArgs(packageURI, cid);
@ -5317,6 +5318,7 @@ class PackageManagerService extends IPackageManager.Stub {
SdInstallArgs(String cid) { SdInstallArgs(String cid) {
super(null, null, PackageManager.INSTALL_EXTERNAL, null); super(null, null, PackageManager.INSTALL_EXTERNAL, null);
this.cid = cid; this.cid = cid;
cachePath = PackageHelper.getSdDir(cid);
} }
SdInstallArgs(Uri packageURI, String cid) { SdInstallArgs(Uri packageURI, String cid) {