Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 309fdfc8 authored by Treehugger Robot's avatar Treehugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Disable the trustedOverlay flag for taskview" into main

parents 034cb5c2 1b48b467

libs/WindowManager/Shell/src/com/android/wm/shell/taskview/TaskViewTaskController.java

+9 −0
Original line number Diff line number Diff line
@@ -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) {