Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 28ac11ef authored by Tyler Gunn's avatar Tyler Gunn Committed by Automerger Merge Worker
Browse files

Merge "Update API docs for TelephonyManager#registerTelephonyCallback." am:... 

Merge "Update API docs for TelephonyManager#registerTelephonyCallback." am: c4cfeaf4 am: 5f8a8ad5 am: 7b7155e2 am: 6ba37fe3

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2152934



Change-Id: I8d7be9680a920968321b18f8e4fec04925e5229f
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 4ba5ab35 6ba37fe3

telephony/java/android/telephony/TelephonyManager.java

+6 −1
Original line number Diff line number Diff line
@@ -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