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

Commit 84566206 authored by Shaun Corkran's avatar Shaun Corkran Committed by Android (Google) Code Review
Browse files

Merge changes from topic "navigation-task-block" into tm-mainline-prod 

* changes:
  [automerge] Decide on navigation to task by policy in Virtual Device 2p: 8e9e270d
  Decide on navigation to task by policy in Virtual Device
parents 9ffccc6f 49d6470c

core/java/android/window/DisplayWindowPolicyController.java

+7 −0
Original line number Diff line number Diff line
@@ -109,6 +109,13 @@ public abstract class DisplayWindowPolicyController { 
    public abstract boolean canContainActivities(@NonNull List<ActivityInfo> activities,

            @WindowConfiguration.WindowingMode int windowingMode);



    /**

     * Returns {@code true} if the given new task can be launched on this virtual display.

     */

    public abstract boolean canActivityBeLaunched(@NonNull ActivityInfo activityInfo,

            @WindowConfiguration.WindowingMode int windowingMode, int launchingFromDisplayId,

            boolean isNewTask);



    /**

     * Called when an Activity window is layouted with the new changes where contains the

     * window flags that we’re interested in.

services/companion/java/com/android/server/companion/virtual/GenericWindowPolicyController.java

+52 −0
Original line number Diff line number Diff line
@@ -76,6 +76,10 @@ public class GenericWindowPolicyController extends DisplayWindowPolicyController 
    @NonNull

    private final ArraySet<UserHandle> mAllowedUsers;

    @Nullable

    private final ArraySet<ComponentName> mAllowedCrossTaskNavigations;

    @Nullable

    private final ArraySet<ComponentName> mBlockedCrossTaskNavigations;

    @Nullable

    private final ArraySet<ComponentName> mAllowedActivities;

    @Nullable

    private final ArraySet<ComponentName> mBlockedActivities;
@@ -100,6 +104,10 @@ public class GenericWindowPolicyController extends DisplayWindowPolicyController 
     * @param windowFlags The window flags that this controller is interested in.

     * @param systemWindowFlags The system window flags that this controller is interested in.

     * @param allowedUsers The set of users that are allowed to stream in this display.

     * @param allowedCrossTaskNavigations The set of components explicitly allowed to navigate

     *   across tasks on this device.

     * @param blockedCrossTaskNavigations The set of components explicitly blocked from

     *   navigating across tasks on this device.

     * @param allowedActivities The set of activities explicitly allowed to stream on this device.

     *   Used only if the {@code activityPolicy} is

     *   {@link VirtualDeviceParams#ACTIVITY_POLICY_DEFAULT_BLOCKED}.
@@ -115,6 +123,8 @@ public class GenericWindowPolicyController extends DisplayWindowPolicyController 
     */

    public GenericWindowPolicyController(int windowFlags, int systemWindowFlags,

            @NonNull ArraySet<UserHandle> allowedUsers,

            @NonNull Set<ComponentName> allowedCrossTaskNavigations,

            @NonNull Set<ComponentName> blockedCrossTaskNavigations,

            @NonNull Set<ComponentName> allowedActivities,

            @NonNull Set<ComponentName> blockedActivities,

            @ActivityPolicy int defaultActivityPolicy,
@@ -122,6 +132,8 @@ public class GenericWindowPolicyController extends DisplayWindowPolicyController 
            @NonNull Consumer<ActivityInfo> activityBlockedCallback) {

        super();

        mAllowedUsers = allowedUsers;

        mAllowedCrossTaskNavigations = new ArraySet<>(allowedCrossTaskNavigations);

        mBlockedCrossTaskNavigations = new ArraySet<>(blockedCrossTaskNavigations);

        mAllowedActivities = new ArraySet<>(allowedActivities);

        mBlockedActivities = new ArraySet<>(blockedActivities);

        mDefaultActivityPolicy = defaultActivityPolicy;
@@ -153,6 +165,46 @@ public class GenericWindowPolicyController extends DisplayWindowPolicyController 
        return true;

    }



    @Override

    public boolean canActivityBeLaunched(ActivityInfo activityInfo,

            @WindowConfiguration.WindowingMode int windowingMode, int launchingFromDisplayId,

            boolean isNewTask) {

        if (!isWindowingModeSupported(windowingMode)) {

            return false;

        }



        final ComponentName activityComponent = activityInfo.getComponentName();

        if (BLOCKED_APP_STREAMING_COMPONENT.equals(activityComponent)) {

            // The error dialog alerting users that streaming is blocked is always allowed.

            return true;

        }



        if (!canContainActivity(activityInfo, /* windowFlags= */  0, /* systemWindowFlags= */ 0)) {

            mActivityBlockedCallback.accept(activityInfo);

            return false;

        }



        if (launchingFromDisplayId == Display.DEFAULT_DISPLAY) {

            return true;

        }

        if (isNewTask && !mBlockedCrossTaskNavigations.isEmpty()

                && mBlockedCrossTaskNavigations.contains(activityComponent)) {

            Slog.d(TAG, "Virtual device blocking cross task navigation of " + activityComponent);

            mActivityBlockedCallback.accept(activityInfo);

            return false;

        }

        if (isNewTask && !mAllowedCrossTaskNavigations.isEmpty()

                && !mAllowedCrossTaskNavigations.contains(activityComponent)) {

            Slog.d(TAG, "Virtual device not allowing cross task navigation of "

                    + activityComponent);

            mActivityBlockedCallback.accept(activityInfo);

            return false;

        }



        return true;

    }





    @Override

    public boolean keepActivityOnWindowFlagsChanged(ActivityInfo activityInfo, int windowFlags,

            int systemWindowFlags) {

services/companion/java/com/android/server/companion/virtual/VirtualDeviceImpl.java

+2 −0
Original line number Diff line number Diff line
@@ -533,6 +533,8 @@ final class VirtualDeviceImpl extends IVirtualDevice.Stub 
                    new GenericWindowPolicyController(FLAG_SECURE,

                            SYSTEM_FLAG_HIDE_NON_SYSTEM_OVERLAY_WINDOWS,

                            getAllowedUserHandles(),

                            mParams.getAllowedCrossTaskNavigations(),

                            mParams.getBlockedCrossTaskNavigations(),

                            mParams.getAllowedActivities(),

                            mParams.getBlockedActivities(),

                            mParams.getDefaultActivityPolicy(),

services/core/java/com/android/server/wm/ActivityStarter.java

+4 −4
Original line number Diff line number Diff line
@@ -135,7 +135,6 @@ import com.android.server.wm.LaunchParamsController.LaunchParams; 


import java.io.PrintWriter;

import java.text.DateFormat;

import java.util.ArrayList;

import java.util.Date;



/**
@@ -2046,12 +2045,13 @@ class ActivityStarter { 
            final DisplayContent displayContent = mRootWindowContainer.getDisplayContentOrCreate(

                    mPreferredTaskDisplayArea.getDisplayId());

            if (displayContent != null && displayContent.mDwpcHelper.hasController()) {

                final ArrayList<ActivityInfo> activities = new ArrayList<>();

                activities.add(r.info);

                final int targetWindowingMode = (targetTask != null)

                        ? targetTask.getWindowingMode() : displayContent.getWindowingMode();

                final int launchingFromDisplayId =

                        mSourceRecord != null ? mSourceRecord.getDisplayId() : DEFAULT_DISPLAY;

                if (!displayContent.mDwpcHelper

                        .canContainActivities(activities, targetWindowingMode)) {

                        .canActivityBeLaunched(r.info, targetWindowingMode, launchingFromDisplayId,

                          newTask)) {

                    Slog.w(TAG, "Abort to launch " + r.info.getComponentName()

                            + " on display area " + mPreferredTaskDisplayArea);

                    return START_ABORTED;

services/core/java/com/android/server/wm/DisplayWindowPolicyControllerHelper.java

+13 −0
Original line number Diff line number Diff line
@@ -74,6 +74,19 @@ class DisplayWindowPolicyControllerHelper { 
        return mDisplayWindowPolicyController.canContainActivities(activities, windowingMode);

    }



    /**

     * @see DisplayWindowPolicyController#canActivityBeLaunched(ActivityInfo, int, int, boolean)

     */

    public boolean canActivityBeLaunched(ActivityInfo activityInfo,

            @WindowConfiguration.WindowingMode int windowingMode, int launchingFromDisplayId,

            boolean isNewTask) {

        if (mDisplayWindowPolicyController == null) {

            return true;

        }

        return mDisplayWindowPolicyController.canActivityBeLaunched(activityInfo, windowingMode,

            launchingFromDisplayId, isNewTask);

    }



    /**

     * @see DisplayWindowPolicyController#keepActivityOnWindowFlagsChanged(ActivityInfo, int, int)

     */