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

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

Merge "VDM display flags: replace the compat change with a flag." into main

parents 5e2068ff 60cf2e85

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

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

}



flag {

  name: "consistent_display_flags"

  namespace: "virtual_devices"

  description: "Make virtual display flags consistent with display manager"

  bug: "300905478"

}



flag {

  name: "vdm_custom_home"

  namespace: "virtual_devices"

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

+1 −22
Original line number Diff line number Diff line
@@ -39,7 +39,6 @@ import android.app.Activity; 
import android.app.ActivityOptions;

import android.app.PendingIntent;

import android.app.admin.DevicePolicyManager;

import android.app.compat.CompatChanges;

import android.companion.AssociationInfo;

import android.companion.virtual.IVirtualDevice;

import android.companion.virtual.IVirtualDeviceActivityListener;
@@ -55,8 +54,6 @@ import android.companion.virtual.camera.VirtualCameraConfig; 
import android.companion.virtual.flags.Flags;

import android.companion.virtual.sensor.VirtualSensor;

import android.companion.virtual.sensor.VirtualSensorEvent;

import android.compat.annotation.ChangeId;

import android.compat.annotation.EnabledAfter;

import android.content.AttributionSource;

import android.content.ComponentName;

import android.content.Context;
@@ -81,7 +78,6 @@ import android.hardware.input.VirtualNavigationTouchpadConfig; 
import android.hardware.input.VirtualTouchEvent;

import android.hardware.input.VirtualTouchscreenConfig;

import android.os.Binder;

import android.os.Build;

import android.os.IBinder;

import android.os.LocaleList;

import android.os.Looper;
@@ -122,22 +118,6 @@ final class VirtualDeviceImpl extends IVirtualDevice.Stub 


    private static final String TAG = "VirtualDeviceImpl";



    /**

     * Virtual displays created by a {@code VirtualDeviceManager.VirtualDevice} are more consistent

     * with virtual displays created via {@link android.hardware.display.DisplayManager} and allow

     * for the creation of private, auto-mirror, and fixed orientation displays since

     * {@link android.os.Build.VERSION_CODES#VANILLA_ICE_CREAM}.

     *

     * @see DisplayManager#VIRTUAL_DISPLAY_FLAG_PUBLIC

     * @see DisplayManager#VIRTUAL_DISPLAY_FLAG_OWN_CONTENT_ONLY

     * @see DisplayManager#VIRTUAL_DISPLAY_FLAG_AUTO_MIRROR

     * @see DisplayManager#VIRTUAL_DISPLAY_FLAG_ROTATES_WITH_CONTENT

     */

    @ChangeId

    @EnabledAfter(targetSdkVersion = Build.VERSION_CODES.UPSIDE_DOWN_CAKE)

    public static final long MAKE_VIRTUAL_DISPLAY_FLAGS_CONSISTENT_WITH_DISPLAY_MANAGER =

            294837146L;



    private static final int DEFAULT_VIRTUAL_DISPLAY_FLAGS =

            DisplayManager.VIRTUAL_DISPLAY_FLAG_TOUCH_FEEDBACK_DISABLED

                    | DisplayManager.VIRTUAL_DISPLAY_FLAG_DESTROY_CONTENT_ON_REMOVAL
@@ -365,8 +345,7 @@ final class VirtualDeviceImpl extends IVirtualDevice.Stub 
        }



        int flags = DEFAULT_VIRTUAL_DISPLAY_FLAGS;

        if (!CompatChanges.isChangeEnabled(

                MAKE_VIRTUAL_DISPLAY_FLAGS_CONSISTENT_WITH_DISPLAY_MANAGER, mOwnerUid)) {

        if (!Flags.consistentDisplayFlags()) {

            flags |= DEFAULT_VIRTUAL_DISPLAY_FLAGS_PRE_VIC;

        }

        if (mParams.getLockState() == VirtualDeviceParams.LOCK_STATE_ALWAYS_UNLOCKED) {