diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/notification/row/AppOpsInfo.java b/packages/SystemUI/src/com/android/systemui/statusbar/notification/row/AppOpsInfo.java
index 9dcc187cb0ef6..10fc990e2c5b2 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/notification/row/AppOpsInfo.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/notification/row/AppOpsInfo.java
@@ -188,11 +188,6 @@ public class AppOpsInfo extends LinearLayout implements NotificationGuts.GutsCon
         return false;
     }
 
-    @Override
-    public boolean needsFalsingProtection() {
-        return false;
-    }
-
     @Override
     public View getContentView() {
         return this;
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/notification/row/NotificationConversationInfo.java b/packages/SystemUI/src/com/android/systemui/statusbar/notification/row/NotificationConversationInfo.java
index 9befa313edd89..9217756dca134 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/notification/row/NotificationConversationInfo.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/notification/row/NotificationConversationInfo.java
@@ -403,11 +403,6 @@ public class NotificationConversationInfo extends LinearLayout implements
         // TODO: do we need to do anything here?
     }
 
-    @Override
-    public boolean needsFalsingProtection() {
-        return true;
-    }
-
     @Override
     public void onInitializeAccessibilityEvent(AccessibilityEvent event) {
         super.onInitializeAccessibilityEvent(event);
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/notification/row/NotificationGuts.java b/packages/SystemUI/src/com/android/systemui/statusbar/notification/row/NotificationGuts.java
index c762b73a16485..18d436ff7659e 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/notification/row/NotificationGuts.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/notification/row/NotificationGuts.java
@@ -104,12 +104,6 @@ public class NotificationGuts extends FrameLayout {
          * Called when the guts view has finished its close animation.
          */
         default void onFinishedClosing() {}
-
-        /**
-         * Returns whether falsing protection is needed before showing the contents of this
-         * view on the lockscreen
-         */
-        boolean needsFalsingProtection();
     }
 
     public interface OnGutsClosedListener {
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/notification/row/NotificationGutsManager.java b/packages/SystemUI/src/com/android/systemui/statusbar/notification/row/NotificationGutsManager.java
index a64dcdffff1ea..1caf8f89c8226 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/notification/row/NotificationGutsManager.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/notification/row/NotificationGutsManager.java
@@ -523,27 +523,23 @@ public class NotificationGutsManager implements Dumpable, NotificationLifetimeEx
             int x,
             int y,
             NotificationMenuRowPlugin.MenuItem menuItem) {
-        if (menuItem.getGutsView() instanceof NotificationGuts.GutsContent) {
-            NotificationGuts.GutsContent gutsView =
-                    (NotificationGuts.GutsContent)  menuItem.getGutsView();
-            if (gutsView.needsFalsingProtection()) {
-                if (mStatusBarStateController instanceof StatusBarStateControllerImpl) {
-                    ((StatusBarStateControllerImpl) mStatusBarStateController)
-                            .setLeaveOpenOnKeyguardHide(true);
-                }
-
-                Runnable r = () -> mMainHandler.post(
-                        () -> openGutsInternal(view, x, y, menuItem));
-
-                mStatusBarLazy.get().executeRunnableDismissingKeyguard(
-                        r,
-                        null /* cancelAction */,
-                        false /* dismissShade */,
-                        true /* afterKeyguardGone */,
-                        true /* deferred */);
-
-                return true;
+        if (menuItem.getGutsView() instanceof NotificationInfo) {
+            if (mStatusBarStateController instanceof StatusBarStateControllerImpl) {
+                ((StatusBarStateControllerImpl) mStatusBarStateController)
+                        .setLeaveOpenOnKeyguardHide(true);
             }
+
+            Runnable r = () -> mMainHandler.post(
+                    () -> openGutsInternal(view, x, y, menuItem));
+
+            mStatusBarLazy.get().executeRunnableDismissingKeyguard(
+                    r,
+                    null /* cancelAction */,
+                    false /* dismissShade */,
+                    true /* afterKeyguardGone */,
+                    true /* deferred */);
+
+            return true;
         }
         return openGutsInternal(view, x, y, menuItem);
     }
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/notification/row/NotificationInfo.java b/packages/SystemUI/src/com/android/systemui/statusbar/notification/row/NotificationInfo.java
index 334599930b63c..91c31cf58ea07 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/notification/row/NotificationInfo.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/notification/row/NotificationInfo.java
@@ -489,11 +489,6 @@ public class NotificationInfo extends LinearLayout implements NotificationGuts.G
         mMetricsLogger.write(notificationControlsLogMaker().setType(MetricsEvent.TYPE_CLOSE));
     }
 
-    @Override
-    public boolean needsFalsingProtection() {
-        return true;
-    }
-
     @Override
     public void onInitializeAccessibilityEvent(AccessibilityEvent event) {
         super.onInitializeAccessibilityEvent(event);
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/notification/row/NotificationSnooze.java b/packages/SystemUI/src/com/android/systemui/statusbar/notification/row/NotificationSnooze.java
index cde3dfd66aaf1..e56771c62bb5d 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/notification/row/NotificationSnooze.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/notification/row/NotificationSnooze.java
@@ -442,11 +442,6 @@ public class NotificationSnooze extends LinearLayout
         return true;
     }
 
-    @Override
-    public boolean needsFalsingProtection() {
-        return false;
-    }
-
     public class NotificationSnoozeOption implements SnoozeOption {
         private SnoozeCriterion mCriterion;
         private int mMinutesToSnoozeFor;
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/notification/row/PartialConversationInfo.java b/packages/SystemUI/src/com/android/systemui/statusbar/notification/row/PartialConversationInfo.java
index ea059cbcf3e14..1dc828bfb0b57 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/notification/row/PartialConversationInfo.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/notification/row/PartialConversationInfo.java
@@ -300,11 +300,6 @@ public class PartialConversationInfo extends LinearLayout implements
         // TODO: do we need to do anything here?
     }
 
-    @Override
-    public boolean needsFalsingProtection() {
-        return true;
-    }
-
     @Override
     public void onInitializeAccessibilityEvent(AccessibilityEvent event) {
         super.onInitializeAccessibilityEvent(event);