From 14a657c944e2e6f707bbcb0e655b215d019639eb Mon Sep 17 00:00:00 2001
From: Winson Chung <winsonc@google.com>
Date: Thu, 28 May 2020 10:47:40 -0700
Subject: [PATCH] Mirror task visibility on task org leash

- Depending on the navigation mode, the task is either visible or not
  when entering PIP, and if it is not visible, initially hide the leash
  so that SysUI can control it's visibilty to prevent a flash

Bug: 156941210
Test: Introduce artificial delay on sysui taskAppeared() and verify that
      we don't see the task when entering pip in gesture nav (and that
      it still works in 3 button)

Change-Id: I291afd209af118ac178f8a6421d7df25974315f0
---
 core/java/android/window/ITaskOrganizer.aidl           |  3 ++-
 core/java/android/window/TaskOrganizer.java            |  5 +++++
 .../src/com/android/systemui/pip/PipTaskOrganizer.java |  1 +
 .../com/android/server/wm/TaskOrganizerController.java | 10 ++++++++++
 4 files changed, 18 insertions(+), 1 deletion(-)

diff --git a/core/java/android/window/ITaskOrganizer.aidl b/core/java/android/window/ITaskOrganizer.aidl
index 67465252d38e3..abca136c347eb 100644
--- a/core/java/android/window/ITaskOrganizer.aidl
+++ b/core/java/android/window/ITaskOrganizer.aidl
@@ -27,7 +27,8 @@ import android.window.WindowContainerToken;
 oneway interface ITaskOrganizer {
     /**
      * A callback when the Task is available for the registered organizer. The client is responsible
-     * for releasing the SurfaceControl in the callback.
+     * for releasing the SurfaceControl in the callback. For non-root tasks, the leash may initially
+     * be hidden so it is up to the organizer to show this task.
      *
      * @param taskInfo The information about the Task that's available
      * @param leash A persistent leash for this Task.
diff --git a/core/java/android/window/TaskOrganizer.java b/core/java/android/window/TaskOrganizer.java
index 1f5e53369cd8f..502680de9bcf8 100644
--- a/core/java/android/window/TaskOrganizer.java
+++ b/core/java/android/window/TaskOrganizer.java
@@ -59,6 +59,11 @@ public class TaskOrganizer extends WindowOrganizer {
         }
     }
 
+    /**
+     * Called when a task with the registered windowing mode can be controlled by this task
+     * organizer. For non-root tasks, the leash may initially be hidden so it is up to the organizer
+     * to show this task.
+     */
     @BinderThread
     public void onTaskAppeared(@NonNull ActivityManager.RunningTaskInfo taskInfo,
             @NonNull SurfaceControl leash) {}
diff --git a/packages/SystemUI/src/com/android/systemui/pip/PipTaskOrganizer.java b/packages/SystemUI/src/com/android/systemui/pip/PipTaskOrganizer.java
index 3a8476729645b..65f2bec187581 100644
--- a/packages/SystemUI/src/com/android/systemui/pip/PipTaskOrganizer.java
+++ b/packages/SystemUI/src/com/android/systemui/pip/PipTaskOrganizer.java
@@ -354,6 +354,7 @@ public class PipTaskOrganizer extends TaskOrganizer implements
             final SurfaceControl.Transaction tx =
                     mSurfaceControlTransactionFactory.getTransaction();
             tx.setAlpha(mLeash, 0f);
+            tx.show(mLeash);
             tx.apply();
             return;
         }
diff --git a/services/core/java/com/android/server/wm/TaskOrganizerController.java b/services/core/java/com/android/server/wm/TaskOrganizerController.java
index 83105c2f86960..1da1d116b9380 100644
--- a/services/core/java/com/android/server/wm/TaskOrganizerController.java
+++ b/services/core/java/com/android/server/wm/TaskOrganizerController.java
@@ -98,11 +98,14 @@ class TaskOrganizerController extends ITaskOrganizerController.Stub {
         final ITaskOrganizer mTaskOrganizer;
         final Consumer<Runnable> mDeferTaskOrgCallbacksConsumer;
 
+        private final SurfaceControl.Transaction mTransaction;
+
         TaskOrganizerCallbacks(WindowManagerService wm, ITaskOrganizer taskOrg,
                 Consumer<Runnable> deferTaskOrgCallbacksConsumer) {
             mService = wm;
             mDeferTaskOrgCallbacksConsumer = deferTaskOrgCallbacksConsumer;
             mTaskOrganizer = taskOrg;
+            mTransaction = wm.mTransactionFactory.get();
         }
 
         IBinder getBinder() {
@@ -110,10 +113,17 @@ class TaskOrganizerController extends ITaskOrganizerController.Stub {
         }
 
         void onTaskAppeared(Task task) {
+            final boolean visible = task.isVisible();
             final RunningTaskInfo taskInfo = task.getTaskInfo();
             mDeferTaskOrgCallbacksConsumer.accept(() -> {
                 try {
                     SurfaceControl outSurfaceControl = new SurfaceControl(task.getSurfaceControl());
+                    if (!task.mCreatedByOrganizer && !visible) {
+                        // To prevent flashes, we hide the task prior to sending the leash to the
+                        // task org if the task has previously hidden (ie. when entering PIP)
+                        mTransaction.hide(outSurfaceControl);
+                        mTransaction.apply();
+                    }
                     mTaskOrganizer.onTaskAppeared(taskInfo, outSurfaceControl);
                 } catch (RemoteException e) {
                     Slog.e(TAG, "Exception sending onTaskAppeared callback", e);