commit 138b89d65239d576433a42a0e6e1a023ade20fa6
author Willy Hu <willycwhu@google.com> Mon Mar 22 11:36:54 2021 +0800
committer Willy Hu <willycwhu@google.com> Mon Mar 22 15:43:23 2021 +0000
tree 464e772163606585776c4814ec4c239149a4a532
parent efbd8b39615a3f539798bf71aa509332bae11e27

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

diff --git a/telephony/java/android/telephony/SubscriptionManager.java b/telephony/java/android/telephony/SubscriptionManager.java
index 85fe14e..47a802f 100644
--- a/telephony/java/android/telephony/SubscriptionManager.java
+++ b/telephony/java/android/telephony/SubscriptionManager.java
@@ -2465,7 +2465,10 @@
         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) {