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

Commit e2d4221a 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 am:... 

Merge "Prevent Caching the Invalid Resource" am: a997cf44 am: 00330273 am: 3915c76a am: 997917d4

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

Change-Id: I199589281ebfba1b110b1169b22c703532fea635
parents f117ea5f 997917d4

telephony/java/android/telephony/SubscriptionManager.java

+4 −1
Original line number Original line Diff line number Diff line
@@ -2633,7 +2633,10 @@ public class SubscriptionManager { 
        if (subInfo != null) {

        if (subInfo != null) {

            overrideConfig.mcc = subInfo.getMcc();

            overrideConfig.mcc = subInfo.getMcc();

            overrideConfig.mnc = subInfo.getMnc();

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

        if (useRootLocale) {