diff options
| author | 2020-06-17 01:07:28 +0000 | |
|---|---|---|
| committer | 2020-06-17 01:07:28 +0000 | |
| commit | 94091aceaa709c8ada56d05b1edd85dca319118b (patch) | |
| tree | 674f7b9caaadff4e51b39cf5322ab031292f8a2b | |
| parent | 11bc7850061dc231e5b0fc6625ae0af51c6e7c81 (diff) | |
| parent | ae6a918ba9a60205c2c316fd05a1601402f0b6ae (diff) | |
Merge "Mark TelecomManager#isRinging as a TestApi"
| -rw-r--r-- | api/test-current.txt | 1 | ||||
| -rw-r--r-- | telecomm/java/android/telecom/TelecomManager.java | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/api/test-current.txt b/api/test-current.txt index ecc69c0f3d41..6fe730ae08bf 100644 --- a/api/test-current.txt +++ b/api/test-current.txt @@ -3101,6 +3101,7 @@ package android.telecom { 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 @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); field public static final int TTY_MODE_FULL = 1; // 0x1 field public static final int TTY_MODE_HCO = 2; // 0x2 diff --git a/telecomm/java/android/telecom/TelecomManager.java b/telecomm/java/android/telecom/TelecomManager.java index ce71511c0361..b3bf507d701e 100644 --- a/telecomm/java/android/telecom/TelecomManager.java +++ b/telecomm/java/android/telecom/TelecomManager.java @@ -1630,6 +1630,7 @@ public class TelecomManager { * @hide */ @SystemApi + @TestApi @RequiresPermission(anyOf = { READ_PRIVILEGED_PHONE_STATE, android.Manifest.permission.READ_PHONE_STATE |