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

Commit 1f27b854 authored by Vladimir Komsiyski's avatar Vladimir Komsiyski Committed by Android (Google) Code Review
Browse files

Merge "Add @TestApi to use in VDM input CTS" into main

parents 60b391c5 1eb00fb3

core/api/test-current.txt

+5 −0
Original line number Diff line number Diff line
@@ -1703,6 +1703,7 @@ package android.hardware.display { 
    field public static final int SWITCHING_TYPE_WITHIN_GROUPS = 1; // 0x1

    field public static final int VIRTUAL_DISPLAY_FLAG_OWN_FOCUS = 16384; // 0x4000

    field public static final int VIRTUAL_DISPLAY_FLAG_SHOULD_SHOW_SYSTEM_DECORATIONS = 512; // 0x200

    field public static final int VIRTUAL_DISPLAY_FLAG_SUPPORTS_TOUCH = 64; // 0x40

  }



}
@@ -1751,6 +1752,10 @@ package android.hardware.input { 
    field public static final int DEFAULT_POINTER_SPEED = 0; // 0x0

  }



  public class VirtualKeyboard implements java.io.Closeable {

    method public int getInputDeviceId();

  }



}



package android.hardware.lights {

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

+3 −0
Original line number Diff line number Diff line
@@ -28,6 +28,7 @@ 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;
@@ -367,6 +368,8 @@ public final class DisplayManager { 
     * @see #createVirtualDisplay

     * @hide

     */

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

    @TestApi

    public static final int VIRTUAL_DISPLAY_FLAG_SUPPORTS_TOUCH = 1 << 6;



    /**

core/java/android/hardware/input/VirtualKeyboard.java

+13 −0
Original line number Diff line number Diff line
@@ -18,7 +18,9 @@ package android.hardware.input; 


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.os.IBinder;

import android.os.RemoteException;
@@ -66,4 +68,15 @@ public class VirtualKeyboard extends VirtualInputDevice { 
            throw e.rethrowFromSystemServer();

        }

    }



    /**

     * @return The id of the {@link android.view.InputDevice} corresponding to this keyboard.

     * @hide

     */

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

    @TestApi

    @Override

    public int getInputDeviceId() {

        return super.getInputDeviceId();

    }

}