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

Commit 8653c0a4 authored by Vladimir Komsiyski's avatar Vladimir Komsiyski
Browse files

Flag new VDM APIs. 

 - Persistent device id
 - Virtual display rotation flag

Fix: 304478746
Fix: 304478748
Test: presubmit
Change-Id: I6e123475b48d75cab3b89b482ee67df544a6d76d
parent 48cf465e

core/api/current.txt

+1 −1
Original line number Diff line number Diff line
@@ -9683,7 +9683,7 @@ package android.companion.virtual { 
    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 @Nullable public String getName();

    method @Nullable public String getPersistentDeviceId();

    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 public void writeToParcel(@NonNull android.os.Parcel, int);

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

core/api/system-current.txt

+2 −2
Original line number Diff line number Diff line
@@ -3209,7 +3209,7 @@ package android.companion.virtual { 
    method @NonNull @RequiresPermission(android.Manifest.permission.CREATE_VIRTUAL_DEVICE) public android.hardware.input.VirtualTouchscreen createVirtualTouchscreen(@NonNull android.hardware.input.VirtualTouchscreenConfig);

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

    method public int getDeviceId();

    method @Nullable public String getPersistentDeviceId();

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

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

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

    method @RequiresPermission(android.Manifest.permission.CREATE_VIRTUAL_DEVICE) public void registerIntentInterceptor(@NonNull android.content.IntentFilter, @NonNull java.util.concurrent.Executor, @NonNull android.companion.virtual.VirtualDeviceManager.IntentInterceptorCallback);
@@ -4529,7 +4529,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 public static final int VIRTUAL_DISPLAY_FLAG_ROTATES_WITH_CONTENT = 128; // 0x80

    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_STEAL_TOP_FOCUS_DISABLED = 65536; // 0x10000

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

  }

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

+1 −0
Original line number Diff line number Diff line
@@ -113,6 +113,7 @@ 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;

    }

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

+1 −0
Original line number Diff line number Diff line
@@ -476,6 +476,7 @@ 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();

        }

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

+2 −2
Original line number Diff line number Diff line
@@ -20,6 +20,7 @@ import static android.view.Display.DEFAULT_DISPLAY; 
import static android.view.Display.HdrCapabilities.HdrType;



import android.Manifest;

import android.annotation.FlaggedApi;

import android.annotation.FloatRange;

import android.annotation.IntDef;

import android.annotation.IntRange;
@@ -27,7 +28,6 @@ import android.annotation.LongDef; 
import android.annotation.NonNull;

import android.annotation.Nullable;

import android.annotation.RequiresPermission;

import android.annotation.SuppressLint;

import android.annotation.SystemApi;

import android.annotation.SystemService;

import android.annotation.TestApi;
@@ -377,7 +377,7 @@ public final class DisplayManager { 
     * @see #createVirtualDisplay

     * @hide

     */

    @SuppressLint("UnflaggedApi")

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

    @SystemApi

    public static final int VIRTUAL_DISPLAY_FLAG_ROTATES_WITH_CONTENT = 1 << 7;