commit 7cfb00fb9453346fa708158bcfeffd36783e31d9
author xinhe <xinhe@google.com> Wed Jan 28 21:56:50 2015 +0000
committer android-build-merger <android-build-merger@google.com> Wed Jan 28 21:56:50 2015 +0000
tree 0d8703617d678ade3e46d0060477687a31ec5d97
parent 43181fb72d12bbf4f89a015f5020229b6ee00aab
parent 5e51c21943a4e9c0096acbaee5f923e9e0297f25

am 93487e28: Merge "Sprint: MMS cannot be sent in the UK" into lmp-mr1-dev automerge: fc921d1
automerge: 5e51c21

* commit '5e51c21943a4e9c0096acbaee5f923e9e0297f25':
  Sprint: MMS cannot be sent in the UK

telephony/java/android/telephony/TelephonyManager.java

diff --git a/telephony/java/android/telephony/TelephonyManager.java b/telephony/java/android/telephony/TelephonyManager.java
index ace945d..a07d10c 100644
--- a/telephony/java/android/telephony/TelephonyManager.java
+++ b/telephony/java/android/telephony/TelephonyManager.java
@@ -703,7 +703,11 @@
     public String getNai(int slotId) {
         int[] subId = SubscriptionManager.getSubId(slotId);
         try {
-            return getSubscriberInfo().getNaiForSubscriber(subId[0]);
+            String nai = getSubscriberInfo().getNaiForSubscriber(subId[0]);
+            if (Log.isLoggable(TAG, Log.VERBOSE)) {
+                Rlog.v(TAG, "Nai = " + nai);
+            }
+            return nai;
         } catch (RemoteException ex) {
             return null;
         } catch (NullPointerException ex) {