From ae6a918ba9a60205c2c316fd05a1601402f0b6ae Mon Sep 17 00:00:00 2001 From: Hall Liu Date: Tue, 19 May 2020 13:35:49 -0700 Subject: Mark TelecomManager#isRinging as a TestApi Bug: 150320750 Test: atest BackgroundCallAudioTest Change-Id: I048960feb97cd6cf081056ee649e7ea8dacdc8e3 Merged-In: I048960feb97cd6cf081056ee649e7ea8dacdc8e3 --- api/test-current.txt | 1 + telecomm/java/android/telecom/TelecomManager.java | 1 + 2 files changed, 2 insertions(+) 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 -- cgit v1.2.3-59-g8ed1b