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

Commit 65f3eaa3 authored by Shawn Lin's avatar Shawn Lin Committed by android-build-merger
Browse files

Merge "Fix the background of lockscreen showing the art work of removed media... 

Merge "Fix the background of lockscreen showing the art work of removed media notification" into pi-dev
am: 0994a887

Change-Id: I53d4635a9adef307aa5c01b73bb4e1c2a8864ce9
parents 47e3eb30 0994a887

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

+8 −7
Original line number Diff line number Diff line
@@ -172,6 +172,14 @@ public class NotificationMediaManager implements Dumpable { 
                }

            }



            if (mediaNotification != null) {

                mMediaNotificationKey = mediaNotification.notification.getKey();

                if (DEBUG_MEDIA) {

                    Log.v(TAG, "DEBUG_MEDIA: Found new media notification: key="

                            + mMediaNotificationKey + " controller=" + mMediaController);

                }

            }



            if (controller != null && !sameSessions(mMediaController, controller)) {

                // We have a new media session

                clearCurrentMediaNotification();
@@ -183,13 +191,6 @@ public class NotificationMediaManager implements Dumpable { 
                            + mMediaMetadata);

                }



                if (mediaNotification != null) {

                    mMediaNotificationKey = mediaNotification.notification.getKey();

                    if (DEBUG_MEDIA) {

                        Log.v(TAG, "DEBUG_MEDIA: Found new media notification: key="

                                + mMediaNotificationKey + " controller=" + mMediaController);

                    }

                }

                metaDataChanged = true;

            }

        }