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

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

New TestApis to use in VDM CTS 

Bug: 324560285
Test: CTS
Change-Id: I494fdc3213688f0a1d0980adc1f60b6f917e9d1a
parent 531c9d5a

core/api/test-current.txt

+29 −0
Original line number Diff line number Diff line
@@ -921,7 +921,33 @@ package android.companion { 
package android.companion.virtual {



  public final class VirtualDeviceManager {

    method public int getAudioPlaybackSessionId(int);

    method public int getAudioRecordingSessionId(int);

    method public int getDeviceIdForDisplayId(int);

    method public int getDevicePolicy(int, int);

    method @FlaggedApi("android.companion.virtual.flags.interactive_screen_mirror") public boolean isVirtualDeviceOwnedMirrorDisplay(int);

    method public void playSoundEffect(int, int);

  }



}



package android.companion.virtual.camera {



  @FlaggedApi("android.companion.virtual.flags.virtual_camera") public final class VirtualCamera implements java.io.Closeable {

    method @NonNull public String getId();

  }



}



package android.companion.virtual.sensor {



  public final class VirtualSensor implements android.os.Parcelable {

    ctor public VirtualSensor(int, int, @NonNull String);

    method public int getHandle();

  }



  public final class VirtualSensorConfig implements android.os.Parcelable {

    method public int getFlags();

  }



}
@@ -988,6 +1014,7 @@ package android.content { 
    method public void setAutofillOptions(@Nullable android.content.AutofillOptions);

    method public void setContentCaptureOptions(@Nullable android.content.ContentCaptureOptions);

    method public void updateDeviceId(int);

    method public abstract void updateDisplay(int);

    field public static final String ATTENTION_SERVICE = "attention";

    field public static final String CONTENT_CAPTURE_MANAGER_SERVICE = "content_capture";

    field public static final String DEVICE_IDLE_CONTROLLER = "deviceidle";
@@ -1001,6 +1028,7 @@ package android.content { 


  public class ContextWrapper extends android.content.Context {

    method public int getDisplayId();

    method public void updateDisplay(int);

  }



  public class Intent implements java.lang.Cloneable android.os.Parcelable {
@@ -3538,6 +3566,7 @@ package android.view { 
  public final class Display {

    method @RequiresPermission(android.Manifest.permission.MODIFY_USER_PREFERRED_DISPLAY_MODE) public void clearUserPreferredDisplayMode();

    method @NonNull public android.view.Display.Mode getDefaultMode();

    method public int getRemoveMode();

    method @NonNull public int[] getReportedHdrTypes();

    method @NonNull public android.graphics.ColorSpace[] getSupportedWideColorGamut();

    method @Nullable public android.view.Display.Mode getSystemPreferredDisplayMode();

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

+11 −0
Original line number Diff line number Diff line
@@ -26,6 +26,7 @@ import android.annotation.NonNull; 
import android.annotation.Nullable;

import android.annotation.RequiresPermission;

import android.annotation.SdkConstant;

import android.annotation.SuppressLint;

import android.annotation.SystemApi;

import android.annotation.SystemService;

import android.annotation.TestApi;
@@ -333,6 +334,8 @@ public final class VirtualDeviceManager { 
     *

     * @hide

     */

    @SuppressLint("UnflaggedApi") // @TestApi without associated feature.

    @TestApi

    public @VirtualDeviceParams.DevicePolicy int getDevicePolicy(

            int deviceId, @VirtualDeviceParams.PolicyType int policyType) {

        if (mService == null) {
@@ -351,6 +354,8 @@ public final class VirtualDeviceManager { 
     *

     * @hide

     */

    @SuppressLint("UnflaggedApi") // @TestApi without associated feature.

    @TestApi

    public int getDeviceIdForDisplayId(int displayId) {

        if (mService == null) {

            Log.w(TAG, "Failed to retrieve virtual devices; no virtual device manager service.");
@@ -446,6 +451,8 @@ public final class VirtualDeviceManager { 
     *

     * @hide

     */

    @SuppressLint("UnflaggedApi") // @TestApi without associated feature.

    @TestApi

    public int getAudioPlaybackSessionId(int deviceId) {

        if (mService == null) {

            return AUDIO_SESSION_ID_GENERATE;
@@ -470,6 +477,8 @@ public final class VirtualDeviceManager { 
     *

     * @hide

     */

    @SuppressLint("UnflaggedApi") // @TestApi without associated feature.

    @TestApi

    public int getAudioRecordingSessionId(int deviceId) {

        if (mService == null) {

            return AUDIO_SESSION_ID_GENERATE;
@@ -491,6 +500,8 @@ public final class VirtualDeviceManager { 
     *

     * @hide

     */

    @SuppressLint("UnflaggedApi") // @TestApi without associated feature.

    @TestApi

    public void playSoundEffect(int deviceId, @AudioManager.SystemSoundEffect int effectType) {

        if (mService == null) {

            Log.w(TAG, "Failed to dispatch sound effect; no virtual device manager service.");

core/java/android/companion/virtual/camera/VirtualCamera.java

+4 −0
Original line number Diff line number Diff line
@@ -18,7 +18,9 @@ package android.companion.virtual.camera; 


import android.annotation.FlaggedApi;

import android.annotation.RequiresPermission;

import android.annotation.SuppressLint;

import android.annotation.SystemApi;

import android.annotation.TestApi;

import android.companion.virtual.IVirtualDevice;

import android.companion.virtual.VirtualDeviceManager;

import android.companion.virtual.VirtualDeviceParams;
@@ -84,6 +86,8 @@ public final class VirtualCamera implements Closeable { 
     * Returns the id of this virtual camera instance.

     * @hide

     */

    @SuppressLint("UnflaggedApi") // @TestApi without associated feature.

    @TestApi

    @NonNull

    public String getId() {

        return mCameraId;

core/java/android/companion/virtual/sensor/VirtualSensor.java

+13 −0
Original line number Diff line number Diff line
@@ -18,7 +18,9 @@ package android.companion.virtual.sensor; 


import android.annotation.NonNull;

import android.annotation.RequiresPermission;

import android.annotation.SuppressLint;

import android.annotation.SystemApi;

import android.annotation.TestApi;

import android.companion.virtual.IVirtualDevice;

import android.hardware.Sensor;

import android.os.IBinder;
@@ -54,6 +56,15 @@ public final class VirtualSensor implements Parcelable { 
        mToken = token;

    }



    /**

     * @hide

     */

    @SuppressLint("UnflaggedApi") // @TestApi without associated feature.

    @TestApi

    public VirtualSensor(int handle, int type, @NonNull String name) {

        this(handle, type, name, /*virtualDevice=*/null, /*token=*/null);

    }



    private VirtualSensor(Parcel parcel) {

        mHandle = parcel.readInt();

        mType = parcel.readInt();
@@ -67,6 +78,8 @@ public final class VirtualSensor implements Parcelable { 
     *

     * @hide

     */

    @SuppressLint("UnflaggedApi") // @TestApi without associated feature.

    @TestApi

    public int getHandle() {

        return mHandle;

    }

core/java/android/companion/virtual/sensor/VirtualSensorConfig.java

+4 −0
Original line number Diff line number Diff line
@@ -20,7 +20,9 @@ package android.companion.virtual.sensor; 
import android.annotation.IntRange;

import android.annotation.NonNull;

import android.annotation.Nullable;

import android.annotation.SuppressLint;

import android.annotation.SystemApi;

import android.annotation.TestApi;

import android.hardware.Sensor;

import android.hardware.SensorDirectChannel;

import android.os.Parcel;
@@ -217,6 +219,8 @@ public final class VirtualSensorConfig implements Parcelable { 
     *

     * @hide

     */

    @SuppressLint("UnflaggedApi") // @TestApi without associated feature.

    @TestApi

    public int getFlags() {

        return mFlags;

    }