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

Commit 42722c68 authored by goneil's avatar goneil
Browse files

Make TelephonyManager#getNai() public 

Bug: 67750905
Test: android.telephony.cts.TelephonyManagerTest#testTelephonyManager
Change-Id: I92af07a5ed2abd852ff0f79909c574d78b89f535
parent d04c00a4

api/current.txt

+1 −0
Original line number Original line Diff line number Diff line
@@ -40834,6 +40834,7 @@ package android.telephony { 
    method public java.lang.String getMeid(int);

    method public java.lang.String getMeid(int);

    method public java.lang.String getMmsUAProfUrl();

    method public java.lang.String getMmsUAProfUrl();

    method public java.lang.String getMmsUserAgent();

    method public java.lang.String getMmsUserAgent();

    method public java.lang.String getNai();

    method public deprecated java.util.List<android.telephony.NeighboringCellInfo> getNeighboringCellInfo();

    method public deprecated java.util.List<android.telephony.NeighboringCellInfo> getNeighboringCellInfo();

    method public java.lang.String getNetworkCountryIso();

    method public java.lang.String getNetworkCountryIso();

    method public java.lang.String getNetworkOperator();

    method public java.lang.String getNetworkOperator();

telephony/java/android/telephony/TelephonyManager.java

+14 −5
Original line number Original line Diff line number Diff line
@@ -1121,12 +1121,14 @@ public class TelephonyManager { 
    }

    }





    /**

    /**

     * Returns the NAI. Return null if NAI is not available.

     * Returns the Network Access Identifier (NAI). Return null if NAI is not available.

     *

     * <p>

     * Requires Permission:

     *   {@link android.Manifest.permission#READ_PHONE_STATE READ_PHONE_STATE}

     */

     */

    /** {@hide}*/

    @RequiresPermission(android.Manifest.permission.READ_PHONE_STATE)

    public String getNai() {

    public String getNai() {

        return getNai(getSlotIndex());

        return getNaiBySubscriberId(getSubId());

    }

    }





    /**

    /**
@@ -1137,11 +1139,18 @@ public class TelephonyManager { 
    /** {@hide}*/

    /** {@hide}*/

    public String getNai(int slotIndex) {

    public String getNai(int slotIndex) {

        int[] subId = SubscriptionManager.getSubId(slotIndex);

        int[] subId = SubscriptionManager.getSubId(slotIndex);

        if (subId == null) {

            return null;

        }

        return getNaiBySubscriberId(subId[0]);

    }



    private String getNaiBySubscriberId(int subId) {

        try {

        try {

            IPhoneSubInfo info = getSubscriberInfo();

            IPhoneSubInfo info = getSubscriberInfo();

            if (info == null)

            if (info == null)

                return null;

                return null;

            String nai = info.getNaiForSubscriber(subId[0], mContext.getOpPackageName());

            String nai = info.getNaiForSubscriber(subId, mContext.getOpPackageName());

            if (Log.isLoggable(TAG, Log.VERBOSE)) {

            if (Log.isLoggable(TAG, Log.VERBOSE)) {

                Rlog.v(TAG, "Nai = " + nai);

                Rlog.v(TAG, "Nai = " + nai);

            }

            }