commit eb460f40cbe0649a5fc577c9d852eb54447725d6
author gitbuildkicker <android-build@google.com> Wed Mar 22 17:15:33 2017 -0700
committer gitbuildkicker <android-build@google.com> Wed Mar 22 17:15:33 2017 -0700
tree 87e7c607c506f3a43446cc1bcedf0e6aa4a6a5b4
parent 904cf685507edf016af0068fb2b5c2499b146e54
parent 5ce5c2e9b6533d8e7862d19561f3b57d2bd9913b

merge in oc-release history after reset to 904cf685507edf016af0068fb2b5c2499b146e54

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 8d6a0d0..b117086 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.getSlotIndex(subId));
+        String nai = telephonyManager.getNai(SubscriptionManager.getSlotId(subId));
         if (LogUtil.isLoggable(Log.VERBOSE)) {
             LogUtil.v("getNai: nai=" + nai);
         }