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

Merge "Make isRebootRequiredForModemConfigChange SystemApi"

Browse Source 
am: 55faf37439

Change-Id: I0573ed432fbc56ccf8db2f1d5263705ce0456bfe
This commit is contained in:
Nazanin Bakhshi
2019-02-11 17:02:16 -08:00
committed by android-build-merger
parent 36a96976b1 55faf37439
commit 367a7baf96
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 @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 isOffhook();
method @Deprecated @RequiresPermission(anyOf={android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE, android.Manifest.permission.READ_PHONE_STATE}) public boolean isRadioOn(); 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 @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 @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); method @Deprecated @RequiresPermission(android.Manifest.permission.READ_PHONE_STATE) public boolean isVisualVoicemailEnabled(android.telecom.PhoneAccountHandle);

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

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

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

@@ -1842,6 +1842,7 @@ interface ITelephony {
int getNumOfActiveSims(); int getNumOfActiveSims();
/** /**
* Get if reboot is required upon altering modems configurations * Get if reboot is required upon altering modems configurations
* @hide
*/ */
boolean isRebootRequiredForModemConfigChange(); boolean isRebootRequiredForModemConfigChange();
} }