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

resolve merge conflicts of 17c69f5414 to pi-dev-plus-aosp

Browse Source 
Bug: 120986348
Bug: 120945804
Test: Treehugger
Merged-In: I4d7a203dd57050535867329c8dc36f8c75667c15
Change-Id: Ia2378265df93dd6b605b1b4af53e415c6ded1faf
This commit is contained in:
Brad Ebinger
2019-01-15 15:55:17 -08:00
parent d83144070c 17c69f5414
commit 4b2604d3d1
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 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);

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.
*
* 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();

2
telephony/java/android/telephony/ims/ImsMmTelManager.java
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) {