From 3eaa5fcf77fa04e35bc9727dda4d515f2c666f39 Mon Sep 17 00:00:00 2001
From: Matt Pietal <mpietal@google.com>
Date: Fri, 24 Feb 2023 13:31:41 +0000
Subject: [PATCH] Shade - Don't force auth on pulldown with sensitive notif

This was originally seen as a shortcut to seeing the full notification
content. In practice, it is preventing phone users from accessing
quick settings as not everyone is aware of distinction between pulling
down from the top vs the middle. This also makes split shade access
impossible, so show the redacted shade instead.

Fixes: 262717969
Test: atest LockscreenShadeTransitionControllerTest
Change-Id: I9504dd5769c61b96a3fe582e114f59b53866c1ff
---
 .../statusbar/LockscreenShadeTransitionController.kt   |  3 +--
 .../LockscreenShadeTransitionControllerTest.kt         | 10 ----------
 2 files changed, 1 insertion(+), 12 deletions(-)

diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/LockscreenShadeTransitionController.kt b/packages/SystemUI/src/com/android/systemui/statusbar/LockscreenShadeTransitionController.kt
index f0d064b42d9ce..9a9503c8cd9c6 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/LockscreenShadeTransitionController.kt
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/LockscreenShadeTransitionController.kt
@@ -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) {
diff --git a/packages/SystemUI/tests/src/com/android/systemui/statusbar/LockscreenShadeTransitionControllerTest.kt b/packages/SystemUI/tests/src/com/android/systemui/statusbar/LockscreenShadeTransitionControllerTest.kt
index d99cdd514f37e..ab615f99ebadd 100644
--- a/packages/SystemUI/tests/src/com/android/systemui/statusbar/LockscreenShadeTransitionControllerTest.kt
+++ b/packages/SystemUI/tests/src/com/android/systemui/statusbar/LockscreenShadeTransitionControllerTest.kt
@@ -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)