Merge "Virtual rotary encoder API" into main (aa9f1f65) · Commits · e / os / android_frameworks_base

AconfigFlags.bp

+6 −0

Original line number	Diff line number	Diff line
		@@ -405,6 +405,12 @@ cc_aconfig_library {
		aconfig_declarations: "android.companion.virtualdevice.flags-aconfig",
		}

		cc_aconfig_library {
		name: "android.companion.virtualdevice.flags-aconfig-cc-host",
		aconfig_declarations: "android.companion.virtualdevice.flags-aconfig",
		host_supported: true,
		}

		java_aconfig_library {
		name: "android.companion.virtualdevice.flags-aconfig-java",
		aconfig_declarations: "android.companion.virtualdevice.flags-aconfig",

core/api/system-current.txt

+32 −0

Original line number	Diff line number	Diff line
		@@ -3476,6 +3476,7 @@ package android.companion.virtual {
		method @NonNull @RequiresPermission(android.Manifest.permission.CREATE_VIRTUAL_DEVICE) public android.hardware.input.VirtualMouse createVirtualMouse(@NonNull android.hardware.input.VirtualMouseConfig);
		method @Deprecated @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.VirtualNavigationTouchpad createVirtualNavigationTouchpad(@NonNull android.hardware.input.VirtualNavigationTouchpadConfig);
		method @FlaggedApi("android.companion.virtualdevice.flags.virtual_rotary") @NonNull @RequiresPermission(android.Manifest.permission.CREATE_VIRTUAL_DEVICE) public android.hardware.input.VirtualRotaryEncoder createVirtualRotaryEncoder(@NonNull android.hardware.input.VirtualRotaryEncoderConfig);
		method @FlaggedApi("android.companion.virtual.flags.virtual_stylus") @NonNull @RequiresPermission(android.Manifest.permission.CREATE_VIRTUAL_DEVICE) public android.hardware.input.VirtualStylus createVirtualStylus(@NonNull android.hardware.input.VirtualStylusConfig);
		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);
		@@ -5762,6 +5763,37 @@ package android.hardware.input {
		method @NonNull public android.hardware.input.VirtualNavigationTouchpadConfig build();
		}

		@FlaggedApi("android.companion.virtualdevice.flags.virtual_rotary") public class VirtualRotaryEncoder 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 sendScrollEvent(@NonNull android.hardware.input.VirtualRotaryEncoderScrollEvent);
		}

		@FlaggedApi("android.companion.virtualdevice.flags.virtual_rotary") public final class VirtualRotaryEncoderConfig extends android.hardware.input.VirtualInputDeviceConfig implements android.os.Parcelable {
		method public int describeContents();
		method public void writeToParcel(@NonNull android.os.Parcel, int);
		field @NonNull public static final android.os.Parcelable.Creator<android.hardware.input.VirtualRotaryEncoderConfig> CREATOR;
		}

		public static final class VirtualRotaryEncoderConfig.Builder extends android.hardware.input.VirtualInputDeviceConfig.Builder<android.hardware.input.VirtualRotaryEncoderConfig.Builder> {
		ctor public VirtualRotaryEncoderConfig.Builder();
		method @NonNull public android.hardware.input.VirtualRotaryEncoderConfig build();
		}

		@FlaggedApi("android.companion.virtualdevice.flags.virtual_rotary") public final class VirtualRotaryEncoderScrollEvent implements android.os.Parcelable {
		method public int describeContents();
		method public long getEventTimeNanos();
		method @FloatRange(from=-1.0F, to=1.0f) public float getScrollAmount();
		method public void writeToParcel(@NonNull android.os.Parcel, int);
		field @NonNull public static final android.os.Parcelable.Creator<android.hardware.input.VirtualRotaryEncoderScrollEvent> CREATOR;
		}

		public static final class VirtualRotaryEncoderScrollEvent.Builder {
		ctor public VirtualRotaryEncoderScrollEvent.Builder();
		method @NonNull public android.hardware.input.VirtualRotaryEncoderScrollEvent build();
		method @NonNull public android.hardware.input.VirtualRotaryEncoderScrollEvent.Builder setEventTimeNanos(long);
		method @NonNull public android.hardware.input.VirtualRotaryEncoderScrollEvent.Builder setScrollAmount(@FloatRange(from=-1.0F, to=1.0f) float);
		}

		@FlaggedApi("android.companion.virtual.flags.virtual_stylus") public class VirtualStylus 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 sendButtonEvent(@NonNull android.hardware.input.VirtualStylusButtonEvent);

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

+14 −0

