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: I70622b020e6721fea1efd94bbbc5d1dc69980433

2 files changed, 3 insertions, 3 deletions

diff --git a/src/com/android/mms/service/MmsHttpClient.java b/src/com/android/mms/service/MmsHttpClient.java
index f6d3d1b..b4d3ba6 100644
--- a/src/com/android/mms/service/MmsHttpClient.java
+++ b/src/com/android/mms/service/MmsHttpClient.java
@@ -421,7 +421,7 @@ public class MmsHttpClient {
     private static String getLine1(Context context, int subId) {
         final TelephonyManager telephonyManager = (TelephonyManager) context.getSystemService(
                 Context.TELEPHONY_SERVICE);
-        return telephonyManager.getLine1NumberForSubscriber(subId);
+        return telephonyManager.getLine1Number(subId);
     }
 
     /**
@@ -433,7 +433,7 @@ public class MmsHttpClient {
         return PhoneUtils.getNationalNumber(
                 telephonyManager,
                 subId,
-                telephonyManager.getLine1NumberForSubscriber(subId));
+                telephonyManager.getLine1Number(subId));
     }
 
     /**
diff --git a/src/com/android/mms/service/MmsService.java b/src/com/android/mms/service/MmsService.java
index 45af90b..9d16d01 100644
--- a/src/com/android/mms/service/MmsService.java
+++ b/src/com/android/mms/service/MmsService.java
@@ -132,7 +132,7 @@ public class MmsService extends Service implements MmsRequest.RequestManager {
             throw new RuntimeException("Invalid subId " + subId);
         }
         if (subId == SubscriptionManager.DEFAULT_SUBSCRIPTION_ID) {
-            return SubscriptionManager.getDefaultSmsSubId();
+            return SubscriptionManager.getDefaultSmsSubscriptionId();
         }
         return subId;
     }