Merge "Media - Handle cleanup of pending notification entries"

import static com.android.systemui.statusbar.phone.StatusBar.SHOW_LOCKSCREEN_MEDIA_ARTWORK;

import android.annotation.MainThread;

import android.annotation.NonNull;

import android.annotation.Nullable;

import android.app.Notification;

import android.content.Context;

import com.android.systemui.statusbar.notification.NotificationEntryListener;

import com.android.systemui.statusbar.notification.NotificationEntryManager;

import com.android.systemui.statusbar.notification.collection.NotificationEntry;

import com.android.systemui.statusbar.notification.collection.notifcollection.NotifCollectionListener;

import com.android.systemui.statusbar.phone.BiometricUnlockController;

import com.android.systemui.statusbar.phone.KeyguardBypassController;

import com.android.systemui.statusbar.phone.LockscreenWallpaper;

                    NotificationVisibility visibility,

                    boolean removedByUser,

                    int reason) {

                onNotificationRemoved(entry.getKey());

                mediaDataManager.onNotificationRemoved(entry.getKey());

                removeEntry(entry);

            }

        });

        // Pending entries are never inflated, and will never generate a call to onEntryRemoved().

        // This can happen when notifications are added and canceled before inflation. Add this

        // separate listener for cleanup, since media inflation occurs onPendingEntryAdded().

        notificationEntryManager.addCollectionListener(new NotifCollectionListener() {

            @Override

            public void onEntryCleanUp(@NonNull NotificationEntry entry) {

                removeEntry(entry);

            }

        });

                mPropertiesChangedListener);

    }

    private void removeEntry(NotificationEntry entry) {

        onNotificationRemoved(entry.getKey());

        mMediaDataManager.onNotificationRemoved(entry.getKey());

    }

    /**

     * Check if a state should be considered actively playing

     * @param state a PlaybackState