Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Prevent Caching the Invalid Resource" am: a997cf4420 am: 00330273ed am: 3915c76a13

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1646975

Change-Id: I0b366685c74f53f0a93f3790646b6a038a28f38e
This commit is contained in:
Treehugger Robot
2021-04-06 19:34:11 +00:00
committed by Automerger Merge Worker
parent 6b2d6fbea5 3915c76a13
commit 997917d403
1 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
telephony/java/android/telephony/SubscriptionManager.java
View File

@@ -2633,7 +2633,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) {