Merge "Revert "Fix concurrency issue in PropertyInvalidatedCache""

3 files changed, 2 insertions, 50 deletions

diff --git a/core/java/android/app/PropertyInvalidatedCache.java b/core/java/android/app/PropertyInvalidatedCache.java
index 27f9f54d9522..a51b9d3956df 100644
--- a/core/java/android/app/PropertyInvalidatedCache.java
+++ b/core/java/android/app/PropertyInvalidatedCache.java
@@ -1406,17 +1406,6 @@ public class PropertyInvalidatedCache<Query, Result> {
     }
 
     /**
-     * Return the number of entries in the cache.  This is used for testing and has package-only
-     * visibility.
-     * @hide
-     */
-    public int size() {
-        synchronized (mLock) {
-            return mCache.size();
-        }
-    }
-
-    /**
      * Returns a list of caches alive at the current time.
      */
     @GuardedBy("sGlobalLock")
@@ -1623,12 +1612,8 @@ public class PropertyInvalidatedCache<Query, Result> {
      * @hide
      */
     public static void onTrimMemory() {
-        ArrayList<PropertyInvalidatedCache> activeCaches;
-        synchronized (sGlobalLock) {
-            activeCaches = getActiveCaches();
-        }
-        for (int i = 0; i < activeCaches.size(); i++) {
-            activeCaches.get(i).clear();
+        for (PropertyInvalidatedCache pic : getActiveCaches()) {
+            pic.clear();
         }
     }
 }
diff --git a/core/java/android/app/TEST_MAPPING b/core/java/android/app/TEST_MAPPING
index 0af96c227d6a..5b0bd9614f83 100644
--- a/core/java/android/app/TEST_MAPPING
+++ b/core/java/android/app/TEST_MAPPING
@@ -175,23 +175,6 @@
             "file_patterns": [
                 "(/|^)KeyguardManager.java"
             ]
-        },
-        {
-            "name": "FrameworksCoreTests",
-            "options": [
-                {
-                    "exclude-annotation": "androidx.test.filters.FlakyTest"
-                },
-                {
-                    "exclude-annotation": "org.junit.Ignore"
-                },
-                {
-                    "include-filter": "android.app.PropertyInvalidatedCacheTest"
-                }
-            ],
-            "file_patterns": [
-                "(/|^)PropertyInvalidatedCache.java"
-            ]
         }
     ],
     "presubmit-large": [
diff --git a/core/tests/coretests/src/android/app/PropertyInvalidatedCacheTests.java b/core/tests/coretests/src/android/app/PropertyInvalidatedCacheTests.java
index 3768063f2a91..ed2b10117308 100644
--- a/core/tests/coretests/src/android/app/PropertyInvalidatedCacheTests.java
+++ b/core/tests/coretests/src/android/app/PropertyInvalidatedCacheTests.java
@@ -368,20 +368,4 @@ public class PropertyInvalidatedCacheTests {
             PropertyInvalidatedCache.MODULE_BLUETOOTH, "getState");
         assertEquals(n1, "cache_key.bluetooth.get_state");
     }
-
-    @Test
-    public void testOnTrimMemory() {
-        TestCache cache = new TestCache(MODULE, "trimMemoryTest");
-        // The cache is not active until it has been invalidated once.
-        cache.invalidateCache();
-        // Populate the cache with six entries.
-        for (int i = 0; i < 6; i++) {
-            cache.query(i);
-        }
-        // The maximum number of entries in TestCache is 4, so even though six entries were
-        // created, only four are retained.
-        assertEquals(4, cache.size());
-        PropertyInvalidatedCache.onTrimMemory();
-        assertEquals(0, cache.size());
-    }
 }