diff options
| -rw-r--r-- | libs/WindowManager/Shell/src/com/android/wm/shell/taskview/TaskViewTaskController.java | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/libs/WindowManager/Shell/src/com/android/wm/shell/taskview/TaskViewTaskController.java b/libs/WindowManager/Shell/src/com/android/wm/shell/taskview/TaskViewTaskController.java index 11aa402aa283..a126cbe41b00 100644 --- a/libs/WindowManager/Shell/src/com/android/wm/shell/taskview/TaskViewTaskController.java +++ b/libs/WindowManager/Shell/src/com/android/wm/shell/taskview/TaskViewTaskController.java @@ -30,6 +30,7 @@ import android.content.Intent; import android.content.pm.LauncherApps; import android.content.pm.ShortcutInfo; import android.graphics.Rect; +import android.gui.TrustedOverlay; import android.os.Binder; import android.util.CloseGuard; import android.util.Slog; @@ -448,6 +449,14 @@ public class TaskViewTaskController implements ShellTaskOrganizer.TaskListener { mSurfaceCreated = true; mIsInitialized = true; mSurfaceControl = surfaceControl; + // SurfaceControl is expected to be null only in the case of unit tests. Guard against it + // to avoid runtime exception in SurfaceControl.Transaction. + if (surfaceControl != null) { + // TaskView is meant to contain app activities which shouldn't have trusted overlays + // flag set even when itself reparented in a window which is trusted. + mTransaction.setTrustedOverlay(surfaceControl, TrustedOverlay.DISABLED) + .apply(); + } notifyInitialized(); mShellExecutor.execute(() -> { if (mTaskToken == null) { |