commit fb51179bfc3351518d601c942042ef58300c37ff
author Vladimir Komsiyski <vladokom@google.com> Mon Sep 25 06:34:43 2023 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Mon Sep 25 06:34:43 2023 +0000
tree 5401ae530823a6a10a214044dcc772f5db307d2b
parent f311c6dc84e9d84b020315ce2a676e135519249d
parent 2bb660c984227adfcd73803a8d1719ff373380e5

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

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

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 f328b22..31e5cb8 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.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 @@
      * @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;