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

Commit 6bb21401 authored by xinhe's avatar xinhe
Browse files

Sprint: MMS proxy authorization does not include NAI

Read the NAI from CSIM and pass it to MMS module
Bug:17752727

Change-Id: Ib7f53bed87183bd9e67103c676218b5748be668f
parent f23b29ad
Loading
Loading
Loading
Loading
+26 −0
Original line number Diff line number Diff line
@@ -668,6 +668,32 @@ public class TelephonyManager {
        }
    }

    /**
     * Returns the NAI. Return null if NAI is not available.
     *
     */
    /** {@hide}*/
    public String getNai() {
        return getNai(getDefaultSim());
    }

    /**
     * Returns the NAI. Return null if NAI is not available.
     *
     *  @param slotId of which Nai is returned
     */
    /** {@hide}*/
    public String getNai(int slotId) {
        long[] subId = SubscriptionManager.getSubId(slotId);
        try {
            return getSubscriberInfo().getNaiForSubscriber(subId[0]);
        } catch (RemoteException ex) {
            return null;
        } catch (NullPointerException ex) {
            return null;
        }
    }

    /**
     * Returns the current location of the device.
     *<p>
+5 −0
Original line number Diff line number Diff line
@@ -27,6 +27,11 @@ interface IPhoneSubInfo {
     */
    String getDeviceId();

     /**
     * Retrieves the unique Network Access ID
     */
    String getNaiForSubscriber(long subId);

    /**
     * Retrieves the unique device ID of a subId for the device, e.g., IMEI
     * for GSM phones.