am 93487e28: Merge "Sprint: MMS cannot be sent in the UK" into lmp-mr1-dev automerge: fc921d1
* commit '93487e286e6bfa434fb092c6276d96b40e5d62c4':
Sprint: MMS cannot be sent in the UK
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) {