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

Commit 3593004a authored by Matt Pietal's avatar Matt Pietal Committed by Automerger Merge Worker
Browse files

Shade - Don't force auth on pulldown with sensitive notif am: 3eaa5fcf am:... 

Shade - Don't force auth on pulldown with sensitive notif am: 3eaa5fcf am: 2ee7558f am: 0a84c613

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/21584123



Change-Id: If261d1c88773a5dc27e471990dfb521eda53bb83
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents b63d6efd 0a84c613

packages/SystemUI/src/com/android/systemui/statusbar/LockscreenShadeTransitionController.kt

+1 −2
Original line number Diff line number Diff line
@@ -572,8 +572,7 @@ class LockscreenShadeTransitionController @Inject constructor( 
            entry.setGroupExpansionChanging(true)

            userId = entry.sbn.userId

        }

        var fullShadeNeedsBouncer = (!lockScreenUserManager.userAllowsPrivateNotificationsInPublic(

                lockScreenUserManager.getCurrentUserId()) ||

        var fullShadeNeedsBouncer = (

                !lockScreenUserManager.shouldShowLockscreenNotifications() ||

                falsingCollector.shouldEnforceBouncer())

        if (keyguardBypassController.bypassEnabled) {

packages/SystemUI/tests/src/com/android/systemui/statusbar/LockscreenShadeTransitionControllerTest.kt

+0 −10
Original line number Diff line number Diff line
@@ -210,16 +210,6 @@ class LockscreenShadeTransitionControllerTest : SysuiTestCase() { 
        assertTrue("Row wasn't user expanded on drag down", row.isUserExpanded)

    }



    @Test

    fun testTriggeringBouncerWhenPrivateNotificationsArentAllowed() {

        whenever(lockScreenUserManager.userAllowsPrivateNotificationsInPublic(anyInt())).thenReturn(

                false)

        transitionController.goToLockedShade(null)

        verify(statusbarStateController, never()).setState(anyInt())

        verify(statusbarStateController).setLeaveOpenOnKeyguardHide(true)

        verify(mCentralSurfaces).showBouncerWithDimissAndCancelIfKeyguard(anyObject(), anyObject())

    }



    @Test

    fun testTriggeringBouncerNoNotificationsOnLockscreen() {

        whenever(lockScreenUserManager.shouldShowLockscreenNotifications()).thenReturn(false)