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

Merge "Mark TelecomManager#isRinging as a TestApi" am: 94091aceaa am: 1ab98f185e am: 3293dd1e64

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1340753

Change-Id: I14b01435fa3a959a132d7143324ce943cebb9293
This commit is contained in:
Hall Liu
2020-06-17 01:36:30 +00:00
committed by Automerger Merge Worker
parent 71bcc61412 3293dd1e64
commit 2d0fdbdd53
2 changed files with 2 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
api/test-current.txt
View File

@@ -3925,6 +3925,7 @@ package android.telecom {
method @RequiresPermission("android.permission.READ_PRIVILEGED_PHONE_STATE") public int getCurrentTtyMode(); method @RequiresPermission("android.permission.READ_PRIVILEGED_PHONE_STATE") public int getCurrentTtyMode();
method @Nullable @RequiresPermission("android.permission.READ_PRIVILEGED_PHONE_STATE") public String getDefaultDialerPackage(@NonNull android.os.UserHandle); method @Nullable @RequiresPermission("android.permission.READ_PRIVILEGED_PHONE_STATE") public String getDefaultDialerPackage(@NonNull android.os.UserHandle);
method @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) public boolean isInEmergencyCall(); method @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) public boolean isInEmergencyCall();
method @RequiresPermission(anyOf={"android.permission.READ_PRIVILEGED_PHONE_STATE", android.Manifest.permission.READ_PHONE_STATE}) public boolean isRinging();
method @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) public void setUserSelectedOutgoingPhoneAccount(@Nullable android.telecom.PhoneAccountHandle); method @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) public void setUserSelectedOutgoingPhoneAccount(@Nullable android.telecom.PhoneAccountHandle);
field public static final int TTY_MODE_FULL = 1; // 0x1 field public static final int TTY_MODE_FULL = 1; // 0x1
field public static final int TTY_MODE_HCO = 2; // 0x2 field public static final int TTY_MODE_HCO = 2; // 0x2

1
telecomm/java/android/telecom/TelecomManager.java
View File

@@ -1645,6 +1645,7 @@ public class TelecomManager {
* @hide * @hide
*/ */
@SystemApi @SystemApi
@TestApi
@RequiresPermission(anyOf = { @RequiresPermission(anyOf = {
READ_PRIVILEGED_PHONE_STATE, READ_PRIVILEGED_PHONE_STATE,
android.Manifest.permission.READ_PHONE_STATE android.Manifest.permission.READ_PHONE_STATE