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

Commit 8c423f12 authored by Matías Hernández's avatar Matías Hernández Committed by Automerger Merge Worker
Browse files

Merge "Clarify documentation about targets of DND-related broadcasts" into... 

Merge "Clarify documentation about targets of DND-related broadcasts" into tm-qpr-dev am: f36bf2c7 am: c9576428 am: fc271b97

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



Change-Id: I3d01cb3c99adc1cca5105b59a1a7e9ac97b8beec
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 28d30f36 fc271b97

core/java/android/app/NotificationManager.java

+12 −3
Original line number Original line Diff line number Diff line
@@ -318,7 +318,10 @@ public class NotificationManager { 




    /**

    /**

     * Intent that is broadcast when the state of {@link #getEffectsSuppressor()} changes.

     * Intent that is broadcast when the state of {@link #getEffectsSuppressor()} changes.

     * This broadcast is only sent to registered receivers.

     *

     * <p>This broadcast is only sent to registered receivers and (starting from

     * {@link Build.VERSION_CODES#Q}) receivers in packages that have been granted Do Not

     * Disturb access (see {@link #isNotificationPolicyAccessGranted()}).

     *

     *

     * @hide

     * @hide

     */

     */
@@ -338,7 +341,10 @@ public class NotificationManager { 




    /**

    /**

     * Intent that is broadcast when the state of getNotificationPolicy() changes.

     * Intent that is broadcast when the state of getNotificationPolicy() changes.

     * This broadcast is only sent to registered receivers.

     *

     * <p>This broadcast is only sent to registered receivers and (starting from

     * {@link Build.VERSION_CODES#Q}) receivers in packages that have been granted Do Not

     * Disturb access (see {@link #isNotificationPolicyAccessGranted()}).

     */

     */

    @SdkConstant(SdkConstant.SdkConstantType.BROADCAST_INTENT_ACTION)

    @SdkConstant(SdkConstant.SdkConstantType.BROADCAST_INTENT_ACTION)

    public static final String ACTION_NOTIFICATION_POLICY_CHANGED

    public static final String ACTION_NOTIFICATION_POLICY_CHANGED
@@ -346,7 +352,10 @@ public class NotificationManager { 




    /**

    /**

     * Intent that is broadcast when the state of getCurrentInterruptionFilter() changes.

     * Intent that is broadcast when the state of getCurrentInterruptionFilter() changes.

     * This broadcast is only sent to registered receivers.

     *

     * <p>This broadcast is only sent to registered receivers and (starting from

     * {@link Build.VERSION_CODES#Q}) receivers in packages that have been granted Do Not

     * Disturb access (see {@link #isNotificationPolicyAccessGranted()}).

     */

     */

    @SdkConstant(SdkConstant.SdkConstantType.BROADCAST_INTENT_ACTION)

    @SdkConstant(SdkConstant.SdkConstantType.BROADCAST_INTENT_ACTION)

    public static final String ACTION_INTERRUPTION_FILTER_CHANGED

    public static final String ACTION_INTERRUPTION_FILTER_CHANGED