[automerge] Remove the redundant cache of resources 2p: 46011e2480

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/CellBroadcastReceiver/+/16854983

Bug: 219549062
Change-Id: I0ada38e927b1d77a026da0ff60fc91f58ccfe0c2

1 files changed, 1 insertions, 19 deletions

diff --git a/src/com/android/cellbroadcastreceiver/CellBroadcastSettings.java b/src/com/android/cellbroadcastreceiver/CellBroadcastSettings.java
index aae899d43..9f609d42e 100644
--- a/src/com/android/cellbroadcastreceiver/CellBroadcastSettings.java
+++ b/src/com/android/cellbroadcastreceiver/CellBroadcastSettings.java
@@ -158,9 +158,6 @@ public class CellBroadcastSettings extends CollapsingToolbarBaseActivity {
 
     /* End of user preferences keys section. */
 
-    // Resource cache
-    private static final Map<Integer, Resources> sResourcesCache = new HashMap<>();
-
     // Resource cache per operator
     private static final Map<String, Resources> sResourcesCacheByOperator = new HashMap<>();
     private static final Object sCacheLock = new Object();
@@ -858,21 +855,7 @@ public class CellBroadcastSettings extends CollapsingToolbarBaseActivity {
             return context.getResources();
         }
 
-        synchronized (sCacheLock) {
-            if (sResourcesCache.containsKey(subId)) {
-                return sResourcesCache.get(subId);
-            }
-
-            Resources res = SubscriptionManager.getResourcesForSubId(context, subId);
-
-            if (res.getConfiguration().mnc != 0) {
-                Log.d(TAG, "Cache resource for sub: " + subId + ", mcc: "
-                        + res.getConfiguration().mcc + ", mnc:" + res.getConfiguration().mnc);
-                sResourcesCache.put(subId, res);
-            }
-
-            return res;
-        }
+        return SubscriptionManager.getResourcesForSubId(context, subId);
     }
 
     /**
@@ -973,7 +956,6 @@ public class CellBroadcastSettings extends CollapsingToolbarBaseActivity {
     public static void resetResourcesCache() {
         synchronized (sCacheLock) {
             sResourcesCacheByOperator.clear();
-            sResourcesCache.clear();
         }
     }
 }