diff options
| -rw-r--r-- | api/system-current.txt | 2 | ||||
| -rw-r--r-- | telephony/java/android/telephony/TelephonyManager.java | 5 | ||||
| -rw-r--r-- | telephony/java/android/telephony/ims/ImsMmTelManager.java | 2 |
3 files changed, 8 insertions, 1 deletions
diff --git a/api/system-current.txt b/api/system-current.txt index 4a2fa6282d19..0a4128ed1984 100644 --- a/api/system-current.txt +++ b/api/system-current.txt @@ -5623,6 +5623,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 getRadioPowerState(); method public int getSimApplicationState(); method public int getSimCardState(); @@ -6158,6 +6159,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 1fa1599663ef..6831edfc0fd2 100644 --- a/telephony/java/android/telephony/TelephonyManager.java +++ b/telephony/java/android/telephony/TelephonyManager.java @@ -5877,9 +5877,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 122626f0c77a..e2350fe78500 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) { |