diff options
| author | Hall Liu <hallliu@google.com> | 2020-06-17 01:34:55 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-06-17 01:34:55 +0000 |
| commit | 3293dd1e64d4a9972a8760a411ccf0c68ccaa195 (patch) | |
| tree | 3d698f1feba54ec8f1162268edb1d5b2fa994113 /telecomm/java/android/telecom/TelecomManager.java | |
| parent | 4e20f7833a2f88dc8ce9e3be33fdadf6c320dacc (diff) | |
| parent | 1ab98f185e613e47582f96e10bac59d6b83c3958 (diff) | |
Merge "Mark TelecomManager#isRinging as a TestApi" am: 94091aceaa am: 1ab98f185e
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1340753
Change-Id: Ic643ef7b31f62a6771c1f1ba5aa0e4c0a16e7e0c
Diffstat (limited to 'telecomm/java/android/telecom/TelecomManager.java')
| -rw-r--r-- | telecomm/java/android/telecom/TelecomManager.java | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/telecomm/java/android/telecom/TelecomManager.java b/telecomm/java/android/telecom/TelecomManager.java index f2f14125ef6b..8eebbeda9e83 100644 --- a/telecomm/java/android/telecom/TelecomManager.java +++ b/telecomm/java/android/telecom/TelecomManager.java @@ -1645,6 +1645,7 @@ public class TelecomManager { * @hide */ @SystemApi + @TestApi @RequiresPermission(anyOf = { READ_PRIVILEGED_PHONE_STATE, android.Manifest.permission.READ_PHONE_STATE |