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

Prevent Caching the Invalid Resource

Browse Source 
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
This commit is contained in:
Willy Hu
2021-03-22 11:36:54 +08:00
parent efbd8b3961
commit 138b89d652
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

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