Expose WFC roaming Mode ISIM IST EF as SystemApi

Bug: 120986348
Bug: 120945804
Test: atest FrameworksTelephonyTests
Change-Id: I4d7a203dd57050535867329c8dc36f8c75667c15
Merged-In: I4d7a203dd57050535867329c8dc36f8c75667c15
This commit is contained in:
Brad Ebinger
2019-01-08 15:54:33 -08:00
parent 1afa2c413e
commit 6efd88345b
3 changed files with 8 additions and 1 deletions

View File

@@ -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);

View File

@@ -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();

View File

@@ -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) {