diff options
| author | Hall Liu <hallliu@google.com> | 2020-06-17 01:15:46 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-06-17 01:15:46 +0000 |
| commit | 1ab98f185e613e47582f96e10bac59d6b83c3958 (patch) | |
| tree | 674f7b9caaadff4e51b39cf5322ab031292f8a2b /telecomm/java/android/telecom/TelecomManager.java | |
| parent | da209d4ec0bb44b337455338d05995d7d5184551 (diff) | |
| parent | 94091aceaa709c8ada56d05b1edd85dca319118b (diff) | |
Merge "Mark TelecomManager#isRinging as a TestApi" am: 94091aceaa
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1340753
Change-Id: Ic85edb32b9dac901e3e8f40c362ebc851ea2e25f
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 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 |