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

Commit 19799ee5 authored by Pavel Grafov's avatar Pavel Grafov Committed by Automerger Merge Worker
Browse files

Merge "Clarify reasons for notification removal." into udc-dev am: ebf1af85 

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



Change-Id: I0a5d4f87224a97dd3bc84e233dc593a94dd52253
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents d6e2feca ebf1af85

core/java/android/service/notification/NotificationListenerService.java

+1 −11
Original line number Original line Diff line number Diff line
@@ -485,9 +485,6 @@ public abstract class NotificationListenerService extends Service { 
    /**

    /**

     * Implement this method to learn when notifications are removed.

     * Implement this method to learn when notifications are removed.

     * <p>

     * <p>

     * This might occur because the user has dismissed the notification using system UI (or another

     * notification listener) or because the app has withdrawn the notification.

     * <p>

     * NOTE: The {@link StatusBarNotification} object you receive will be "light"; that is, the

     * NOTE: The {@link StatusBarNotification} object you receive will be "light"; that is, the

     * result from {@link StatusBarNotification#getNotification} may be missing some heavyweight

     * result from {@link StatusBarNotification#getNotification} may be missing some heavyweight

     * fields such as {@link android.app.Notification#contentView} and

     * fields such as {@link android.app.Notification#contentView} and
@@ -506,9 +503,6 @@ public abstract class NotificationListenerService extends Service { 
    /**

    /**

     * Implement this method to learn when notifications are removed.

     * Implement this method to learn when notifications are removed.

     * <p>

     * <p>

     * This might occur because the user has dismissed the notification using system UI (or another

     * notification listener) or because the app has withdrawn the notification.

     * <p>

     * NOTE: The {@link StatusBarNotification} object you receive will be "light"; that is, the

     * NOTE: The {@link StatusBarNotification} object you receive will be "light"; that is, the

     * result from {@link StatusBarNotification#getNotification} may be missing some heavyweight

     * result from {@link StatusBarNotification#getNotification} may be missing some heavyweight

     * fields such as {@link android.app.Notification#contentView} and

     * fields such as {@link android.app.Notification#contentView} and
@@ -531,9 +525,6 @@ public abstract class NotificationListenerService extends Service { 
    /**

    /**

     * Implement this method to learn when notifications are removed and why.

     * Implement this method to learn when notifications are removed and why.

     * <p>

     * <p>

     * This might occur because the user has dismissed the notification using system UI (or another

     * notification listener) or because the app has withdrawn the notification.

     * <p>

     * NOTE: The {@link StatusBarNotification} object you receive will be "light"; that is, the

     * NOTE: The {@link StatusBarNotification} object you receive will be "light"; that is, the

     * result from {@link StatusBarNotification#getNotification} may be missing some heavyweight

     * result from {@link StatusBarNotification#getNotification} may be missing some heavyweight

     * fields such as {@link android.app.Notification#contentView} and

     * fields such as {@link android.app.Notification#contentView} and
@@ -546,10 +537,9 @@ public abstract class NotificationListenerService extends Service { 
     *            was just removed.

     *            was just removed.

     * @param rankingMap The current ranking map that can be used to retrieve ranking information

     * @param rankingMap The current ranking map that can be used to retrieve ranking information

     *                   for active notifications.

     *                   for active notifications.

     * @param reason see {@link #REASON_LISTENER_CANCEL}, etc.

     */

     */

    public void onNotificationRemoved(StatusBarNotification sbn, RankingMap rankingMap,

    public void onNotificationRemoved(StatusBarNotification sbn, RankingMap rankingMap,

            int reason) {

            @NotificationCancelReason int reason) {

        onNotificationRemoved(sbn, rankingMap);

        onNotificationRemoved(sbn, rankingMap);

    }

    }