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

Commit 5a3d2f8a authored by Lucas Dupin's avatar Lucas Dupin Committed by android-build-merger
Browse files

Merge "Hide album art when face bypass" into qt-r1-dev 

am: c306592f

Change-Id: I113f166c6890e801689aedc177bc7e0961ee4e19
parents 24aafdc8 c306592f

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

+6 −2
Original line number Diff line number Diff line
@@ -57,6 +57,7 @@ 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.phone.BiometricUnlockController;

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

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

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

import com.android.systemui.statusbar.phone.ScrimState;
@@ -89,6 +90,7 @@ public class NotificationMediaManager implements Dumpable { 
            = Dependency.get(StatusBarStateController.class);

    private final SysuiColorExtractor mColorExtractor = Dependency.get(SysuiColorExtractor.class);

    private final KeyguardMonitor mKeyguardMonitor = Dependency.get(KeyguardMonitor.class);

    private final KeyguardBypassController mKeyguardBypassController;



    // Late binding

    private NotificationEntryManager mEntryManager;
@@ -173,9 +175,11 @@ public class NotificationMediaManager implements Dumpable { 
            Lazy<ShadeController> shadeController,

            Lazy<StatusBarWindowController> statusBarWindowController,

            NotificationEntryManager notificationEntryManager,

            MediaArtworkProcessor mediaArtworkProcessor) {

            MediaArtworkProcessor mediaArtworkProcessor,

            KeyguardBypassController keyguardBypassController) {

        mContext = context;

        mMediaArtworkProcessor = mediaArtworkProcessor;

        mKeyguardBypassController = keyguardBypassController;

        mMediaListeners = new ArrayList<>();

        mMediaSessionManager

                = (MediaSessionManager) mContext.getSystemService(Context.MEDIA_SESSION_SERVICE);
@@ -457,7 +461,7 @@ public class NotificationMediaManager implements Dumpable { 
        }



        Bitmap artworkBitmap = null;

        if (mediaMetadata != null) {

        if (mediaMetadata != null && !mKeyguardBypassController.getBypassEnabled()) {

            artworkBitmap = mediaMetadata.getBitmap(MediaMetadata.METADATA_KEY_ART);

            if (artworkBitmap == null) {

                artworkBitmap = mediaMetadata.getBitmap(MediaMetadata.METADATA_KEY_ALBUM_ART);