diff --git a/api/system-current.txt b/api/system-current.txt index 189611d2040ba..1ddbf36efe45a 100644 --- a/api/system-current.txt +++ b/api/system-current.txt @@ -5458,6 +5458,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 getPreferredNetworkType(int); method public int getRadioPowerState(); method public int getSimApplicationState(); @@ -6015,6 +6016,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); diff --git a/telephony/java/android/telephony/TelephonyManager.java b/telephony/java/android/telephony/TelephonyManager.java index 739c80fd9d976..37a04c5df6f39 100644 --- a/telephony/java/android/telephony/TelephonyManager.java +++ b/telephony/java/android/telephony/TelephonyManager.java @@ -5822,9 +5822,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(); diff --git a/telephony/java/android/telephony/ims/ImsMmTelManager.java b/telephony/java/android/telephony/ims/ImsMmTelManager.java index 122626f0c77ae..e2350fe78500b 100644 --- a/telephony/java/android/telephony/ims/ImsMmTelManager.java +++ b/telephony/java/android/telephony/ims/ImsMmTelManager.java @@ -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) {