summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Tyler Gunn <tgunn@google.com> 2022-08-17 00:09:08 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2022-08-17 00:09:08 +0000
commit7b7155e281daf61865c95707d63a45de25e61ee1 (patch)
tree4751bff2ffa8ecb316ded5df6d4e732294befb96
parent4c67ab98dd969330f53252a5ee935fe685a330f2 (diff)
parent5f8a8ad5ff8da3097d35abab1284190e438b9f9b (diff)
Merge "Update API docs for TelephonyManager#registerTelephonyCallback." am: c4cfeaf45f am: 5f8a8ad5ff
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2152934 Change-Id: Ie58cd1d76b01471b3568eacc7fb6725b8c652e55 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-rw-r--r--telephony/java/android/telephony/TelephonyManager.java7
1 files changed, 6 insertions, 1 deletions
diff --git a/telephony/java/android/telephony/TelephonyManager.java b/telephony/java/android/telephony/TelephonyManager.java
index 0404b7fb7ff8..fd738d2b531c 100644
--- a/telephony/java/android/telephony/TelephonyManager.java
+++ b/telephony/java/android/telephony/TelephonyManager.java
@@ -16193,7 +16193,12 @@ public class TelephonyManager {
* the appropriate callback method on the callback object and passes the current (updated)
* values.
* <p>
- *
+ * Note: Be aware of the permission requirements stated on the {@link TelephonyCallback}
+ * listeners you implement. Your application must be granted these permissions in order to
+ * register a {@link TelephonyCallback} which requires them; a {@link SecurityException} will be
+ * thrown if you do not hold the required permissions for all {@link TelephonyCallback}
+ * listeners you implement.
+ * <p>
* If this TelephonyManager object has been created with {@link #createForSubscriptionId},
* applies to the given subId. Otherwise, applies to
* {@link SubscriptionManager#getDefaultSubscriptionId()}. To register events for multiple