From 2bb660c984227adfcd73803a8d1719ff373380e5 Mon Sep 17 00:00:00 2001 From: Vladimir Komsiyski Date: Sun, 24 Sep 2023 09:15:06 +0200 Subject: Use EnabledAfter for default VDM display flags Otherwise we can't use the new flag logic until VIC is released Test: VDM demo app Bug: n/a Change-Id: I4428741fe58482fca4ad6819b369805be050d48f --- .../java/com/android/server/companion/virtual/VirtualDeviceImpl.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/services/companion/java/com/android/server/companion/virtual/VirtualDeviceImpl.java b/services/companion/java/com/android/server/companion/virtual/VirtualDeviceImpl.java index f328b22352ae..31e5cb82d24c 100644 --- a/services/companion/java/com/android/server/companion/virtual/VirtualDeviceImpl.java +++ b/services/companion/java/com/android/server/companion/virtual/VirtualDeviceImpl.java @@ -53,7 +53,7 @@ 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.EnabledSince; +import android.compat.annotation.EnabledAfter; import android.content.AttributionSource; import android.content.ComponentName; import android.content.Context; @@ -131,7 +131,7 @@ final class VirtualDeviceImpl extends IVirtualDevice.Stub * @see DisplayManager#VIRTUAL_DISPLAY_FLAG_ROTATES_WITH_CONTENT */ @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 = 294837146L; -- cgit v1.2.3-59-g8ed1b