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

Commit 42c4682c authored by Chen Xu's avatar Chen Xu Committed by android-build-merger
Browse files

Merge "expose getIsimDomain to systemAPI" am: 56d40d3c 

am: 2b385675

Change-Id: If5313657b5095d668abc8af7de2c99594372a89b
parents d5a43818 2b385675

api/system-current.txt

+1 −0
Original line number Original line Diff line number Diff line
@@ -5256,6 +5256,7 @@ package android.telephony { 
    method public deprecated boolean getDataEnabled();

    method public deprecated boolean getDataEnabled();

    method public deprecated boolean getDataEnabled(int);

    method public deprecated boolean getDataEnabled(int);

    method public boolean getEmergencyCallbackMode();

    method public boolean getEmergencyCallbackMode();

    method public java.lang.String getIsimDomain();

    method public int getSimApplicationState();

    method public int getSimApplicationState();

    method public int getSimCardState();

    method public int getSimCardState();

    method public java.util.List<android.telephony.TelephonyHistogram> getTelephonyHistograms();

    method public java.util.List<android.telephony.TelephonyHistogram> getTelephonyHistograms();

telephony/java/android/telephony/TelephonyManager.java

+8 −3
Original line number Original line Diff line number Diff line
@@ -4139,11 +4139,16 @@ public class TelephonyManager { 
    }

    }





    /**

    /**

     * Returns the IMS home network domain name that was loaded from the ISIM.

     * Returns the IMS home network domain name that was loaded from the ISIM {@see #APPTYPE_ISIM}.

     * @return the IMS domain name, or null if not present or not loaded

     * @return the IMS domain name. Returns {@code null} if ISIM hasn't been loaded or IMS domain

     * hasn't been loaded or isn't present on the ISIM.

     *

     * <p>Requires Permission:

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

     * @hide

     * @hide

     */

     */

    @UnsupportedAppUsage

    @SystemApi

    @RequiresPermission(android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE)

    public String getIsimDomain() {

    public String getIsimDomain() {

        try {

        try {

            IPhoneSubInfo info = getSubscriberInfo();

            IPhoneSubInfo info = getSubscriberInfo();