diff options
| author | Yorke Lee <yorkelee@google.com> | 2014-10-28 22:08:50 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-10-28 22:08:51 +0000 |
| commit | e398db4a45d4128af696a664e7c4cc48f7187a7f (patch) | |
| tree | d098933b560cbc708bbe7a2807db97057e06ca22 /telecomm/java/android/telecom | |
| parent | 579a7f99408a5d310ab8eb2e1b6bc938e1a74c4a (diff) | |
| parent | 7c72c2d3c2c4943a914abb2e1598610961db8f57 (diff) | |
| download | frameworks_base-e398db4a45d4128af696a664e7c4cc48f7187a7f.zip frameworks_base-e398db4a45d4128af696a664e7c4cc48f7187a7f.tar.gz frameworks_base-e398db4a45d4128af696a664e7c4cc48f7187a7f.tar.bz2 | |
Merge "Add comment to TelecomManager.getCallState" into lmp-mr1-dev
Diffstat (limited to 'telecomm/java/android/telecom')
| -rw-r--r-- | telecomm/java/android/telecom/TelecomManager.java | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/telecomm/java/android/telecom/TelecomManager.java b/telecomm/java/android/telecom/TelecomManager.java index 2652b45..13c9ea2 100644 --- a/telecomm/java/android/telecom/TelecomManager.java +++ b/telecomm/java/android/telecom/TelecomManager.java @@ -684,6 +684,11 @@ public class TelecomManager { * {@link TelephonyManager#CALL_STATE_RINGING} * {@link TelephonyManager#CALL_STATE_OFFHOOK} * {@link TelephonyManager#CALL_STATE_IDLE} + * + * Note that this API does not require the + * {@link android.Manifest.permission#READ_PHONE_STATE} permission. This is intentional, to + * preserve the behavior of {@link TelephonyManager#getCallState()}, which also did not require + * the permission. * @hide */ @SystemApi |