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

Commit f623596f authored by Shawn Lee's avatar Shawn Lee Committed by Android (Google) Code Review
Browse files

Merge "Disable duplicate back handling when a BackInvokedCallback is already registered" into main

parents b80bae8e de06c5fa

packages/SystemUI/src/com/android/systemui/back/domain/interactor/BackActionInteractor.kt

+4 −0
Original line number Original line Diff line number Diff line
@@ -122,6 +122,10 @@ constructor( 
        return false

        return false

    }

    }





    fun isBackCallbackRegistered(): Boolean {

        return isCallbackRegistered

    }



    private fun registerBackCallback() {

    private fun registerBackCallback() {

        if (isCallbackRegistered) {

        if (isCallbackRegistered) {

            return

            return

packages/SystemUI/src/com/android/systemui/keyevent/domain/interactor/SysUIKeyEventHandler.kt

+1 −1
Original line number Original line Diff line number Diff line
@@ -42,7 +42,7 @@ constructor( 




        when (event.keyCode) {

        when (event.keyCode) {

            KeyEvent.KEYCODE_BACK -> {

            KeyEvent.KEYCODE_BACK -> {

                if (event.handleAction()) {

                if (!backActionInteractor.isBackCallbackRegistered() && event.handleAction()) {

                    backActionInteractor.onBackRequested()

                    backActionInteractor.onBackRequested()

                }

                }

                return true

                return true