Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Treehugger Robot
2019-01-15 22:43:49 +00:00
committed by Gerrit Code Review
parent 81801283e3 6efd88345b
commit 4ba30c1bec
3 changed files with 8 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
api/system-current.txt
View File

@@ -5623,6 +5623,7 @@ package android.telephony {
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 java.lang.String getIsimDomain();
method public java.lang.String getIsimIst();
method public int getPreferredNetworkType(int); method public int getPreferredNetworkType(int);
method public int getRadioPowerState(); method public int getRadioPowerState();
method public int getSimApplicationState(); method public int getSimApplicationState();
@@ -6182,6 +6183,7 @@ package android.telephony.ims {
public class ImsMmTelManager { public class ImsMmTelManager {
method public static android.telephony.ims.ImsMmTelManager createForSubscriptionId(android.content.Context, int); method public static android.telephony.ims.ImsMmTelManager createForSubscriptionId(android.content.Context, int);
method public int getVoWiFiModeSetting(); method public int getVoWiFiModeSetting();
method public int getVoWiFiRoamingModeSetting();
method public boolean isAdvancedCallingSettingEnabled(); method public boolean isAdvancedCallingSettingEnabled();
method public boolean isAvailable(int, int); method public boolean isAvailable(int, int);
method public boolean isCapable(int, int); method public boolean isCapable(int, int);

5
telephony/java/android/telephony/TelephonyManager.java
View File

@@ -5877,9 +5877,14 @@ public class TelephonyManager {
/** /**
* Returns the IMS Service Table (IST) that was loaded from the ISIM. * 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 * @return IMS Service Table or null if not present or not loaded
* @hide * @hide
*/ */
@SystemApi
@RequiresPermission(Manifest.permission.READ_PRIVILEGED_PHONE_STATE)
public String getIsimIst() { public String getIsimIst() {
try { try {
IPhoneSubInfo info = getSubscriberInfo(); IPhoneSubInfo info = getSubscriberInfo();

2
telephony/java/android/telephony/ims/ImsMmTelManager.java
View File

@@ -714,7 +714,7 @@ public class ImsMmTelManager {
* @see #setVoWiFiRoamingSetting(boolean) * @see #setVoWiFiRoamingSetting(boolean)
*/ */
@RequiresPermission(Manifest.permission.READ_PRIVILEGED_PHONE_STATE) @RequiresPermission(Manifest.permission.READ_PRIVILEGED_PHONE_STATE)
@WiFiCallingMode int getVoWiFiRoamingModeSetting() { public @WiFiCallingMode int getVoWiFiRoamingModeSetting() {
try { try {
return getITelephony().getVoWiFiRoamingModeSetting(mSubId); return getITelephony().getVoWiFiRoamingModeSetting(mSubId);
} catch (RemoteException e) { } catch (RemoteException e) {