commit 1eb1e0365128a2ad3eaaa19c1e990b8443cd81fe
author TreeHugger Robot <treehugger-gerrit@google.com> Thu Nov 17 18:33:23 2022 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Thu Nov 17 18:33:23 2022 +0000
tree b1e0f039fbdac354b16df7a63a5899853f7346f7
parent 5ef18e4aa692b0fbd06e15ec53c7ae07c5818a80
parent 30cc32411771d1dcc1a98d370c94c60200b71207

Merge "Check NPE and log error condition for enableBlockingTimeout in test harness." into tm-qpr-dev

quickstep/src/com/android/quickstep/QuickstepTestInformationHandler.java

diff --git a/quickstep/src/com/android/quickstep/QuickstepTestInformationHandler.java b/quickstep/src/com/android/quickstep/QuickstepTestInformationHandler.java
index 65614ba..713b016 100644
--- a/quickstep/src/com/android/quickstep/QuickstepTestInformationHandler.java
+++ b/quickstep/src/com/android/quickstep/QuickstepTestInformationHandler.java
@@ -179,9 +179,15 @@
 
     private void enableBlockingTimeout(
             TouchInteractionService.TISBinder tisBinder, boolean enable) {
-        // Allow null-pointer to catch illegal states.
-        tisBinder.getTaskbarManager().getCurrentActivityContext().enableBlockingTimeoutDuringTests(
-                enable);
+        TaskbarActivityContext context = tisBinder.getTaskbarManager().getCurrentActivityContext();
+        if (context == null) {
+            if (TestProtocol.sDebugTracing) {
+                Log.d(NPE_TRANSIENT_TASKBAR, "enableBlockingTimeout: enable=" + enable,
+                        new Exception());
+            }
+        } else {
+            context.enableBlockingTimeoutDuringTests(enable);
+        }
     }
 
     private void enableTransientTaskbar(