Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 93487e28 authored by xinhe's avatar xinhe Committed by android-build-merger
Browse files

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

automerge: fc921d19

* commit 'fc921d19':
  Sprint: MMS cannot be sent in the UK
parents 4a40f7cc fc921d19

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) {