Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9ce1319d authored by Suchi Amalapurapu's avatar Suchi Amalapurapu Committed by Android (Google) Code Review
Browse files

Merge "Don't delete stale containers on sdcard. Comment out flaky test"

parents b978c8f8 f654a484

services/java/com/android/server/PackageManagerService.java

+2 −3
Original line number Diff line number Diff line
@@ -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");

           }

       }

   }

tests/AndroidTests/src/com/android/unit_tests/AppCacheTest.java

+1 −3
Original line number Diff line number Diff line
@@ -137,8 +137,6 @@ public class AppCacheTest extends AndroidTestCase { 
        verifyTestFiles1(cacheDir, "testtmpdir", 5);

    }



    // TODO: flaky test

    // @LargeTest

    public void testFreeApplicationCacheSomeFiles() throws Exception {

        StatFs st = new StatFs("/data");

        long blks1 = getFreeStorageBlks(st);