Merge "Add a virtual Dpad." (6120c41e) · Commits · e / os / android_frameworks_base

core/api/system-current.txt

+6 −0

Original line number	Diff line number	Diff line
		@@ -2804,6 +2804,7 @@ package android.companion.virtual {
		method @RequiresPermission(android.Manifest.permission.CREATE_VIRTUAL_DEVICE) public void close();
		method @NonNull @RequiresPermission(android.Manifest.permission.CREATE_VIRTUAL_DEVICE) public android.companion.virtual.audio.VirtualAudioDevice createVirtualAudioDevice(@NonNull android.hardware.display.VirtualDisplay, @Nullable java.util.concurrent.Executor, @Nullable android.companion.virtual.audio.VirtualAudioDevice.AudioConfigurationChangeCallback);
		method @Nullable public android.hardware.display.VirtualDisplay createVirtualDisplay(@IntRange(from=1) int, @IntRange(from=1) int, @IntRange(from=1) int, @Nullable android.view.Surface, int, @Nullable java.util.concurrent.Executor, @Nullable android.hardware.display.VirtualDisplay.Callback);
		method @NonNull @RequiresPermission(android.Manifest.permission.CREATE_VIRTUAL_DEVICE) public android.hardware.input.VirtualDpad createVirtualDpad(@NonNull android.hardware.display.VirtualDisplay, @NonNull String, int, int);
		method @NonNull @RequiresPermission(android.Manifest.permission.CREATE_VIRTUAL_DEVICE) public android.hardware.input.VirtualKeyboard createVirtualKeyboard(@NonNull android.hardware.display.VirtualDisplay, @NonNull String, int, int);
		method @NonNull @RequiresPermission(android.Manifest.permission.CREATE_VIRTUAL_DEVICE) public android.hardware.input.VirtualMouse createVirtualMouse(@NonNull android.hardware.display.VirtualDisplay, @NonNull String, int, int);
		method @NonNull @RequiresPermission(android.Manifest.permission.CREATE_VIRTUAL_DEVICE) public android.hardware.input.VirtualTouchscreen createVirtualTouchscreen(@NonNull android.hardware.display.VirtualDisplay, @NonNull String, int, int);
		@@ -4373,6 +4374,11 @@ package android.hardware.hdmi {

		package android.hardware.input {

		public class VirtualDpad implements java.io.Closeable {
		method @RequiresPermission(android.Manifest.permission.CREATE_VIRTUAL_DEVICE) public void close();
		method @RequiresPermission(android.Manifest.permission.CREATE_VIRTUAL_DEVICE) public void sendKeyEvent(@NonNull android.hardware.input.VirtualKeyEvent);
		}

		public final class VirtualKeyEvent implements android.os.Parcelable {
		method public int describeContents();
		method public int getAction();

core/java/android/companion/virtual/IVirtualDevice.aidl

+7 −0

Original line number	Diff line number	Diff line
		@@ -57,6 +57,12 @@ interface IVirtualDevice {

		void onAudioSessionEnded();

		void createVirtualDpad(
		int displayId,
		String inputDeviceName,
		int vendorId,
		int productId,
		IBinder token);
		void createVirtualKeyboard(
		int displayId,
		String inputDeviceName,
		@@ -77,6 +83,7 @@ interface IVirtualDevice {
		IBinder token,
		in Point screenSize);
		void unregisterInputDevice(IBinder token);
		boolean sendDpadKeyEvent(IBinder token, in VirtualKeyEvent event);
		boolean sendKeyEvent(IBinder token, in VirtualKeyEvent event);
		boolean sendButtonEvent(IBinder token, in VirtualMouseButtonEvent event);
		boolean sendRelativeEvent(IBinder token, in VirtualMouseRelativeEvent event);

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

+27 −0

Original line number	Diff line number	Diff line
		@@ -37,6 +37,7 @@ import android.hardware.display.DisplayManagerGlobal;
		import android.hardware.display.IVirtualDisplayCallback;
		import android.hardware.display.VirtualDisplay;
		import android.hardware.display.VirtualDisplayConfig;
		import android.hardware.input.VirtualDpad;
		import android.hardware.input.VirtualKeyboard;
		import android.hardware.input.VirtualMouse;
		import android.hardware.input.VirtualTouchscreen;
		@@ -314,6 +315,32 @@ public final class VirtualDeviceManager {
		}
		}

		/**
		* Creates a virtual dpad.
		*
		* @param display the display that the events inputted through this device should target
		* @param inputDeviceName the name to call this input device
		* @param vendorId the PCI vendor id
		* @param productId the product id, as defined by the vendor
		*/
		@RequiresPermission(android.Manifest.permission.CREATE_VIRTUAL_DEVICE)
		@NonNull
		public VirtualDpad createVirtualDpad(
		@NonNull VirtualDisplay display,
		@NonNull String inputDeviceName,
		int vendorId,
		int productId) {
		try {
		final IBinder token = new Binder(
		"android.hardware.input.VirtualDpad:" + inputDeviceName);
		mVirtualDevice.createVirtualDpad(display.getDisplay().getDisplayId(),
		inputDeviceName, vendorId, productId, token);
		return new VirtualDpad(mVirtualDevice, token);
		} catch (RemoteException e) {
		throw e.rethrowFromSystemServer();
		}
		}

		/**
		* Creates a virtual keyboard.
		*

core/java/android/hardware/input/VirtualDpad.java

0 → 100644

+94 −0

Original line number	Diff line number	Diff line
		/*
		* Copyright (C) 2022 The Android Open Source Project
		*
		* Licensed under the Apache License, Version 2.0 (the "License");
		* you may not use this file except in compliance with the License.
		* You may obtain a copy of the License at
		*
		* http://www.apache.org/licenses/LICENSE-2.0
		*
		* Unless required by applicable law or agreed to in writing, software
		* distributed under the License is distributed on an "AS IS" BASIS,
		* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
		* See the License for the specific language governing permissions and
		* limitations under the License.
		*/

		package android.hardware.input;

		import android.annotation.NonNull;
		import android.annotation.RequiresPermission;
		import android.annotation.SystemApi;
		import android.companion.virtual.IVirtualDevice;
		import android.os.IBinder;
		import android.os.RemoteException;
		import android.view.KeyEvent;

		import java.io.Closeable;
		import java.util.Arrays;
		import java.util.Collections;
		import java.util.HashSet;
		import java.util.Set;

		/**
		* A virtual dpad representing a key input mechanism on a remote device.
		*
		* This registers an InputDevice that is interpreted like a physically-connected device and
		* dispatches received events to it.
		*
		* @hide
		*/
		@SystemApi
		public class VirtualDpad implements Closeable {

		private final Set<Integer> mSupportedKeyCodes =
		Collections.unmodifiableSet(
		new HashSet<>(
		Arrays.asList(
		KeyEvent.KEYCODE_DPAD_UP,
		KeyEvent.KEYCODE_DPAD_DOWN,
		KeyEvent.KEYCODE_DPAD_LEFT,
		KeyEvent.KEYCODE_DPAD_RIGHT,
		KeyEvent.KEYCODE_DPAD_CENTER)));
		private final IVirtualDevice mVirtualDevice;
		private final IBinder mToken;

		/** @hide */
		public VirtualDpad(IVirtualDevice virtualDevice, IBinder token) {
		mVirtualDevice = virtualDevice;
		mToken = token;
		}

		@Override
		@RequiresPermission(android.Manifest.permission.CREATE_VIRTUAL_DEVICE)
		public void close() {
		try {
		mVirtualDevice.unregisterInputDevice(mToken);
		} catch (RemoteException e) {
		throw e.rethrowFromSystemServer();
		}
		}

		/**
		* Sends a key event to the system.
		*
		* Supported key codes are KEYCODE_DPAD_UP, KEYCODE_DPAD_DOWN, KEYCODE_DPAD_LEFT,
		* KEYCODE_DPAD_RIGHT and KEYCODE_DPAD_CENTER,
		*
		* @param event the event to send
		*/
		@RequiresPermission(android.Manifest.permission.CREATE_VIRTUAL_DEVICE)
		public void sendKeyEvent(@NonNull VirtualKeyEvent event) {
		try {
		if (!mSupportedKeyCodes.contains(event.getKeyCode())) {
		throw new IllegalArgumentException(
		"Unsupported key code "
		+ event.getKeyCode()
		+ " sent to a VirtualDpad input device.");
		}
		mVirtualDevice.sendDpadKeyEvent(mToken, event);
		} catch (RemoteException e) {
		throw e.rethrowFromSystemServer();
		}
		}
		}

core/java/android/hardware/input/VirtualKeyEvent.java

+1 −0

Original line number	Diff line number	Diff line
		@@ -158,6 +158,7 @@ public final class VirtualKeyEvent implements Parcelable {
		KeyEvent.KEYCODE_DPAD_UP,
		KeyEvent.KEYCODE_DPAD_LEFT,
		KeyEvent.KEYCODE_DPAD_RIGHT,
		KeyEvent.KEYCODE_DPAD_CENTER,
		KeyEvent.KEYCODE_MOVE_END,
		KeyEvent.KEYCODE_MOVE_HOME,
		KeyEvent.KEYCODE_PAGE_DOWN,