[automerge] Cache the resources when the mnc of the configuration is not zero 2p: 9beb2691d9

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

Bug: 214250834
Change-Id: I6a58d40958baca878b3c6cfdae5bb2e46f64861c

1 files changed, 7 insertions, 13 deletions

diff --git a/src/com/android/cellbroadcastreceiver/CellBroadcastSettings.java b/src/com/android/cellbroadcastreceiver/CellBroadcastSettings.java
index 4d461f83d..aae899d43 100644
--- a/src/com/android/cellbroadcastreceiver/CellBroadcastSettings.java
+++ b/src/com/android/cellbroadcastreceiver/CellBroadcastSettings.java
@@ -33,7 +33,6 @@ import android.os.Bundle;
 import android.os.UserManager;
 import android.os.Vibrator;
 import android.telephony.SubscriptionManager;
-import android.telephony.TelephonyManager;
 import android.util.Log;
 import android.view.MenuItem;
 import android.widget.Switch;
@@ -854,17 +853,8 @@ public class CellBroadcastSettings extends CollapsingToolbarBaseActivity {
      */
     public static @NonNull Resources getResources(@NonNull Context context, int subId) {
 
-        try {
-            if (subId == SubscriptionManager.DEFAULT_SUBSCRIPTION_ID
-                    || !SubscriptionManager.isValidSubscriptionId(subId)
-                    // per the latest design, subId can be valid earlier than mcc mnc is known to
-                    // telephony. check if sim is loaded to avoid caching the wrong resources.
-                    || context.getSystemService(TelephonyManager.class).getSimApplicationState(
-                    SubscriptionManager.getSlotIndex(subId)) != TelephonyManager.SIM_STATE_LOADED) {
-                return context.getResources();
-            }
-        } catch (Exception e) {
-            Log.d(TAG, "Fail to getSimApplicationState due to " + e);
+        if (subId == SubscriptionManager.DEFAULT_SUBSCRIPTION_ID
+                || !SubscriptionManager.isValidSubscriptionId(subId)) {
             return context.getResources();
         }
 
@@ -875,7 +865,11 @@ public class CellBroadcastSettings extends CollapsingToolbarBaseActivity {
 
             Resources res = SubscriptionManager.getResourcesForSubId(context, subId);
 
-            sResourcesCache.put(subId, res);
+            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;
         }