Original line number	Diff line number	Diff line
		@@ -35,6 +35,8 @@ import android.hardware.input.VirtualMouseButtonEvent;
		import android.hardware.input.VirtualMouseConfig;
		import android.hardware.input.VirtualMouseRelativeEvent;
		import android.hardware.input.VirtualMouseScrollEvent;
		import android.hardware.input.VirtualRotaryEncoderConfig;
		import android.hardware.input.VirtualRotaryEncoderScrollEvent;
		import android.hardware.input.VirtualStylusButtonEvent;
		import android.hardware.input.VirtualStylusConfig;
		import android.hardware.input.VirtualStylusMotionEvent;
		@@ -157,6 +159,12 @@ interface IVirtualDevice {
		@EnforcePermission("CREATE_VIRTUAL_DEVICE")
		void createVirtualStylus(in VirtualStylusConfig config, IBinder token);

		/**
		* Creates a new rotary encoder and registers it with the input framework with the given token.
		*/
		@EnforcePermission("CREATE_VIRTUAL_DEVICE")
		void createVirtualRotaryEncoder(in VirtualRotaryEncoderConfig config, IBinder token);

		/**
		* Removes the input device corresponding to the given token from the framework.
		*/
		@@ -217,6 +225,12 @@ interface IVirtualDevice {
		@EnforcePermission("CREATE_VIRTUAL_DEVICE")
		boolean sendStylusButtonEvent(IBinder token, in VirtualStylusButtonEvent event);

		/**
		* Injects a scroll event from the virtual rotary encoder corresponding to the given token.
		*/
		@EnforcePermission("CREATE_VIRTUAL_DEVICE")
		boolean sendRotaryEncoderScrollEvent(IBinder token, in VirtualRotaryEncoderScrollEvent event);

		/**
		* Returns all virtual sensors created for this device.
		*/

core/java/android/companion/virtual/VirtualDeviceInternal.java

+15 −0

Original line number	Diff line number	Diff line
		@@ -46,6 +46,8 @@ import android.hardware.input.VirtualMouse;
		import android.hardware.input.VirtualMouseConfig;
		import android.hardware.input.VirtualNavigationTouchpad;
		import android.hardware.input.VirtualNavigationTouchpadConfig;
		import android.hardware.input.VirtualRotaryEncoder;
		import android.hardware.input.VirtualRotaryEncoderConfig;
		import android.hardware.input.VirtualStylus;
		import android.hardware.input.VirtualStylusConfig;
		import android.hardware.input.VirtualTouchscreen;
		@@ -335,6 +337,19 @@ public class VirtualDeviceInternal {
		}
		}

		@RequiresPermission(android.Manifest.permission.CREATE_VIRTUAL_DEVICE)
		@NonNull
		VirtualRotaryEncoder createVirtualRotaryEncoder(@NonNull VirtualRotaryEncoderConfig config) {
		try {
		final IBinder token = new Binder(
		"android.hardware.input.VirtualRotaryEncoder:" + config.getInputDeviceName());
		mVirtualDevice.createVirtualRotaryEncoder(config, token);
		return new VirtualRotaryEncoder(config, mVirtualDevice, token);
		} catch (RemoteException e) {
		throw e.rethrowFromSystemServer();
		}
		}

		@NonNull
		VirtualNavigationTouchpad createVirtualNavigationTouchpad(
		@NonNull VirtualNavigationTouchpadConfig config) {

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

+19 −0

Original line number	Diff line number	Diff line
		@@ -56,6 +56,8 @@ import android.hardware.input.VirtualMouse;
		import android.hardware.input.VirtualMouseConfig;
		import android.hardware.input.VirtualNavigationTouchpad;
		import android.hardware.input.VirtualNavigationTouchpadConfig;
		import android.hardware.input.VirtualRotaryEncoder;
		import android.hardware.input.VirtualRotaryEncoderConfig;
		import android.hardware.input.VirtualStylus;
		import android.hardware.input.VirtualStylusConfig;
		import android.hardware.input.VirtualTouchscreen;
		@@ -946,6 +948,23 @@ public final class VirtualDeviceManager {
		return mVirtualDeviceInternal.createVirtualStylus(config);
		}

		/**
		* Creates a virtual rotary encoder.
		*
		* @param config the configuration for the virtual rotary encoder.
		* @see android.view.InputDevice#SOURCE_ROTARY_ENCODER
		*/
		@RequiresPermission(android.Manifest.permission.CREATE_VIRTUAL_DEVICE)
		@NonNull
		@FlaggedApi(android.companion.virtualdevice.flags.Flags.FLAG_VIRTUAL_ROTARY)
		public VirtualRotaryEncoder createVirtualRotaryEncoder(
		@NonNull VirtualRotaryEncoderConfig config) {
		if (!android.companion.virtualdevice.flags.Flags.virtualRotary()) {
		throw new UnsupportedOperationException("Virtual rotary support not enabled");
		}
		return mVirtualDeviceInternal.createVirtualRotaryEncoder(config);
		}

		/**
		* Creates a VirtualAudioDevice, capable of recording audio emanating from this device,
		* or injecting audio from another device.