commit ea920cf6c982d5fe5974d07e03db077960bd43e2
author gitbuildkicker <android-build@google.com> Wed Mar 22 21:23:32 2017 -0700
committer gitbuildkicker <android-build@google.com> Wed Mar 22 21:23:32 2017 -0700
tree 79af1c8433dbe0be36dd344c05201f2b1bf97aa8
parent 5ce5c2e9b6533d8e7862d19561f3b57d2bd9913b
parent eb460f40cbe0649a5fc577c9d852eb54447725d6

merge in oc-release history after reset to master

src/com/android/mms/service/MmsHttpClient.java

diff --git a/src/com/android/mms/service/MmsHttpClient.java b/src/com/android/mms/service/MmsHttpClient.java
index b117086..8d6a0d0 100644
--- a/src/com/android/mms/service/MmsHttpClient.java
+++ b/src/com/android/mms/service/MmsHttpClient.java
@@ -498,7 +498,7 @@
     private static String getNai(Context context, Bundle mmsConfig, int subId) {
         final TelephonyManager telephonyManager = (TelephonyManager) context.getSystemService(
                 Context.TELEPHONY_SERVICE);
-        String nai = telephonyManager.getNai(SubscriptionManager.getSlotId(subId));
+        String nai = telephonyManager.getNai(SubscriptionManager.getSlotIndex(subId));
         if (LogUtil.isLoggable(Log.VERBOSE)) {
             LogUtil.v("getNai: nai=" + nai);
         }