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

Commit 02aa1dd8 authored by Jeff DeCew's avatar Jeff DeCew Committed by Automerger Merge Worker
Browse files

Media player attempts to dismiss notifications when players removed. am: 734c3749 

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

Change-Id: I6e5380cc6cc1bd13c5873146b81eb87e84ab5a1b
parents 3cfe5503 734c3749

packages/SystemUI/src/com/android/systemui/statusbar/NotificationMediaManager.java

+20 −0
Original line number Diff line number Diff line
@@ -40,6 +40,7 @@ import android.os.Trace; 
import android.os.UserHandle;

import android.provider.DeviceConfig;

import android.provider.DeviceConfig.Properties;

import android.service.notification.NotificationListenerService;

import android.util.ArraySet;

import android.util.Log;

import android.view.View;
@@ -52,6 +53,7 @@ import com.android.systemui.Dumpable; 
import com.android.systemui.Interpolators;

import com.android.systemui.colorextraction.SysuiColorExtractor;

import com.android.systemui.dagger.qualifiers.Main;

import com.android.systemui.media.MediaData;

import com.android.systemui.media.MediaDataManager;

import com.android.systemui.plugins.statusbar.StatusBarStateController;

import com.android.systemui.statusbar.dagger.StatusBarModule;
@@ -250,6 +252,24 @@ public class NotificationMediaManager implements Dumpable { 
            }

        });



        mMediaDataManager.addListener(new MediaDataManager.Listener() {

            @Override

            public void onMediaDataLoaded(@NonNull String key,

                    @Nullable String oldKey, @NonNull MediaData data) {

            }



            @Override

            public void onMediaDataRemoved(@NonNull String key) {

                NotificationEntry entry = mEntryManager.getPendingOrActiveNotif(key);

                if (entry != null) {

                    // TODO(b/160713608): "removing" this notification won't happen and

                    //  won't send the 'deleteIntent' if the notification is ongoing.

                    mEntryManager.performRemoveNotification(entry.getSbn(),

                            NotificationListenerService.REASON_CANCEL);

                }

            }

        });



        mShowCompactMediaSeekbar = "true".equals(

                DeviceConfig.getProperty(DeviceConfig.NAMESPACE_SYSTEMUI,

                    SystemUiDeviceConfigFlags.COMPACT_MEDIA_SEEKBAR_ENABLED));