Unhiding MSIM APIs.

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

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;