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

Commit 51898058 authored by Jeff DeCew's avatar Jeff DeCew
Browse files

RESTRICT AUTOMERGE: Fix build breakage from merge conflict. 

Merging 8ce3c53f into qt-qpr1-dev resulted in a merge conflict due to a method being moved between qt-qpr1-dev and rvc-dev, such that the patch backported from rvc-dev didn't match at all.  Removing the old method makes this branch match qt-dev and rvc-dev.

Test: will use abtd to validate the build and the resulting logic.

Original changes: Id82d20c9f1f2001400871b5381f52b40fbdf81c5

Original
Bug: 231322873

Breakage
Bug: 241087006

Change-Id: Ic4f8d701d97aa9b6c72875df8c7eab5fd51934e0
parent 73305709

packages/SystemUI/src/com/android/systemui/statusbar/notification/NotificationInterruptionStateProvider.java

+0 −13
Original line number Diff line number Diff line
@@ -492,19 +492,6 @@ public class NotificationInterruptionStateProvider { 
        return mPresenter;

    }



    /**

     * When an entry was added, should we launch its fullscreen intent? Examples are Alarms or

     * incoming calls.

     *

     * @param entry the entry that was added

     * @return {@code true} if we should launch the full screen intent

     */

    public boolean shouldLaunchFullScreenIntentWhenAdded(NotificationEntry entry) {

        return entry.notification.getNotification().fullScreenIntent != null

            && (!shouldHeadsUp(entry)

                || mStatusBarStateController.getState() == StatusBarState.KEYGUARD);

    }



    /** A component which can suppress heads-up notifications due to the overall state of the UI. */

    public interface HeadsUpSuppressor {

        /**