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

Commit a10da1eb authored by Vladimir Komsiyski's avatar Vladimir Komsiyski
Browse files

Address dynamic activity policy API feedback 

Fix: 303224540
Test: atest ActivityBlockingTest
Change-Id: I42589f8cec7d39801c15c46be668d91f0b135f46
parent eee4e7c6

core/java/android/companion/virtual/VirtualDeviceManager.java

+14 −14
Original line number Diff line number Diff line
@@ -637,15 +637,15 @@ public final class VirtualDeviceManager { 
        /**

         * Specifies a component name to be exempt from the current activity launch policy.

         *

         * <p>If the current {@link VirtualDeviceParams#POLICY_TYPE_ACTIVIY} allows activity

         * launches by default, (i.e. it is {@link VirtualDeviceParams#DEVICE_POLICY_DEFAULT},

         * <p>If the current {@link VirtualDeviceParams#POLICY_TYPE_ACTIVITY} allows activity

         * launches by default, (i.e. it is {@link VirtualDeviceParams#DEVICE_POLICY_DEFAULT}),

         * then the specified component will be blocked from launching.

         * If the current {@link VirtualDeviceParams#POLICY_TYPE_ACTIVITY} blocks activity

         * launches by default, (i.e. it is {@link VirtualDeviceParams#DEVICE_POLICY_CUSTOM}, then

         * the specified component will be allowed to launch.</p>

         * If the current {@link VirtualDeviceParams#POLICY_TYPE_ACTIVITY} blocks activity launches

         * by default, (i.e. it is {@link VirtualDeviceParams#DEVICE_POLICY_CUSTOM}), then the

         * specified component will be allowed to launch.</p>

         *

         * <p>Note that changing the activity launch policy will not affect current set of exempt

         * components and it needs to be updated separately.</p>

         * <p>Note that changing the activity launch policy will clear current set of exempt

         * components.</p>

         *

         * @see #removeActivityPolicyExemption

         * @see #setDevicePolicy
@@ -660,15 +660,15 @@ public final class VirtualDeviceManager { 
        /**

         * Makes the specified component name to adhere to the default activity launch policy.

         *

         * <p>If the current {@link VirtualDeviceParams#POLICY_TYPE_ACTIVIY} allows activity

         * launches by default, (i.e. it is {@link VirtualDeviceParams#DEVICE_POLICY_DEFAULT},

         * <p>If the current {@link VirtualDeviceParams#POLICY_TYPE_ACTIVITY} allows activity

         * launches by default, (i.e. it is {@link VirtualDeviceParams#DEVICE_POLICY_DEFAULT}),

         * then the specified component will be allowed to launch.

         * If the current {@link VirtualDeviceParams#POLICY_TYPE_ACTIVITY} blocks activity

         * launches by default, (i.e. it is {@link VirtualDeviceParams#DEVICE_POLICY_CUSTOM}, then

         * the specified component will be blocked from launching.</p>

         * If the current {@link VirtualDeviceParams#POLICY_TYPE_ACTIVITY} blocks activity launches

         * by default, (i.e. it is {@link VirtualDeviceParams#DEVICE_POLICY_CUSTOM}), then the

         * specified component will be blocked from launching.</p>

         *

         * <p>Note that changing the activity launch policy will not affect current set of exempt

         * components and it needs to be updated separately.</p>

         * <p>Note that changing the activity launch policy will clear current set of exempt

         * components.</p>

         *

         * @see #addActivityPolicyExemption

         * @see #setDevicePolicy

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

+3 −0
Original line number Diff line number Diff line
@@ -218,6 +218,9 @@ public class GenericWindowPolicyController extends DisplayWindowPolicyController 


    void setActivityLaunchDefaultAllowed(boolean activityLaunchDefaultAllowed) {

        synchronized (mGenericWindowPolicyControllerLock) {

            if (mActivityLaunchAllowedByDefault != activityLaunchDefaultAllowed) {

                mActivityPolicyExemptions.clear();

            }

            mActivityLaunchAllowedByDefault = activityLaunchDefaultAllowed;

        }

    }