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

Commit ff4c012d authored by Shuo Qian's avatar Shuo Qian Committed by Android (Google) Code Review
Browse files

Merge "Fix lint docs breakage."

parents fe7826fd d48b024a

telephony/java/android/telephony/PhoneStateListener.java

+2 −3
Original line number Diff line number Diff line
@@ -304,9 +304,8 @@ public class PhoneStateListener { 
    /**

     * Listen for changes to emergency number list based on all active subscriptions.

     *

     * <p>Requires permission {@link android.Manifest.permission#READ_PHONE_STATE} or

     * {@link android.Manifest.permission#READ_PRIVILEGED_PHONE_STATE} or the calling

     * app has carrier privileges (see {@link #hasCarrierPrivileges}).

     * <p>Requires permission {@link android.Manifest.permission#READ_PHONE_STATE} or the calling

     * app has carrier privileges (see {@link TelephonyManager#hasCarrierPrivileges}).

     */

    public static final int LISTEN_EMERGENCY_NUMBER_LIST                   = 0x01000000;

telephony/java/android/telephony/TelephonyManager.java

+2 −4
Original line number Diff line number Diff line
@@ -8997,8 +8997,7 @@ public class TelephonyManager { 
     * <p>The subscriptions which the returned list would be based on, are all the active

     * subscriptions, no matter which subscription could be used to create TelephonyManager.

     *

     * <p>Requires permission {@link android.Manifest.permission#READ_PHONE_STATE} or

     * {@link android.Manifest.permission#READ_PRIVILEGED_PHONE_STATE} or the calling

     * <p>Requires permission {@link android.Manifest.permission#READ_PHONE_STATE} or the calling

     * app has carrier privileges (see {@link #hasCarrierPrivileges}).

     *

     * @return Map including the key as the active subscription ID (Note: if there is no active
@@ -9030,8 +9029,7 @@ public class TelephonyManager { 
     * <p>The subscriptions which the returned list would be based on, are all the active

     * subscriptions, no matter which subscription could be used to create TelephonyManager.

     *

     * <p>Requires permission {@link android.Manifest.permission#READ_PHONE_STATE} or

     * {@link android.Manifest.permission#READ_PRIVILEGED_PHONE_STATE} or the calling

     * <p>Requires permission {@link android.Manifest.permission#READ_PHONE_STATE} or the calling

     * app has carrier privileges (see {@link #hasCarrierPrivileges}).

     *

     * @param categories the emergency service categories which are the bitwise-OR combination of