From f901a72fe24fe2952d183c8ed5eefd7c904159c5 Mon Sep 17 00:00:00 2001 From: Fan Zhang Date: Mon, 13 Feb 2023 12:24:21 -0800 Subject: [PATCH] Suppress emergency page search when needed. When controller#shouldSuppressFromSearch returns true, suppresses page search. Fix: 268664782 Test: manual Change-Id: Ida543ae47aed36380200d938ea31fe80195b7186 --- .../android/settings/emergency/EmergencyGestureSettings.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/com/android/settings/emergency/EmergencyGestureSettings.java b/src/com/android/settings/emergency/EmergencyGestureSettings.java index 7826872acff..3803ce144ab 100644 --- a/src/com/android/settings/emergency/EmergencyGestureSettings.java +++ b/src/com/android/settings/emergency/EmergencyGestureSettings.java @@ -54,8 +54,8 @@ public class EmergencyGestureSettings extends DashboardFragment { final EmergencyGestureEntrypointPreferenceController controller = new EmergencyGestureEntrypointPreferenceController(context, "dummy_emergency_gesture_pref_key"); - return !controller.isAvailable() - || controller.shouldSuppressFromSearch(); + return controller.isAvailable() + && !controller.shouldSuppressFromSearch(); } }; }