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

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

Merge "Use EnabledAfter for default VDM display flags" into main

parents f311c6dc 2bb660c9

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

+2 −2
Original line number Original line Diff line number Diff line
@@ -53,7 +53,7 @@ import android.companion.virtual.flags.Flags; 
import android.companion.virtual.sensor.VirtualSensor;

import android.companion.virtual.sensor.VirtualSensor;

import android.companion.virtual.sensor.VirtualSensorEvent;

import android.companion.virtual.sensor.VirtualSensorEvent;

import android.compat.annotation.ChangeId;

import android.compat.annotation.ChangeId;

import android.compat.annotation.EnabledSince;

import android.compat.annotation.EnabledAfter;

import android.content.AttributionSource;

import android.content.AttributionSource;

import android.content.ComponentName;

import android.content.ComponentName;

import android.content.Context;

import android.content.Context;
@@ -131,7 +131,7 @@ final class VirtualDeviceImpl extends IVirtualDevice.Stub 
     * @see DisplayManager#VIRTUAL_DISPLAY_FLAG_ROTATES_WITH_CONTENT

     * @see DisplayManager#VIRTUAL_DISPLAY_FLAG_ROTATES_WITH_CONTENT

     */

     */

    @ChangeId

    @ChangeId

    @EnabledSince(targetSdkVersion = Build.VERSION_CODES.VANILLA_ICE_CREAM)

    @EnabledAfter(targetSdkVersion = Build.VERSION_CODES.UPSIDE_DOWN_CAKE)

    public static final long MAKE_VIRTUAL_DISPLAY_FLAGS_CONSISTENT_WITH_DISPLAY_MANAGER =

    public static final long MAKE_VIRTUAL_DISPLAY_FLAGS_CONSISTENT_WITH_DISPLAY_MANAGER =

            294837146L;

            294837146L;