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

Commit 6ef1b7e2 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Expose WFC roaming Mode ISIM IST EF as SystemApi"

parents 2c9dad72 c50a1ef7

api/system-current.txt

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

    method public boolean getEmergencyCallbackMode();

    method public java.lang.String getIsimDomain();

    method public java.lang.String getIsimIst();

    method public int getPreferredNetworkTypeBitmap();

    method public int getRadioPowerState();

    method public int getSimApplicationState();
@@ -6985,6 +6986,7 @@ package android.telephony.ims { 
  public class ImsMmTelManager {

    method public static android.telephony.ims.ImsMmTelManager createForSubscriptionId(android.content.Context, int);

    method public int getVoWiFiModeSetting();

    method public int getVoWiFiRoamingModeSetting();

    method public boolean isAdvancedCallingSettingEnabled();

    method public boolean isAvailable(int, int);

    method public boolean isCapable(int, int);

telephony/java/android/telephony/TelephonyManager.java

+5 −0
Original line number Diff line number Diff line
@@ -5858,9 +5858,14 @@ public class TelephonyManager { 


    /**

     * Returns the IMS Service Table (IST) that was loaded from the ISIM.

     *

     * See 3GPP TS 31.103 (Section 4.2.7) for the definition and more information on this table.

     *

     * @return IMS Service Table or null if not present or not loaded

     * @hide

     */

    @SystemApi

    @RequiresPermission(Manifest.permission.READ_PRIVILEGED_PHONE_STATE)

    public String getIsimIst() {

        try {

            IPhoneSubInfo info = getSubscriberInfo();

telephony/java/android/telephony/ims/ImsMmTelManager.java

+1 −1
Original line number Diff line number Diff line
@@ -714,7 +714,7 @@ public class ImsMmTelManager { 
     * @see #setVoWiFiRoamingSetting(boolean)

     */

    @RequiresPermission(Manifest.permission.READ_PRIVILEGED_PHONE_STATE)

    @WiFiCallingMode int getVoWiFiRoamingModeSetting() {

    public @WiFiCallingMode int getVoWiFiRoamingModeSetting() {

        try {

            return getITelephony().getVoWiFiRoamingModeSetting(mSubId);

        } catch (RemoteException e) {