Handle mnc 00 while retrieving the Resources based on subid

Ruthwar Kumar Ambeer · Steve Kondik · commit 5a9abe4a1647 · 2016-05-21T16:24:14.000-07:00
Since mnc 00 is represented as undefined it needs to be replaced
with MNC_ZERO 0xffff for retrieving proper resources.

Change-Id: I9864ae95497593c6e7c442e6aae811e704c9a504
CRs-Fixed: 970188
diff --git a/telephony/java/android/telephony/SubscriptionManager.java b/telephony/java/android/telephony/SubscriptionManager.java
@@ -1397,7 +1397,7 @@ public static Resources getResourcesForSubId(Context context, int subId) {
         newConfig.setTo(config);
         if (subInfo != null) {
             newConfig.mcc = subInfo.getMcc();
-            newConfig.mnc = subInfo.getMnc();
+            newConfig.mnc = subInfo.getMnc() == 0 ? Configuration.MNC_ZERO : subInfo.getMnc();
         }
         DisplayMetrics metrics = context.getResources().getDisplayMetrics();
         DisplayMetrics newMetrics = new DisplayMetrics();

Original file line number	Diff line number	Diff line change
`@@ -1397,7 +1397,7 @@ public static Resources getResourcesForSubId(Context context, int subId) {`
`1397`	`1397`	`newConfig.setTo(config);`
`1398`	`1398`	`if (subInfo != null) {`
`1399`	`1399`	`newConfig.mcc = subInfo.getMcc();`
`1400`		`- newConfig.mnc = subInfo.getMnc();`
	`1400`	`+ newConfig.mnc = subInfo.getMnc() == 0 ? Configuration.MNC_ZERO : subInfo.getMnc();`
`1401`	`1401`	`}`
`1402`	`1402`	`DisplayMetrics metrics = context.getResources().getDisplayMetrics();`
`1403`	`1403`	`DisplayMetrics newMetrics = new DisplayMetrics();`