Merge "Sprint: MMS cannot be sent in the UK" into lmp-mr1-dev (fc921d19) · Commits · e / os / android_frameworks_base

telephony/java/android/telephony/TelephonyManager.java

+5 −1

Original line number	Diff line number	Diff line
		@@ -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) {