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

Commit 55017463 authored by Matt Pietal's avatar Matt Pietal
Browse files

Process adb shell input keyevent 82 through dismiss 

Previously, it would trigger a shade collapse, and eventually get
to keyguard to dismiss. Sending the request to keyguard follows
the path of every other dismiss request.

Bug: 371893850
Test: atest CtsWindowManagerDeviceKeyguard:android.server.wm.keyguard.KeyguardLockedTests
Flag: EXEMPT bugfix
Change-Id: I2c9a3ead9540ab473815e06d474d42978ff59cf6
parent 015f661f

packages/SystemUI/multivalentTests/src/com/android/systemui/keyguard/domain/interactor/KeyguardKeyEventInteractorTest.kt

+8 −5
Original line number Original line Diff line number Diff line
@@ -46,6 +46,7 @@ import org.mockito.Mockito.clearInvocations 
import org.mockito.Mockito.never

import org.mockito.Mockito.never

import org.mockito.Mockito.verify

import org.mockito.Mockito.verify

import org.mockito.junit.MockitoJUnit

import org.mockito.junit.MockitoJUnit

import org.mockito.kotlin.isNull





@ExperimentalCoroutinesApi

@ExperimentalCoroutinesApi

@SmallTest

@SmallTest
@@ -96,7 +97,7 @@ class KeyguardKeyEventInteractorTest : SysuiTestCase() { 
            .sendVolumeKeyEvent(

            .sendVolumeKeyEvent(

                eq(actionDownVolumeDownKeyEvent),

                eq(actionDownVolumeDownKeyEvent),

                eq(AudioManager.USE_DEFAULT_STREAM_TYPE),

                eq(AudioManager.USE_DEFAULT_STREAM_TYPE),

                eq(true)

                eq(true),

            )

            )





        assertThat(underTest.dispatchKeyEvent(actionDownVolumeUpKeyEvent)).isTrue()

        assertThat(underTest.dispatchKeyEvent(actionDownVolumeUpKeyEvent)).isTrue()
@@ -104,7 +105,7 @@ class KeyguardKeyEventInteractorTest : SysuiTestCase() { 
            .sendVolumeKeyEvent(

            .sendVolumeKeyEvent(

                eq(actionDownVolumeUpKeyEvent),

                eq(actionDownVolumeUpKeyEvent),

                eq(AudioManager.USE_DEFAULT_STREAM_TYPE),

                eq(AudioManager.USE_DEFAULT_STREAM_TYPE),

                eq(true)

                eq(true),

            )

            )

    }

    }
@@ -117,7 +118,7 @@ class KeyguardKeyEventInteractorTest : SysuiTestCase() { 
            .sendVolumeKeyEvent(

            .sendVolumeKeyEvent(

                eq(actionDownVolumeDownKeyEvent),

                eq(actionDownVolumeDownKeyEvent),

                eq(AudioManager.USE_DEFAULT_STREAM_TYPE),

                eq(AudioManager.USE_DEFAULT_STREAM_TYPE),

                eq(true)

                eq(true),

            )

            )





        assertThat(underTest.dispatchKeyEvent(actionDownVolumeUpKeyEvent)).isFalse()

        assertThat(underTest.dispatchKeyEvent(actionDownVolumeUpKeyEvent)).isFalse()
@@ -125,7 +126,7 @@ class KeyguardKeyEventInteractorTest : SysuiTestCase() { 
            .sendVolumeKeyEvent(

            .sendVolumeKeyEvent(

                eq(actionDownVolumeUpKeyEvent),

                eq(actionDownVolumeUpKeyEvent),

                eq(AudioManager.USE_DEFAULT_STREAM_TYPE),

                eq(AudioManager.USE_DEFAULT_STREAM_TYPE),

                eq(true)

                eq(true),

            )

            )

    }

    }
@@ -135,7 +136,9 @@ class KeyguardKeyEventInteractorTest : SysuiTestCase() { 
        whenever(statusBarStateController.state).thenReturn(StatusBarState.SHADE_LOCKED)

        whenever(statusBarStateController.state).thenReturn(StatusBarState.SHADE_LOCKED)

        whenever(statusBarKeyguardViewManager.shouldDismissOnMenuPressed()).thenReturn(true)

        whenever(statusBarKeyguardViewManager.shouldDismissOnMenuPressed()).thenReturn(true)





        verifyActionUpCollapsesTheShade(KeyEvent.KEYCODE_MENU)

        val actionUpMenuKeyEvent = KeyEvent(KeyEvent.ACTION_UP, KeyEvent.KEYCODE_MENU)

        assertThat(underTest.dispatchKeyEvent(actionUpMenuKeyEvent)).isTrue()

        verify(statusBarKeyguardViewManager).dismissWithAction(any(), isNull(), eq(false))

    }

    }





    @Test

    @Test

packages/SystemUI/src/com/android/systemui/keyguard/domain/interactor/KeyguardKeyEventInteractor.kt

+10 −1
Original line number Original line Diff line number Diff line
@@ -23,6 +23,7 @@ import com.android.systemui.back.domain.interactor.BackActionInteractor 
import com.android.systemui.dagger.SysUISingleton

import com.android.systemui.dagger.SysUISingleton

import com.android.systemui.keyevent.domain.interactor.SysUIKeyEventHandler.Companion.handleAction

import com.android.systemui.keyevent.domain.interactor.SysUIKeyEventHandler.Companion.handleAction

import com.android.systemui.media.controls.util.MediaSessionLegacyHelperWrapper

import com.android.systemui.media.controls.util.MediaSessionLegacyHelperWrapper

import com.android.systemui.plugins.ActivityStarter.OnDismissAction

import com.android.systemui.plugins.statusbar.StatusBarStateController

import com.android.systemui.plugins.statusbar.StatusBarStateController

import com.android.systemui.power.domain.interactor.PowerInteractor

import com.android.systemui.power.domain.interactor.PowerInteractor

import com.android.systemui.shade.ShadeController

import com.android.systemui.shade.ShadeController
@@ -105,7 +106,15 @@ constructor( 
                (statusBarStateController.state != StatusBarState.SHADE) &&

                (statusBarStateController.state != StatusBarState.SHADE) &&

                statusBarKeyguardViewManager.shouldDismissOnMenuPressed()

                statusBarKeyguardViewManager.shouldDismissOnMenuPressed()

        if (shouldUnlockOnMenuPressed) {

        if (shouldUnlockOnMenuPressed) {

            shadeController.animateCollapseShadeForced()

            statusBarKeyguardViewManager.dismissWithAction(

                object : OnDismissAction {

                    override fun onDismiss(): Boolean {

                        return false

                    }

                },

                null,

                false,

            )

            return true

            return true

        }

        }

        return false

        return false