PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Unhiding MSIM APIs.

Browse Source 
1. Unhide MSIM APIs in TelephonyManager that already have non-MSIM equivalent
   APIs public.
2. Make MSIM API naming consistent (overloaded, no suffix).
3. Unhide APIs in SubscriptionManager that are necessary for MSIM.

Bug: 26772894
Change-Id: I69471769ece56dd2d505f087d2ed3b585eb4b2d0
This commit is contained in:
Shishir Agrawal
2016-01-25 14:05:32 -08:00
parent 679fde4c15
commit d2b0fc066c
5 changed files with 10 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/com/android/settings/ResetNetwork.java
View File

@@ -131,15 +131,15 @@ public class ResetNetwork extends InstrumentedFragment {
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;

2
src/com/android/settings/deviceinfo/SimStatus.java
View File

@@ -357,7 +357,7 @@ public class SimStatus extends InstrumentedPreferenceActivity {
}
}
String rawNumber = mTelephonyManager.getLine1NumberForSubscriber(mSir.getSubscriptionId());
String rawNumber = mTelephonyManager.getLine1Number(mSir.getSubscriptionId());
String formattedNumber = null;
if (!TextUtils.isEmpty(rawNumber)) {
formattedNumber = PhoneNumberUtils.formatNumber(rawNumber);

6
src/com/android/settings/sim/SimPreferenceDialog.java
View File

@@ -135,16 +135,14 @@ public class SimPreferenceDialog extends Activity {
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));

4
src/com/android/settings/sim/SimSelectNotification.java
View File

@@ -87,9 +87,9 @@ public class SimSelectNotification extends BroadcastReceiver {
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) {

2
src/com/android/settings/sim/SimSettings.java
View File

@@ -300,7 +300,7 @@ public class SimSettings extends RestrictedSettingsFragment implements Indexable
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) {