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

Commit 4cbafb6a authored by Chris Wren's avatar Chris Wren Committed by Android Git Automerger
Browse files

am d4db6cbc: don\'t bump an active heads up for a corrupt notification 

* commit 'd4db6cbc':
  don't bump an active heads up for a corrupt notification
parents 10afd0f0 d4db6cbc

packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBar.java

+6 −7
Original line number Diff line number Diff line
@@ -902,20 +902,19 @@ public class PhoneStatusBar extends BaseStatusBar { 


        if (mUseHeadsUp && shouldInterrupt(notification)) {

            if (DEBUG) Log.d(TAG, "launching notification in heads up mode");

            // 1. Populate mHeadsUpNotificationView

            Entry interruptionCandidate = new Entry(key, notification, null);

            if (inflateViews(interruptionCandidate, mHeadsUpNotificationView.getHolder())) {

                mInterruptingNotificationTime = System.currentTimeMillis();

            mInterruptingNotificationEntry = new Entry(key, notification, null);

                mInterruptingNotificationEntry = interruptionCandidate;



            if (inflateViews(mInterruptingNotificationEntry,

                    mHeadsUpNotificationView.getHolder())) {

                // 1. Populate mHeadsUpNotificationView

                mHeadsUpNotificationView.setNotification(mInterruptingNotificationEntry);



                // 2. Animate mHeadsUpNotificationView in

                mHandler.sendEmptyMessage(MSG_SHOW_HEADS_UP);



                // 3. Set alarm to age the notification off

                resetHeadsUpDecayTimer();

            } else {

                mInterruptingNotificationEntry = null;

            }

        } else if (notification.getNotification().fullScreenIntent != null) {

            // Stop screensaver if the notification has a full-screen intent.