Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

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

Change-Id: I5781db3cee74a260350cf7304ccc785a41ad7f68
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Matt Pietal
2023-03-01 19:06:19 +00:00
committed by Automerger Merge Worker
parent 1f2f7a09a8 3eaa5fcf77
commit 2ee7558fe2
2 changed files with 1 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
packages/SystemUI/src/com/android/systemui/statusbar/LockscreenShadeTransitionController.kt
View File

@@ -572,8 +572,7 @@ class LockscreenShadeTransitionController @Inject constructor(
entry.setGroupExpansionChanging(true) entry.setGroupExpansionChanging(true)
userId = entry.sbn.userId userId = entry.sbn.userId
} }
var fullShadeNeedsBouncer = (!lockScreenUserManager.userAllowsPrivateNotificationsInPublic( var fullShadeNeedsBouncer = (
lockScreenUserManager.getCurrentUserId()) ||
!lockScreenUserManager.shouldShowLockscreenNotifications() || !lockScreenUserManager.shouldShowLockscreenNotifications() ||
falsingCollector.shouldEnforceBouncer()) falsingCollector.shouldEnforceBouncer())
if (keyguardBypassController.bypassEnabled) { if (keyguardBypassController.bypassEnabled) {

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

@@ -210,16 +210,6 @@ class LockscreenShadeTransitionControllerTest : SysuiTestCase() {
assertTrue("Row wasn't user expanded on drag down", row.isUserExpanded) 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 @Test
fun testTriggeringBouncerNoNotificationsOnLockscreen() { fun testTriggeringBouncerNoNotificationsOnLockscreen() {
whenever(lockScreenUserManager.shouldShowLockscreenNotifications()).thenReturn(false) whenever(lockScreenUserManager.shouldShowLockscreenNotifications()).thenReturn(false)