Merge "Revert^2 "Deprecate UiAutomation#injectInputEvent for CTS tests"" into main (8b42c25e) · Commits · e / os / android_frameworks_base

core/api/test-current.txt

+2 −2

Original line number	Diff line number	Diff line
		@@ -478,8 +478,8 @@ package android.app {
		method public void destroy();
		method @NonNull public java.util.Set<java.lang.String> getAdoptedShellPermissions();
		method @Deprecated public boolean grantRuntimePermission(String, String, android.os.UserHandle);
		method public boolean injectInputEvent(@NonNull android.view.InputEvent, boolean, boolean);
		method public void injectInputEventToInputFilter(@NonNull android.view.InputEvent);
		method @Deprecated public boolean injectInputEvent(@NonNull android.view.InputEvent, boolean, boolean);
		method @Deprecated public void injectInputEventToInputFilter(@NonNull android.view.InputEvent);
		method public boolean isNodeInCache(@NonNull android.view.accessibility.AccessibilityNodeInfo);
		method public void removeOverridePermissionState(int, @NonNull String);
		method @Deprecated public boolean revokeRuntimePermission(String, String, android.os.UserHandle);

core/java/android/app/UiAutomation.java

+20 −9

Original line number	Diff line number	Diff line
		@@ -956,10 +956,9 @@ public final class UiAutomation {
		* <p>
		* <strong>Note:</strong> It is caller's responsibility to recycle the event.
		* </p>
		*
		* @param event The event to inject.
		* @param sync Whether to inject the event synchronously.
		* @return Whether event injection succeeded.
		* @param event the event to inject
		* @param sync whether to inject the event synchronously
		* @return {@code true} if event injection succeeded
		*/
		public boolean injectInputEvent(InputEvent event, boolean sync) {
		return injectInputEvent(event, sync, true /* waitForAnimations */);
		@@ -972,15 +971,21 @@ public final class UiAutomation {
		* <strong>Note:</strong> It is caller's responsibility to recycle the event.
		* </p>
		*
		* @param event The event to inject.
		* @param sync Whether to inject the event synchronously.
		* @param waitForAnimations Whether to wait for all window container animations and surface
		* operations to complete.
		* @return Whether event injection succeeded.
		* @param event the event to inject
		* @param sync whether to inject the event synchronously.
		* @param waitForAnimations whether to wait for all window container animations and surface
		* operations to complete
		* @return {@code true} if event injection succeeded
		*
		* @deprecated for CTS tests prefer inject input events using uinput
		* (com.android.cts.input.UinputDevice) or hid devices (com.android.cts.input.HidDevice).
		* Alternatively, InjectInputInProcess (com.android.cts.input.InjectInputProcess) can be used
		* for in-process injection.
		* @hide
		*/
		@TestApi
		@Deprecated // Deprecated for CTS tests
		@SuppressLint("UnflaggedApi") // @FlaggedApi breaks previously released @TestApi, b/395889250
		public boolean injectInputEvent(@NonNull InputEvent event, boolean sync,
		boolean waitForAnimations) {
		try {
		@@ -1003,9 +1008,15 @@ public final class UiAutomation {
		* Events injected to the input subsystem using the standard {@link #injectInputEvent} method
		* skip the accessibility input filter to avoid feedback loops.
		*
		* @deprecated for CTS tests prefer inject input events using uinput
		* (com.android.cts.input.UinputDevice) or hid devices (com.android.cts.input.HidDevice).
		* Alternatively, InjectInputInProcess (com.android.cts.input.InjectInputProcess) can be used
		* for in-process injection.
		* @hide
		*/
		@TestApi
		@Deprecated
		@SuppressLint("UnflaggedApi") // @FlaggedApi breaks previously released @TestApi, b/395889250
		public void injectInputEventToInputFilter(@NonNull InputEvent event) {
		try {
		mUiAutomationConnection.injectInputEventToInputFilter(event);