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

Merge "Make isRebootRequiredForModemConfigChange SystemApi" am: 55faf37439

Browse Source 
am: 367a7baf96

Change-Id: I23e289d24c918004596a465f3f572b63bb0f0879
This commit is contained in:
Nazanin Bakhshi
2019-02-11 17:21:50 -08:00
committed by android-build-merger
parent 89ce4bd4e1 367a7baf96
commit a2cbf01609
3 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
api/system-current.txt
View File

@@ -6343,6 +6343,7 @@ package android.telephony {
method @RequiresPermission(android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE) public boolean isMultisimCarrierRestricted();
method @Deprecated @RequiresPermission(anyOf={android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE, android.Manifest.permission.READ_PHONE_STATE}) public boolean isOffhook();
method @Deprecated @RequiresPermission(anyOf={android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE, android.Manifest.permission.READ_PHONE_STATE}) public boolean isRadioOn();
method @RequiresPermission(android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE) public boolean isRebootRequiredForModemConfigChange();
method @Deprecated @RequiresPermission(anyOf={android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE, android.Manifest.permission.READ_PHONE_STATE}) public boolean isRinging();
method @RequiresPermission(anyOf={android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE, android.Manifest.permission.READ_PHONE_STATE}) public boolean isVideoCallingEnabled();
method @Deprecated @RequiresPermission(android.Manifest.permission.READ_PHONE_STATE) public boolean isVisualVoicemailEnabled(android.telecom.PhoneAccountHandle);

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

@@ -10183,11 +10183,14 @@ public class TelephonyManager {
/**
* Get whether reboot is required or not after making changes to modem configurations.
* @Return {@code True} if reboot is required after making changes to modem configurations,
* otherwise return {@code False}.
* The modem configuration change refers to switching from single SIM configuration to DSDS
* or the other way around.
* @Return {@code true} if reboot is required after making changes to modem configurations,
* otherwise return {@code false}.
*
* @hide
*/
@SystemApi
@RequiresPermission(android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE)
public boolean isRebootRequiredForModemConfigChange() {
try {

3
telephony/java/com/android/internal/telephony/ITelephony.aidl
View File

@@ -1837,7 +1837,7 @@ interface ITelephony {
* @hide
*/
boolean isMultisimCarrierRestricted();
/**
* Switch configs to enable multi-sim or switch back to single-sim
* @hide
@@ -1850,6 +1850,7 @@ interface ITelephony {
int getNumOfActiveSims();
/**
* Get if reboot is required upon altering modems configurations
* @hide
*/
boolean isRebootRequiredForModemConfigChange();
}