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

Commit a92066bf authored by Vladimir Komsiyski's avatar Vladimir Komsiyski Committed by Android (Google) Code Review
Browse files

Merge "Remove enforce_remote_device_opt_out_on_all_virtual_displays flag" into main

parents 4a593404 447cfdc2

core/java/android/companion/virtual/flags/flags.aconfig

+0 −7
Original line number Diff line number Diff line
@@ -34,13 +34,6 @@ flag { 
    bug: "320328752"

}



flag {

     namespace: "virtual_devices"

     name: "enforce_remote_device_opt_out_on_all_virtual_displays"

     description: "Respect canDisplayOnRemoteDevices on all virtual displays"

     bug: "338973239"

}



flag {

    namespace: "virtual_devices"

    name: "virtual_display_rotation_api"

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

+0 −4
Original line number Diff line number Diff line
@@ -21,7 +21,6 @@ import static android.content.pm.ActivityInfo.FLAG_CAN_DISPLAY_ON_REMOTE_DEVICES 
import android.annotation.NonNull;

import android.annotation.Nullable;

import android.app.WindowConfiguration;

import android.companion.virtualdevice.flags.Flags;

import android.content.ComponentName;

import android.content.Intent;

import android.content.IntentSender;
@@ -129,9 +128,6 @@ class DisplayWindowPolicyControllerHelper { 
    }



    private boolean launchAllowedByDisplayPolicy(ActivityInfo aInfo) {

        if (!Flags.enforceRemoteDeviceOptOutOnAllVirtualDisplays()) {

            return true;

        }

        int displayType = mDisplayContent.getDisplay().getType();

        if (displayType != Display.TYPE_VIRTUAL && displayType != Display.TYPE_WIFI) {

            return true;

services/tests/wmtests/src/com/android/server/wm/ActivityStarterTests.java

+0 −5
Original line number Diff line number Diff line
@@ -95,7 +95,6 @@ import android.graphics.Rect; 
import android.os.Binder;

import android.os.IBinder;

import android.os.RemoteException;

import android.platform.test.annotations.EnableFlags;

import android.platform.test.annotations.Presubmit;

import android.platform.test.annotations.RequiresFlagsDisabled;

import android.provider.DeviceConfig;
@@ -988,8 +987,6 @@ public class ActivityStarterTests extends WindowTestsBase { 
     * This test ensures that activity launch on an insecure secondary display is disallowed if the

     * activity opted out from showing on remote devices.

     */

    @EnableFlags(android.companion.virtualdevice.flags.Flags

            .FLAG_ENFORCE_REMOTE_DEVICE_OPT_OUT_ON_ALL_VIRTUAL_DISPLAYS)

    @Test

    public void testStartOptedOutActivityOnInsecureVirtualDisplay() {

        final ActivityStarter starter = prepareStarter(FLAG_ACTIVITY_NEW_TASK,
@@ -1033,8 +1030,6 @@ public class ActivityStarterTests extends WindowTestsBase { 
     * This test ensures that activity launch on a secure secondary display is allowed event if the

     * activity opted out from showing on remote devices.

     */

    @EnableFlags(android.companion.virtualdevice.flags.Flags

            .FLAG_ENFORCE_REMOTE_DEVICE_OPT_OUT_ON_ALL_VIRTUAL_DISPLAYS)

    @Test

    public void testStartOptedOutActivityOnSecureVirtualDisplay() {

        final ActivityStarter starter = prepareStarter(FLAG_ACTIVITY_NEW_TASK,