From 2049f3990aea02437ae0fe02bee0447d191dabfd Mon Sep 17 00:00:00 2001
From: Jon Miranda <jonmiranda@google.com>
Date: Thu, 17 Nov 2022 13:50:56 -0800
Subject: [PATCH] Use mContext instead of TaskbarActivityContex to enable
 transient taskbar.

Bug: 259586791
Bug: 259337908
Bug: 257549303
Test: TaplTestsTaskbar
Change-Id: Ibb0a8e8539946f3a496318a6a9cf4b553693d790
---
 .../QuickstepTestInformationHandler.java      | 21 ++++---------------
 1 file changed, 4 insertions(+), 17 deletions(-)

diff --git a/quickstep/src/com/android/quickstep/QuickstepTestInformationHandler.java b/quickstep/src/com/android/quickstep/QuickstepTestInformationHandler.java
index 713b01654c..54e4a0d3f1 100644
--- a/quickstep/src/com/android/quickstep/QuickstepTestInformationHandler.java
+++ b/quickstep/src/com/android/quickstep/QuickstepTestInformationHandler.java
@@ -138,15 +138,11 @@ public class QuickstepTestInformationHandler extends TestInformationHandler {
                 return response;
 
             case TestProtocol.REQUEST_ENABLE_TRANSIENT_TASKBAR:
-                runOnTISBinder(tisBinder -> {
-                    enableTransientTaskbar(tisBinder, true);
-                });
+                enableTransientTaskbar(true);
                 return response;
 
             case TestProtocol.REQUEST_DISABLE_TRANSIENT_TASKBAR:
-                runOnTISBinder(tisBinder -> {
-                    enableTransientTaskbar(tisBinder, false);
-                });
+                enableTransientTaskbar(false);
                 return response;
         }
 
@@ -190,17 +186,8 @@ public class QuickstepTestInformationHandler extends TestInformationHandler {
         }
     }
 
-    private void enableTransientTaskbar(
-            TouchInteractionService.TISBinder tisBinder, boolean enable) {
-        TaskbarActivityContext context = tisBinder.getTaskbarManager().getCurrentActivityContext();
-        if (context == null) {
-            if (TestProtocol.sDebugTracing) {
-                Log.d(NPE_TRANSIENT_TASKBAR, "enableTransientTaskbar: enable=" + enable,
-                        new Exception());
-            }
-        } else {
-            DisplayController.INSTANCE.get(context).enableTransientTaskbarForTests(enable);
-        }
+    private void enableTransientTaskbar(boolean enable) {
+        DisplayController.INSTANCE.get(mContext).enableTransientTaskbarForTests(enable);
     }
 
     /**