Merge "Support multiple CA certs when editing a saved Wifi network." into mm-wireless-dev
diff --git a/src/com/android/settings/ResetNetwork.java b/src/com/android/settings/ResetNetwork.java
index 2e57dc3..92b13c3 100644
--- a/src/com/android/settings/ResetNetwork.java
+++ b/src/com/android/settings/ResetNetwork.java
@@ -144,15 +144,15 @@
mSubscriptions = SubscriptionManager.from(getActivity()).getActiveSubscriptionInfoList();
if (mSubscriptions != null && mSubscriptions.size() > 0) {
// Get the default subscription in the order of data, voice, sms, first up.
- int defaultSubscription = SubscriptionManager.getDefaultDataSubId();
+ int defaultSubscription = SubscriptionManager.getDefaultDataSubscriptionId();
if (!SubscriptionManager.isUsableSubIdValue(defaultSubscription)) {
- defaultSubscription = SubscriptionManager.getDefaultVoiceSubId();
+ defaultSubscription = SubscriptionManager.getDefaultVoiceSubscriptionId();
}
if (!SubscriptionManager.isUsableSubIdValue(defaultSubscription)) {
- defaultSubscription = SubscriptionManager.getDefaultSmsSubId();
+ defaultSubscription = SubscriptionManager.getDefaultSmsSubscriptionId();
}
if (!SubscriptionManager.isUsableSubIdValue(defaultSubscription)) {
- defaultSubscription = SubscriptionManager.getDefaultSubId();
+ defaultSubscription = SubscriptionManager.getDefaultSubscriptionId();
}
int selectedIndex = 0;
diff --git a/src/com/android/settings/deviceinfo/SimStatus.java b/src/com/android/settings/deviceinfo/SimStatus.java
index 62ed9f1..e5ddd98 100644
--- a/src/com/android/settings/deviceinfo/SimStatus.java
+++ b/src/com/android/settings/deviceinfo/SimStatus.java
@@ -360,7 +360,7 @@
}
}
- String rawNumber = mTelephonyManager.getLine1NumberForSubscriber(mSir.getSubscriptionId());
+ String rawNumber = mTelephonyManager.getLine1Number(mSir.getSubscriptionId());
String formattedNumber = null;
if (!TextUtils.isEmpty(rawNumber)) {
formattedNumber = PhoneNumberUtils.formatNumber(rawNumber);
diff --git a/src/com/android/settings/sim/SimPreferenceDialog.java b/src/com/android/settings/sim/SimPreferenceDialog.java
index f03b452..530cb38 100644
--- a/src/com/android/settings/sim/SimPreferenceDialog.java
+++ b/src/com/android/settings/sim/SimPreferenceDialog.java
@@ -135,16 +135,14 @@
final TelephonyManager tm = (TelephonyManager) mContext.getSystemService(
Context.TELEPHONY_SERVICE);
TextView numberView = (TextView)mDialogLayout.findViewById(R.id.number);
- final String rawNumber = tm.getLine1NumberForSubscriber(
- mSubInfoRecord.getSubscriptionId());
+ final String rawNumber = tm.getLine1Number(mSubInfoRecord.getSubscriptionId());
if (TextUtils.isEmpty(rawNumber)) {
numberView.setText(res.getString(com.android.internal.R.string.unknownName));
} else {
numberView.setText(PhoneNumberUtils.formatNumber(rawNumber));
}
- String simCarrierName = tm.getSimOperatorNameForSubscription(mSubInfoRecord
- .getSubscriptionId());
+ String simCarrierName = tm.getSimOperatorName(mSubInfoRecord.getSubscriptionId());
TextView carrierView = (TextView)mDialogLayout.findViewById(R.id.carrier);
carrierView.setText(!TextUtils.isEmpty(simCarrierName) ? simCarrierName :
mContext.getString(com.android.internal.R.string.unknownName));
diff --git a/src/com/android/settings/sim/SimSelectNotification.java b/src/com/android/settings/sim/SimSelectNotification.java
index fd54e9b..0c32701 100644
--- a/src/com/android/settings/sim/SimSelectNotification.java
+++ b/src/com/android/settings/sim/SimSelectNotification.java
@@ -87,9 +87,9 @@
subscriptionManager.clearDefaultsForInactiveSubIds();
boolean dataSelected = SubscriptionManager.isUsableSubIdValue(
- SubscriptionManager.getDefaultDataSubId());
+ SubscriptionManager.getDefaultDataSubscriptionId());
boolean smsSelected = SubscriptionManager.isUsableSubIdValue(
- SubscriptionManager.getDefaultSmsSubId());
+ SubscriptionManager.getDefaultSmsSubscriptionId());
// If data and sms defaults are selected, dont show notification (Calls default is optional)
if (dataSelected && smsSelected) {
diff --git a/src/com/android/settings/sim/SimSettings.java b/src/com/android/settings/sim/SimSettings.java
index 320a45f..54b3744 100644
--- a/src/com/android/settings/sim/SimSettings.java
+++ b/src/com/android/settings/sim/SimSettings.java
@@ -300,7 +300,7 @@
private String getPhoneNumber(SubscriptionInfo info) {
final TelephonyManager tm =
(TelephonyManager) mContext.getSystemService(Context.TELEPHONY_SERVICE);
- return tm.getLine1NumberForSubscriber(info.getSubscriptionId());
+ return tm.getLine1Number(info.getSubscriptionId());
}
private void log(String s) {