Merge AU_LINUX_ANDROID_LA.BF.1.1.3_RB1.06.00.01.181.013 on remote branch
Change-Id: I36b503f2d5cb0ea95f01ea840e74f1d87e41d14f
diff --git a/src/com/android/mms/ui/MessageUtils.java b/src/com/android/mms/ui/MessageUtils.java
index 70a0d08..a6a0ffc 100755
--- a/src/com/android/mms/ui/MessageUtils.java
+++ b/src/com/android/mms/ui/MessageUtils.java
@@ -1784,7 +1784,7 @@
return TelephonyManager.getDefault().isMultiSimEnabled();
}
- private static boolean isCDMAPhone(int subscription) {
+ public static boolean isCDMAPhone(int subscription) {
boolean isCDMA = false;
int activePhone = isMultiSimEnabledMms()
? TelephonyManager.getDefault().getCurrentPhoneType(subscription)
diff --git a/src/com/android/mms/ui/MessagingPreferenceActivity.java b/src/com/android/mms/ui/MessagingPreferenceActivity.java
index aa134c5..059f4a2 100755
--- a/src/com/android/mms/ui/MessagingPreferenceActivity.java
+++ b/src/com/android/mms/ui/MessagingPreferenceActivity.java
@@ -1062,7 +1062,12 @@
}
int count = TelephonyManager.getDefault().getPhoneCount();
for (int i = 0; i < count; i++) {
- setSMSCPrefState(i, !isAirPlaneModeOn() &&
+ boolean isCDMA = false;
+ int subId[] = SubscriptionManager.getSubId(i);
+ if (subId != null && subId.length != 0) {
+ isCDMA = MessageUtils.isCDMAPhone(subId[0]);
+ }
+ setSMSCPrefState(i, !isCDMA && !isAirPlaneModeOn() &&
(TelephonyManager.getDefault().isMultiSimEnabled()
? MessageUtils.isIccCardActivated(i)
: TelephonyManager.getDefault().hasIccCard()));