Merge "Sprint: MMS cannot be sent in the UK" into lmp-mr1-dev

2015-01-28 21:42:14 +00:00
parent 1f81973e7d 6620b4273e
commit fc921d19b6
1 changed files with 5 additions and 1 deletions
--- a/telephony/java/android/telephony/TelephonyManager.java
+++ b/telephony/java/android/telephony/TelephonyManager.java
@@ -703,7 +703,11 @@ public class TelephonyManager {
    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) {