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

Merge "Clean up stale containers if needed at install time. This is needed when restoring applications installed on sdcard via Market after a data wipe. The stale containers need to be cleaned up before reinstalling again. Add a test case for installing when a stale container exists."

Browse Source
This commit is contained in:
Suchi Amalapurapu
2010-03-24 10:43:59 -07:00
committed by Android (Google) Code Review
parent 1f343ebed1 c7537ee7b6
commit e6d4f34d79
2 changed files with 57 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -5214,8 +5214,19 @@ class PackageManagerService extends IPackageManager.Stub {
}
}
if (!PackageHelper.renameSdDir(cid, newCacheId)) {
Slog.e(TAG, "Failed to rename " + cid + " to " + newCacheId);
return false;
Slog.e(TAG, "Failed to rename " + cid + " to " + newCacheId +
" which might be stale. Will try to clean up.");
// Clean up the stale container and proceed to recreate.
if (!PackageHelper.destroySdDir(newCacheId)) {
Slog.e(TAG, "Very strange. Cannot clean up stale container " + newCacheId);
return false;
}
// Successfully cleaned up stale container. Try to rename again.
if (!PackageHelper.renameSdDir(cid, newCacheId)) {
Slog.e(TAG, "Failed to rename " + cid + " to " + newCacheId
+ " inspite of cleaning it up.");
return false;
}
}
if (!PackageHelper.isContainerMounted(newCacheId)) {
Slog.w(TAG, "Mounting container " + newCacheId);

63
tests/AndroidTests/src/com/android/unit_tests/PackageManagerTests.java
View File

@@ -520,24 +520,6 @@ public class PackageManagerTests extends AndroidTestCase {
}
}
}
public void clearSecureContainersForPkg(String pkgName) {
IMountService ms = getMs();
try {
String list[] = ms.getSecureContainerList();
if (list != null) {
for (String cid : list) {
boolean delete = false;
// STOPSHIP issues with rename should be fixed.
if (cid.contains(pkgName) ||
cid.contains("smdltmp")) {
Log.i(TAG, "Destroying container " + cid);
ms.destroySecureContainer(cid, true);
}
}
}
} catch (RemoteException e) {}
}
/*
* Utility function that reads a apk bundled as a raw resource
@@ -792,7 +774,7 @@ public class PackageManagerTests extends AndroidTestCase {
waitTime += WAIT_TIME_INCR;
}
if(!receiver.isDone()) {
throw new Exception("Timed out waiting for PACKAGE_ADDED notification");
throw new Exception("Timed out waiting for PACKAGE_REMOVED notification");
}
return receiver.received;
}
@@ -2186,6 +2168,49 @@ public class PackageManagerTests extends AndroidTestCase {
}
}
}
/* This test creates a stale container via MountService and then installs
* a package and verifies that the stale container is cleaned up and install
* is successful.
* Please note that this test is very closely tied to the framework's
* naming convention for secure containers.
*/
public void testInstallSdcardStaleContainer() {
boolean origMediaState = getMediaState();
try {
String outFileName = "install.apk";
int rawResId = R.raw.install;
PackageManager pm = mContext.getPackageManager();
File filesDir = mContext.getFilesDir();
File outFile = new File(filesDir, outFileName);
Uri packageURI = getInstallablePackage(rawResId, outFile);
PackageParser.Package pkg = parsePackage(packageURI);
assertNotNull(pkg);
// Install an app on sdcard.
installFromRawResource(outFileName, rawResId,
PackageManager.INSTALL_EXTERNAL, false,
false, -1, PackageInfo.INSTALL_LOCATION_UNSPECIFIED);
// Unmount sdcard
unmountMedia();
// Delete the app on sdcard to leave a stale container on sdcard.
GenericReceiver receiver = new DeleteReceiver(pkg.packageName);
assertTrue(invokeDeletePackage(packageURI, 0, pkg.packageName, receiver));
mountMedia();
// Reinstall the app and make sure it gets installed.
installFromRawResource(outFileName, rawResId,
PackageManager.INSTALL_EXTERNAL, true,
false, -1, PackageInfo.INSTALL_LOCATION_UNSPECIFIED);
} catch (Exception e) {
failStr(e.getMessage());
} finally {
if (origMediaState) {
mountMedia();
} else {
unmountMedia();
}
}
}
/*---------- Recommended install location tests ----*/
/*
* TODO's