diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/KeyguardBypassController.kt b/packages/SystemUI/src/com/android/systemui/statusbar/phone/KeyguardBypassController.kt
index fbd6adc9b7aa9..45ca0d18b4d88 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/KeyguardBypassController.kt
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/KeyguardBypassController.kt
@@ -49,6 +49,7 @@ class KeyguardBypassController {
         private set
 
     var bouncerShowing: Boolean = false
+    var launchingAffordance: Boolean = false
     var qSExpanded = false
         set(value) {
             val changed = field != value
@@ -106,6 +107,9 @@ class KeyguardBypassController {
                 // to unlock
                 return false
             }
+            if (launchingAffordance) {
+                return false
+            }
             if (isPulseExpanding || qSExpanded) {
                 pendingUnlockType = biometricSourceType
                 return false
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/NotificationPanelView.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/NotificationPanelView.java
index bbbb9b11cab72..f173275962035 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/NotificationPanelView.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/NotificationPanelView.java
@@ -2906,7 +2906,6 @@ public class NotificationPanelView extends PanelView implements
         // nor setting these flags, since the occluded state doesn't change anymore, hence it's
         // never reset.
         if (!isFullyCollapsed()) {
-            mLaunchingAffordance = true;
             setLaunchingAffordance(true);
         } else {
             animate = false;
@@ -2916,7 +2915,6 @@ public class NotificationPanelView extends PanelView implements
     }
 
     public void onAffordanceLaunchEnded() {
-        mLaunchingAffordance = false;
         setLaunchingAffordance(false);
     }
 
@@ -2925,8 +2923,10 @@ public class NotificationPanelView extends PanelView implements
      * launched via a camera gesture.
      */
     private void setLaunchingAffordance(boolean launchingAffordance) {
+        mLaunchingAffordance = launchingAffordance;
         getLeftIcon().setLaunchingAffordance(launchingAffordance);
         getRightIcon().setLaunchingAffordance(launchingAffordance);
+        mKeyguardBypassController.setLaunchingAffordance(launchingAffordance);
         if (mAffordanceLaunchListener != null) {
             mAffordanceLaunchListener.accept(launchingAffordance);
         }