commit 4b26e8f081f19ab7c0d48461507892e682d0dc8a
author Jon Miranda <jonmiranda@google.com> Fri Nov 18 03:12:00 2022 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Fri Nov 18 03:12:00 2022 +0000
tree 12a14fce39715859cca69a467abdb8cdc811eda6
parent 50b3b62eba42ee2be46168f1ac97535818fb7bb6
parent 2049f3990aea02437ae0fe02bee0447d191dabfd

Merge "Use mContext instead of TaskbarActivityContex to enable transient taskbar." 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 713b016..54e4a0d 100644
--- a/quickstep/src/com/android/quickstep/QuickstepTestInformationHandler.java
+++ b/quickstep/src/com/android/quickstep/QuickstepTestInformationHandler.java
@@ -138,15 +138,11 @@
                 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 @@
         }
     }
 
-    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);
     }
 
     /**