From 138b89d65239d576433a42a0e6e1a023ade20fa6 Mon Sep 17 00:00:00 2001
From: Willy Hu <willycwhu@google.com>
Date: Mon, 22 Mar 2021 11:36:54 +0800
Subject: Prevent Caching the Invalid Resource

In the old design, device may cached the invalid resource,
SubscriptionManager#getResourcesForSubId return the wrong
resource after factory reset. We clear the cache to prevent
the invalid resource.

Bug: 181202520
Test: atest SubscriptionControllerTest#testGetResourcesForSubId
      atest FrameworksTelephonyTests
Change-Id: Id16c76bec55b32937a723f1a0d825ab16f5e8afb
---
 telephony/java/android/telephony/SubscriptionManager.java | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/telephony/java/android/telephony/SubscriptionManager.java b/telephony/java/android/telephony/SubscriptionManager.java
index 85fe14ef8062..47a802f07b38 100644
--- a/telephony/java/android/telephony/SubscriptionManager.java
+++ b/telephony/java/android/telephony/SubscriptionManager.java
@@ -2465,7 +2465,10 @@ public class SubscriptionManager {
         if (subInfo != null) {
             overrideConfig.mcc = subInfo.getMcc();
             overrideConfig.mnc = subInfo.getMnc();
-            if (overrideConfig.mnc == 0) overrideConfig.mnc = Configuration.MNC_ZERO;
+            if (overrideConfig.mnc == 0) {
+                overrideConfig.mnc = Configuration.MNC_ZERO;
+                cacheKey = null;
+            }
         }
 
         if (useRootLocale) {
-- 
cgit v1.2.3-59-g8ed1b