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

Commit ebea64cc authored by Vladimir Komsiyski's avatar Vladimir Komsiyski
Browse files

Clean up launched VDM public APIs flag 

Launched in Android 15

#codehealth

Fix: 310912420
Fix: 299278091
Bug: 379646558
Bug: 274852670
Test: presubmit
Flag: EXEMPT cleanup
Change-Id: I2f09b7debd3ae73f12c4c4551e9f8fb73f94a5f5
parent 9388ab9f

core/api/current.txt

+8 −8
Original line number Diff line number Diff line
@@ -10249,23 +10249,23 @@ package android.companion.virtual { 
  public final class VirtualDevice implements android.os.Parcelable {

    method public int describeContents();

    method public int getDeviceId();

    method @FlaggedApi("android.companion.virtual.flags.vdm_public_apis") @NonNull public int[] getDisplayIds();

    method @FlaggedApi("android.companion.virtual.flags.vdm_public_apis") @Nullable public CharSequence getDisplayName();

    method @NonNull public int[] getDisplayIds();

    method @Nullable public CharSequence getDisplayName();

    method @Nullable public String getName();

    method @FlaggedApi("android.companion.virtual.flags.vdm_public_apis") @Nullable public String getPersistentDeviceId();

    method @FlaggedApi("android.companion.virtual.flags.vdm_public_apis") public boolean hasCustomSensorSupport();

    method @Nullable public String getPersistentDeviceId();

    method public boolean hasCustomSensorSupport();

    method public void writeToParcel(@NonNull android.os.Parcel, int);

    field @NonNull public static final android.os.Parcelable.Creator<android.companion.virtual.VirtualDevice> CREATOR;

  }















  public final class VirtualDeviceManager {













    method @FlaggedApi("android.companion.virtual.flags.vdm_public_apis") @Nullable public android.companion.virtual.VirtualDevice getVirtualDevice(int);













    method @Nullable public android.companion.virtual.VirtualDevice getVirtualDevice(int);















    method @NonNull public java.util.List<android.companion.virtual.VirtualDevice> getVirtualDevices();













    method @FlaggedApi("android.companion.virtual.flags.vdm_public_apis") public void registerVirtualDeviceListener(@NonNull java.util.concurrent.Executor, @NonNull android.companion.virtual.VirtualDeviceManager.VirtualDeviceListener);













    method @FlaggedApi("android.companion.virtual.flags.vdm_public_apis") public void unregisterVirtualDeviceListener(@NonNull android.companion.virtual.VirtualDeviceManager.VirtualDeviceListener);













    method public void registerVirtualDeviceListener(@NonNull java.util.concurrent.Executor, @NonNull android.companion.virtual.VirtualDeviceManager.VirtualDeviceListener);













    method public void unregisterVirtualDeviceListener(@NonNull android.companion.virtual.VirtualDeviceManager.VirtualDeviceListener);















  }



























  @FlaggedApi("android.companion.virtual.flags.vdm_public_apis") public static interface VirtualDeviceManager.VirtualDeviceListener {













  public static interface VirtualDeviceManager.VirtualDeviceListener {















    method public default void onVirtualDeviceClosed(int);















    method public default void onVirtualDeviceCreated(int);















  }

























core/api/system-current.txt



+4
−4




























Original line number
Diff line number
Diff line








@@ -3399,8 +3399,8 @@ package android.companion.virtual {













  }





























  public final class VirtualDevice implements android.os.Parcelable {













    method @FlaggedApi("android.companion.virtual.flags.vdm_public_apis") public boolean hasCustomAudioInputSupport();













    method @FlaggedApi("android.companion.virtual.flags.vdm_public_apis") public boolean hasCustomCameraSupport();













    method public boolean hasCustomAudioInputSupport();













    method public boolean hasCustomCameraSupport();















  }





























  public final class VirtualDeviceManager {










@@ -3452,7 +3452,7 @@ package android.companion.virtual {













    method @NonNull public android.hardware.input.VirtualTouchscreen createVirtualTouchscreen(@NonNull android.hardware.input.VirtualTouchscreenConfig);















    method @Deprecated @NonNull public android.hardware.input.VirtualTouchscreen createVirtualTouchscreen(@NonNull android.hardware.display.VirtualDisplay, @NonNull String, int, int);















    method public int getDeviceId();













    method @FlaggedApi("android.companion.virtual.flags.vdm_public_apis") @Nullable public String getPersistentDeviceId();













    method @Nullable public String getPersistentDeviceId();















    method @NonNull public java.util.List<android.companion.virtual.sensor.VirtualSensor> getVirtualSensorList();















    method @FlaggedApi("android.companion.virtualdevice.flags.device_aware_display_power") public void goToSleep();















    method public void launchPendingIntent(int, @NonNull android.app.PendingIntent, @NonNull java.util.concurrent.Executor, @NonNull java.util.function.IntConsumer);










@@ -5325,7 +5325,7 @@ package android.hardware.display {













    method @RequiresPermission(android.Manifest.permission.CONFIGURE_DISPLAY_BRIGHTNESS) public void setBrightnessConfiguration(android.hardware.display.BrightnessConfiguration);















    method @RequiresPermission(android.Manifest.permission.CONFIGURE_DISPLAY_BRIGHTNESS) public void setBrightnessConfigurationForDisplay(@NonNull android.hardware.display.BrightnessConfiguration, @NonNull String);















    method @Deprecated @RequiresPermission(android.Manifest.permission.CONTROL_DISPLAY_SATURATION) public void setSaturationLevel(float);













    field @FlaggedApi("android.companion.virtual.flags.vdm_public_apis") public static final int VIRTUAL_DISPLAY_FLAG_ROTATES_WITH_CONTENT = 128; // 0x80













    field public static final int VIRTUAL_DISPLAY_FLAG_ROTATES_WITH_CONTENT = 128; // 0x80















    field public static final int VIRTUAL_DISPLAY_FLAG_STEAL_TOP_FOCUS_DISABLED = 65536; // 0x10000















    field public static final int VIRTUAL_DISPLAY_FLAG_TRUSTED = 1024; // 0x400















  }

























core/java/android/companion/virtual/VirtualDevice.java



+3
−10




























Original line number
Diff line number
Diff line








@@ -20,11 +20,9 @@ import static android.companion.virtual.VirtualDeviceParams.DEVICE_POLICY_CUSTOM













import static android.companion.virtual.VirtualDeviceParams.POLICY_TYPE_CAMERA;















import static android.companion.virtual.VirtualDeviceParams.POLICY_TYPE_SENSORS;





























import android.annotation.FlaggedApi;















import android.annotation.NonNull;















import android.annotation.Nullable;















import android.annotation.SystemApi;













import android.companion.virtual.flags.Flags;















import android.content.Context;















import android.os.Parcel;















import android.os.Parcelable;









@@ -34,8 +32,9 @@ import android.os.RemoteException;













 * Details of a particular virtual device.















 *















 * <p>Read-only device representation exposing the properties of an existing virtual device.













 *













 * @see VirtualDeviceManager#registerVirtualDeviceListener















 */













// TODO(b/310912420): Link to VirtualDeviceManager#registerVirtualDeviceListener from the docs















public final class VirtualDevice implements Parcelable {































    private final @NonNull IVirtualDevice mVirtualDevice;










@@ -93,8 +92,8 @@ public final class VirtualDevice implements Parcelable {













     * per device.















     *















     * @see Context#createDeviceContext













     * @see #getPersistentDeviceId()















     */













    // TODO(b/310912420): Link to #getPersistentDeviceId from the docs















    public int getDeviceId() {















        return mId;















    }









@@ -111,7 +110,6 @@ public final class VirtualDevice implements Parcelable {













     * <p class="note">This identifier may not be unique across virtual devices, in case there are















     * more than one virtual devices corresponding to the same physical device.















     */













    @FlaggedApi(Flags.FLAG_VDM_PUBLIC_APIS)















    public @Nullable String getPersistentDeviceId() {















        return mPersistentId;















    }









@@ -127,7 +125,6 @@ public final class VirtualDevice implements Parcelable {













     * Returns the human-readable name of the virtual device, if defined, which is suitable to be















     * shown in UI.















     */













    @FlaggedApi(Flags.FLAG_VDM_PUBLIC_APIS)















    public @Nullable CharSequence getDisplayName() {















        return mDisplayName;















    }









@@ -138,7 +135,6 @@ public final class VirtualDevice implements Parcelable {













     * <p>The actual {@link android.view.Display} objects can be obtained by passing the returned















     * IDs to {@link android.hardware.display.DisplayManager#getDisplay(int)}.</p>















     */













    @FlaggedApi(Flags.FLAG_VDM_PUBLIC_APIS)















    public @NonNull int[] getDisplayIds() {















        try {















            return mVirtualDevice.getDisplayIds();









@@ -157,7 +153,6 @@ public final class VirtualDevice implements Parcelable {













     * @see Context#getDeviceId()















     * @see Context#createDeviceContext(int)















     */













    @FlaggedApi(Flags.FLAG_VDM_PUBLIC_APIS)















    public boolean hasCustomSensorSupport() {















        try {















            return mVirtualDevice.getDevicePolicy(POLICY_TYPE_SENSORS) == DEVICE_POLICY_CUSTOM;









@@ -172,7 +167,6 @@ public final class VirtualDevice implements Parcelable {













     * @hide















     */















    @SystemApi













    @FlaggedApi(Flags.FLAG_VDM_PUBLIC_APIS)















    public boolean hasCustomAudioInputSupport() {















        try {















            return mVirtualDevice.hasCustomAudioInputSupport();









@@ -194,7 +188,6 @@ public final class VirtualDevice implements Parcelable {













     * @hide















     */















    @SystemApi













    @FlaggedApi(Flags.FLAG_VDM_PUBLIC_APIS)















    public boolean hasCustomCameraSupport() {















        try {















            return mVirtualDevice.getDevicePolicy(POLICY_TYPE_CAMERA) == DEVICE_POLICY_CUSTOM;

































core/java/android/companion/virtual/VirtualDeviceManager.java



+4
−10




























Original line number
Diff line number
Diff line








@@ -223,10 +223,9 @@ public final class VirtualDeviceManager {













     * existing virtual devices.</p>















     *















     * <p>Note that if a virtual device is closed and becomes invalid, the returned objects will













     * not be updated and may contain stale values.</p>













     * not be updated and may contain stale values. Use a {@link VirtualDeviceListener} for real













     * time updates of the availability  of virtual devices.</p>















     */













    // TODO(b/310912420): Add "Use a VirtualDeviceListener for real time updates of the













    // availability  of virtual devices." in the note paragraph above with a link annotation.















    @NonNull















    public List<android.companion.virtual.VirtualDevice> getVirtualDevices() {















        if (mService == null) {









@@ -253,7 +252,6 @@ public final class VirtualDeviceManager {













     * @return the virtual device with the requested ID, or {@code null} if no such device exists or















     *   it has already been closed.















     */













    @FlaggedApi(Flags.FLAG_VDM_PUBLIC_APIS)















    @Nullable















    public android.companion.virtual.VirtualDevice getVirtualDevice(int deviceId) {















        if (mService == null) {









@@ -278,7 +276,6 @@ public final class VirtualDeviceManager {













     * @param listener The listener to add.















     * @see #unregisterVirtualDeviceListener















     */













    @FlaggedApi(Flags.FLAG_VDM_PUBLIC_APIS)















    public void registerVirtualDeviceListener(















            @NonNull @CallbackExecutor Executor executor,















            @NonNull VirtualDeviceListener listener) {










@@ -306,7 +303,6 @@ public final class VirtualDeviceManager {













     * @param listener The listener to unregister.















     * @see #registerVirtualDeviceListener















     */













    @FlaggedApi(Flags.FLAG_VDM_PUBLIC_APIS)















    public void unregisterVirtualDeviceListener(@NonNull VirtualDeviceListener listener) {















        if (mService == null) {















            Log.w(TAG, "Failed to unregister listener; no virtual device manager service.");










@@ -389,9 +385,9 @@ public final class VirtualDeviceManager {













     * @return the display name associated with the given persistent device ID, or {@code null} if















     *     the persistent ID is invalid or does not correspond to a virtual device.















     *













     * @see VirtualDevice#getPersistentDeviceId()















     * @hide















     */













    // TODO(b/315481938): Link @see VirtualDevice#getPersistentDeviceId()















    @SystemApi















    @Nullable















    public CharSequence getDisplayNameForPersistentDeviceId(@NonNull String persistentDeviceId) {









@@ -411,9 +407,9 @@ public final class VirtualDeviceManager {













     * Returns all current persistent device IDs, including the ones for which no virtual device















     * exists, as long as one may have existed or can be created.















     *













     * @see VirtualDevice#getPersistentDeviceId()















     * @hide















     */













    // TODO(b/315481938): Link @see VirtualDevice#getPersistentDeviceId()















    @SystemApi















    @NonNull















    public Set<String> getAllPersistentDeviceIds() {










@@ -588,7 +584,6 @@ public final class VirtualDeviceManager {













        /**















         * Returns the persistent ID of this virtual device.















         */













        @FlaggedApi(Flags.FLAG_VDM_PUBLIC_APIS)















        public @Nullable String getPersistentDeviceId() {















            return mVirtualDeviceInternal.getPersistentDeviceId();















        }










@@ -1339,7 +1334,6 @@ public final class VirtualDeviceManager {













     *















     * @see #registerVirtualDeviceListener















     */













    @FlaggedApi(Flags.FLAG_VDM_PUBLIC_APIS)















    public interface VirtualDeviceListener {















        /**















         * Called whenever a new virtual device has been added to the system.

































core/java/android/hardware/display/DisplayManager.java



+0
−1




























Original line number
Diff line number
Diff line








@@ -397,7 +397,6 @@ public final class DisplayManager {













     * @see #createVirtualDisplay















     * @hide















     */













    @FlaggedApi(android.companion.virtual.flags.Flags.FLAG_VDM_PUBLIC_APIS)















    @SystemApi















    public static final int VIRTUAL_DISPLAY_FLAG_ROTATES_WITH_CONTENT = 1 << 7;