Merge "Prevent Caching the Invalid Resource" am: a997cf4420

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

Change-Id: I50f07eef2baf91b2f6787c7052217459d5be35dc
This commit is contained in:
Treehugger Robot
2021-04-06 17:58:07 +00:00
committed by Automerger Merge Worker

View File

@@ -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) {