summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Treehugger Robot <treehugger-gerrit@google.com> 2021-04-06 18:42:36 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2021-04-06 18:42:36 +0000
commit3915c76a13ba406eb955a162c16bad0eda7f2e29 (patch)
tree993f208a8b064c0f3ffc23fcf4160d02d0b192ad
parenteca71c137d6265ecf26e8610b813d2104990b54c (diff)
parent00330273edd654681ebfbdd61563011b2c63ac22 (diff)
Merge "Prevent Caching the Invalid Resource" am: a997cf4420 am: 00330273ed
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1646975 Change-Id: I62b026efe21adfceb24235da89f7bca8385ed22e
-rw-r--r--telephony/java/android/telephony/SubscriptionManager.java5
1 files changed, 4 insertions, 1 deletions
diff --git a/telephony/java/android/telephony/SubscriptionManager.java b/telephony/java/android/telephony/SubscriptionManager.java
index c9f658c2a432..2908e94aad81 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) {