am 1a352f4f: am 36eaa869: Merge "Sprint: MMS proxy authorization does not include NAI" into lmp-mr1-dev

* commit '1a352f4f6b68f5a22baaed3545d5e8d601616019':
  Sprint: MMS proxy authorization does not include NAI

telephony/java/android/telephony/TelephonyManager.java

@@ -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>

telephony/java/com/android/internal/telephony/IPhoneSubInfo.aidl

@@ -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.