From 5de5ac900886be43a97ffa92c850947123328549 Mon Sep 17 00:00:00 2001 From: Tony Wickham Date: Wed, 7 Dec 2022 18:09:45 +0000 Subject: [PATCH] Add IS_RUNNING_IN_TEST_HARNESS check for isTransientTaskbar This avoids us trying to read FORCE_PERSISTENT_TASKBAR feature flag which apparently crashes tests due to permission issues. Going forward, when we support persistent taskbar better, we should update the tests and this check as commented in the code. Test: com.google.android.apps.nexuslauncher.TaplTestsNexus#testSearchNoInputs Fixes: 261604544 Change-Id: I35c20825e8171766834f0f32be4f3818d02ab1df --- src/com/android/launcher3/util/DisplayController.java | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/com/android/launcher3/util/DisplayController.java b/src/com/android/launcher3/util/DisplayController.java index 9ca0dd195c..8e3daf33a4 100644 --- a/src/com/android/launcher3/util/DisplayController.java +++ b/src/com/android/launcher3/util/DisplayController.java @@ -131,7 +131,10 @@ public class DisplayController implements ComponentCallbacks, SafeCloseable { * Returns whether taskbar is transient. */ public static boolean isTransientTaskbar(Context context) { - if (FORCE_PERSISTENT_TASKBAR.get()) { + // TODO(b/258604917): When running in test harness, use !sTransientTaskbarStatusForTests + // once tests are updated to expect new persistent behavior such as not allowing long press + // to stash. + if (!Utilities.IS_RUNNING_IN_TEST_HARNESS && FORCE_PERSISTENT_TASKBAR.get()) { return false; } return getNavigationMode(context) == NavigationMode.NO_BUTTON