commit dd192a650bae5c381037a5cf6307f4bc32066a61
author Sanket Padawe <sanketpadawe@google.com> Thu Mar 23 00:58:09 2017 +0000
committer android-build-merger <android-build-merger@google.com> Thu Mar 23 00:58:09 2017 +0000
tree f5d06c4a7a004440000c13a861cb3881ecc2f1a8
parent 06dbece4c5c3a23b85d15154ca68c518677c8ba6
parent efad207abcbee2235ff263beb3f11a34a7490c52

Update SubscriptionManager API by replacing 'id' & 'idx' with 'index'. am: 56eaeedbb4
am: efad207abc

Change-Id: Ia56cbe2705ca7db11773cb79373e64cefed56d2a

src/android/support/v7/mms/MmsHttpClient.java

diff --git a/src/android/support/v7/mms/MmsHttpClient.java b/src/android/support/v7/mms/MmsHttpClient.java
index 8ca34da..6c1c35e 100644
--- a/src/android/support/v7/mms/MmsHttpClient.java
+++ b/src/android/support/v7/mms/MmsHttpClient.java
@@ -466,19 +466,19 @@
     }
 
     /**
-     * Invoke hidden SubscriptionManager.getSlotId(int)
+     * Invoke hidden SubscriptionManager.getSlotIndex(int)
      *
      * @param subId the subId
      * @return the SIM slot ID
      */
     private static int getSlotId(final int subId) {
         try {
-            final Method method = SubscriptionManager.class.getMethod("getSlotId", Integer.TYPE);
+            final Method method = SubscriptionManager.class.getMethod("getSlotIndex", Integer.TYPE);
             if (method != null) {
                 return (Integer) method.invoke(null, subId);
             }
         } catch (Exception e) {
-            Log.w(MmsService.TAG, "SubscriptionManager.getSlotId failed " + e);
+            Log.w(MmsService.TAG, "SubscriptionManager.getSlotIndex failed " + e);
         }
         return -1;
     }