Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3915c76a authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Prevent Caching the Invalid Resource" am: a997cf44 am: 00330273 

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

Change-Id: I62b026efe21adfceb24235da89f7bca8385ed22e
parents eca71c13 00330273

telephony/java/android/telephony/SubscriptionManager.java

+4 −1
Original line number Diff line number Diff line
@@ -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) {