Merge "Handle mnc 00 while retrieving the Resources based on subid" into nyc-dev

2016-04-18 16:25:02 +00:00
parent 853304c0b1 e1da5a3964
commit 37c26e4d13
1 changed files with 1 additions and 0 deletions
--- a/telephony/java/android/telephony/SubscriptionManager.java
+++ b/telephony/java/android/telephony/SubscriptionManager.java
@@ -1347,6 +1347,7 @@ public class SubscriptionManager {
        if (subInfo != null) {
            newConfig.mcc = subInfo.getMcc();
            newConfig.mnc = subInfo.getMnc();
+            if (newConfig.mnc == 0) newConfig.mnc = Configuration.MNC_ZERO;
        }
        DisplayMetrics metrics = context.getResources().getDisplayMetrics();
        DisplayMetrics newMetrics = new DisplayMetrics();