Merge "Fix flaky test at AccessibilityEmbeddedDisplayTest" (48ddc981) · Commits · e / os / android_frameworks_base

services/core/java/com/android/server/wm/AccessibilityController.java

+9 −1

Original line number	Diff line number	Diff line
		@@ -116,6 +116,14 @@ final class AccessibilityController {
		return result;
		}

		/**
		* Sets a callback for observing which windows are touchable for the purposes
		* of accessibility on specified display.
		*
		* @param displayId The logical display id.
		* @param callback The callback.
		* @return {@code false} if display id is not valid or an embedded display.
		*/
		public boolean setWindowsForAccessibilityCallbackLocked(int displayId,
		WindowsForAccessibilityCallback callback) {
		if (callback != null) {
		@@ -129,7 +137,7 @@ final class AccessibilityController {
		if (display.getType() == Display.TYPE_VIRTUAL && dc.getParentWindow() != null) {
		// The window observer of this embedded display had been set from
		// window manager after setting its parent window.
		return true;
		return false;
		} else {
		throw new IllegalStateException(
		"Windows for accessibility callback of display "

+1 −1

Original line number	Diff line number	Diff line
		@@ -216,7 +216,7 @@ public abstract class WindowManagerInternal {
		*
		* @param displayId The logical display id.
		* @param callbacks The callbacks to invoke.
		* @return {@code false} if display id is not valid.
		* @return {@code false} if display id is not valid or an embedded display.
		*/
		public abstract boolean setMagnificationCallbacks(int displayId,
		@Nullable MagnificationCallbacks callbacks);