commit c84a5057cfd70a06b66a95ad1fef7ff43205351b
author Shishir Agrawal <shishir@google.com> Mon Jan 25 14:06:08 2016 -0800
committer Shishir Agrawal <shishir@google.com> Tue Jan 26 09:32:52 2016 -0800
tree 59b4c3248047987336664f541c5b96ce383a4c4c
parent df84a2311ef9144bb938ba9cee1c4ed6142f53f8

DO NOT MERGE : 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: Ifebb053dad16916a55606f184c64420e417ae2e4

src/com/android/providers/telephony/TelephonyProvider.java

diff --git a/src/com/android/providers/telephony/TelephonyProvider.java b/src/com/android/providers/telephony/TelephonyProvider.java
index 0137237..0de0e79 100644
--- a/src/com/android/providers/telephony/TelephonyProvider.java
+++ b/src/com/android/providers/telephony/TelephonyProvider.java
@@ -1069,7 +1069,7 @@
 
         static public ContentValues setDefaultValue(ContentValues values) {
             if (!values.containsKey(Telephony.Carriers.SUBSCRIPTION_ID)) {
-                int subId = SubscriptionManager.getDefaultSubId();
+                int subId = SubscriptionManager.getDefaultSubscriptionId();
                 values.put(Telephony.Carriers.SUBSCRIPTION_ID, subId);
             }
 
@@ -1550,7 +1550,7 @@
             + selection + "selectionArgs=" + selectionArgs + ", sort=" + sort);
         TelephonyManager mTelephonyManager =
                 (TelephonyManager)getContext().getSystemService(Context.TELEPHONY_SERVICE);
-        int subId = SubscriptionManager.getDefaultSubId();
+        int subId = SubscriptionManager.getDefaultSubscriptionId();
         String subIdString;
         SQLiteQueryBuilder qb = new SQLiteQueryBuilder();
         qb.setStrict(true); // a little protection from injection attacks
@@ -1701,7 +1701,7 @@
     public synchronized Uri insert(Uri url, ContentValues initialValues)
     {
         Uri result = null;
-        int subId = SubscriptionManager.getDefaultSubId();
+        int subId = SubscriptionManager.getDefaultSubscriptionId();
 
         checkPermission();
 
@@ -1843,7 +1843,7 @@
     public synchronized int delete(Uri url, String where, String[] whereArgs)
     {
         int count = 0;
-        int subId = SubscriptionManager.getDefaultSubId();
+        int subId = SubscriptionManager.getDefaultSubscriptionId();
         String userOrCarrierEdited = ") and (" +
                 Telephony.Carriers.EDITED + "=" + Telephony.Carriers.USER_EDITED +  " or " +
                 Telephony.Carriers.EDITED + "=" + Telephony.Carriers.CARRIER_EDITED + ")";
@@ -1986,7 +1986,7 @@
     {
         int count = 0;
         int uriType = URL_UNKNOWN;
-        int subId = SubscriptionManager.getDefaultSubId();
+        int subId = SubscriptionManager.getDefaultSubscriptionId();
 
         checkPermission();