Merge "Don't delete stale containers on sdcard. Comment out flaky test"
This commit is contained in:
committed by
Android (Google) Code Review
commit
9ce1319d05
@@ -9572,11 +9572,10 @@ class PackageManagerService extends IPackageManager.Stub {
|
||||
if (doGc) {
|
||||
Runtime.getRuntime().gc();
|
||||
}
|
||||
// Delete any stale containers if needed.
|
||||
// List stale containers.
|
||||
if (removeCids != null) {
|
||||
for (String cid : removeCids) {
|
||||
Log.i(TAG, "Destroying stale container : " + cid);
|
||||
PackageHelper.destroySdDir(cid);
|
||||
Log.w(TAG, "Container " + cid + " is stale");
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -136,9 +136,7 @@ public class AppCacheTest extends AndroidTestCase {
|
||||
if(localLOGV || TRACKING) Log.i(TAG, "blks3="+blks3);
|
||||
verifyTestFiles1(cacheDir, "testtmpdir", 5);
|
||||
}
|
||||
|
||||
// TODO: flaky test
|
||||
// @LargeTest
|
||||
|
||||
public void testFreeApplicationCacheSomeFiles() throws Exception {
|
||||
StatFs st = new StatFs("/data");
|
||||
long blks1 = getFreeStorageBlks(st);
|
||||
|
||||
Reference in New Issue
Block a user