Merge "Remove enabled flag compute_window_changes_on_a11y_v2" into main (010c1e66) · Commits · e / os / android_frameworks_base

services/accessibility/accessibility.aconfig

+0 −10

Original line number	Diff line number	Diff line
		@@ -54,16 +54,6 @@ flag {
		}
		}

		flag {
		name: "compute_window_changes_on_a11y_v2"
		namespace: "accessibility"
		description: "Computes accessibility window changes in accessibility instead of wm package."
		bug: "322444245"
		metadata {
		purpose: PURPOSE_BUGFIX
		}
		}

		flag {
		name: "deprecate_package_list_observer"
		namespace: "accessibility"

services/accessibility/java/com/android/server/accessibility/AccessibilityWindowManager.java

+3 −40

Original line number	Diff line number	Diff line
		@@ -433,22 +433,10 @@ public class AccessibilityWindowManager {
		return Collections.emptyList();
		}

		/**
		* Callbacks from window manager when there's an accessibility change in windows.
		*
		* @param forceSend Send the windows for accessibility even if they haven't changed.
		* @param topFocusedDisplayId The display Id which has the top focused window.
		* @param topFocusedWindowToken The window token of top focused window.
		* @param windows The windows for accessibility.
		*/
		@Override
		public void onWindowsForAccessibilityChanged(boolean forceSend, int topFocusedDisplayId,
		private void onWindowsForAccessibilityChanged(boolean forceSend, int topFocusedDisplayId,
		IBinder topFocusedWindowToken, @NonNull List<WindowInfo> windows) {
		// TODO(b/322444245): no longer need to get a lock.
		synchronized (mLock) {
		if (!Flags.computeWindowChangesOnA11yV2()) {
		// If the flag is enabled, it's already done in #createWindowInfoListLocked.
		updateWindowsByWindowAttributesLocked(windows);
		}
		if (DEBUG) {
		Slogf.i(LOG_TAG, "mDisplayId=%d, topFocusedDisplayId=%d, currentUserId=%d, "
		+ "visibleBgUsers=%s", mDisplayId, topFocusedDisplayId,
		@@ -490,9 +478,7 @@ public class AccessibilityWindowManager {
		}

		/**
		* Called when the windows for accessibility changed. This is called if
		* {@link com.android.server.accessibility.Flags.FLAG_COMPUTE_WINDOW_CHANGES_ON_A11Y_V2} is
		* true.
		* Called when the windows for accessibility changed.
		*
		* @param forceSend Send the windows for accessibility even if they haven't
		* changed.
		@@ -655,16 +641,6 @@ public class AccessibilityWindowManager {
		return true;
		}

		private void updateWindowsByWindowAttributesLocked(List<WindowInfo> windows) {
		for (int i = windows.size() - 1; i >= 0; i--) {
		final WindowInfo windowInfo = windows.get(i);
		final IBinder token = windowInfo.token;
		final int windowId = findWindowIdLocked(
		mAccessibilityUserManager.getCurrentUserIdLocked(), token);
		updateWindowWithWindowAttributes(windowInfo, mWindowAttributes.get(windowId));
		}
		}

		private void updateWindowWithWindowAttributes(@NonNull WindowInfo windowInfo,
		@Nullable AccessibilityWindowAttributes attributes) {
		if (attributes == null) {
		@@ -990,19 +966,6 @@ public class AccessibilityWindowManager {
		private AccessibilityWindowInfo populateReportedWindowLocked(int userId,
		WindowInfo window, SparseArray<AccessibilityWindowInfo> oldWindowsById) {
		final int windowId = findWindowIdLocked(userId, window.token);

		// With the flag enabled, createWindowInfoListLocked() already removes invalid windows.
		if (!Flags.computeWindowChangesOnA11yV2()) {
		if (windowId < 0) {
		return null;
		}

		// Don't need to add the embedded hierarchy windows into the a11y windows list.
		if (isEmbeddedHierarchyWindowsLocked(windowId)) {
		return null;
		}
		}

		final AccessibilityWindowInfo reportedWindow = AccessibilityWindowInfo.obtain();

		reportedWindow.setId(windowId);

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

+2 −172

Original line number	Diff line number	Diff line
		@@ -22,7 +22,6 @@ import static android.os.Build.IS_USER;
		import static android.view.WindowManager.LayoutParams.PRIVATE_FLAG_EXCLUDE_FROM_SCREEN_MAGNIFICATION;
		import static android.view.WindowManager.LayoutParams.PRIVATE_FLAG_IS_ROUNDED_CORNERS_OVERLAY;
		import static android.view.WindowManager.LayoutParams.TYPE_ACCESSIBILITY_MAGNIFICATION_OVERLAY;
		import static android.view.WindowManager.LayoutParams.TYPE_DOCK_DIVIDER;
		import static android.view.WindowManager.LayoutParams.TYPE_MAGNIFICATION_OVERLAY;
		import static android.view.WindowManager.TRANSIT_FLAG_IS_RECENTS;

		@@ -1784,22 +1783,13 @@ final class AccessibilityController {
		mA11yWindowsPopulator.populateVisibleWindowsOnScreenLocked(
		mDisplayId, visibleWindows);

		if (!com.android.server.accessibility.Flags.computeWindowChangesOnA11yV2()) {
		windows = buildWindowInfoListLocked(visibleWindows, screenSize);
		}

		// Gets the top focused display Id and window token for supporting multi-display.
		topFocusedDisplayId = mService.mRoot.getTopFocusedDisplayContent().getDisplayId();
		topFocusedWindowToken = topFocusedWindowState.mClient.asBinder();
		}

		if (com.android.server.accessibility.Flags.computeWindowChangesOnA11yV2()) {
		mCallback.onAccessibilityWindowsChanged(forceSend, topFocusedDisplayId,
		topFocusedWindowToken, screenSize, visibleWindows);
		} else {
		mCallback.onWindowsForAccessibilityChanged(forceSend, topFocusedDisplayId,
		topFocusedWindowToken, windows);
		}

		// Recycle the windows as we do not need them.
		for (final AccessibilityWindowsPopulator.AccessibilityWindow window : visibleWindows) {
		@@ -1808,166 +1798,6 @@ final class AccessibilityController {
		mInitialized = true;
		}

		// Here are old code paths, called when computeWindowChangesOnA11yV2 flag is disabled.
		// LINT.IfChange

		/**
		* From a list of windows, decides windows to be exposed to accessibility based on touchable
		* region in the screen.
		*/
		private List<WindowInfo> buildWindowInfoListLocked(List<AccessibilityWindow> visibleWindows,
		Point screenSize) {
		final List<WindowInfo> windows = new ArrayList<>();
		final Set<IBinder> addedWindows = mTempBinderSet;
		addedWindows.clear();

		boolean focusedWindowAdded = false;

		final int visibleWindowCount = visibleWindows.size();

		Region unaccountedSpace = mTempRegion;
		unaccountedSpace.set(0, 0, screenSize.x, screenSize.y);

		// Iterate until we figure out what is touchable for the entire screen.
		for (int i = 0; i < visibleWindowCount; i++) {
		final AccessibilityWindow a11yWindow = visibleWindows.get(i);
		final Region regionInWindow = new Region();
		a11yWindow.getTouchableRegionInWindow(regionInWindow);
		if (windowMattersToAccessibility(a11yWindow, regionInWindow, unaccountedSpace)) {
		addPopulatedWindowInfo(a11yWindow, regionInWindow, windows, addedWindows);
		if (windowMattersToUnaccountedSpaceComputation(a11yWindow)) {
		updateUnaccountedSpace(a11yWindow, unaccountedSpace);
		}
		focusedWindowAdded \|= a11yWindow.isFocused();
		} else if (a11yWindow.isUntouchableNavigationBar()) {
		// If this widow is navigation bar without touchable region, accounting the
		// region of navigation bar inset because all touch events from this region
		// would be received by launcher, i.e. this region is a un-touchable one
		// for the application.
		unaccountedSpace.op(
		getSystemBarInsetsFrame(
		mService.mWindowMap.get(a11yWindow.getWindowInfo().token)),
		unaccountedSpace,
		Region.Op.REVERSE_DIFFERENCE);
		}

		if (unaccountedSpace.isEmpty() && focusedWindowAdded) {
		break;
		}
		}

		// Remove child/parent references to windows that were not added.
		final int windowCount = windows.size();
		for (int i = 0; i < windowCount; i++) {
		WindowInfo window = windows.get(i);
		if (!addedWindows.contains(window.parentToken)) {
		window.parentToken = null;
		}
		if (window.childTokens != null) {
		final int childTokenCount = window.childTokens.size();
		for (int j = childTokenCount - 1; j >= 0; j--) {
		if (!addedWindows.contains(window.childTokens.get(j))) {
		window.childTokens.remove(j);
		}
		}
		// Leave the child token list if empty.
		}
		}

		addedWindows.clear();

		return windows;
		}

		// Some windows should be excluded from unaccounted space computation, though they still
		// should be reported
		private boolean windowMattersToUnaccountedSpaceComputation(AccessibilityWindow a11yWindow) {
		// Do not account space of trusted non-touchable windows, except the split-screen
		// divider.
		// If it's not trusted, touch events are not sent to the windows behind it.
		if (!a11yWindow.isTouchable()
		&& (a11yWindow.getType() != TYPE_DOCK_DIVIDER)
		&& a11yWindow.isTrustedOverlay()) {
		return false;
		}

		if (a11yWindow.getType() == WindowManager.LayoutParams.TYPE_ACCESSIBILITY_OVERLAY) {
		return false;
		}
		return true;
		}

		private boolean windowMattersToAccessibility(AccessibilityWindow a11yWindow,
		Region regionInScreen, Region unaccountedSpace) {
		if (a11yWindow.isFocused()) {
		return true;
		}

		// Ignore non-touchable windows, except the split-screen divider, which is
		// occasionally non-touchable but still useful for identifying split-screen
		// mode and the PIP menu.
		if (!a11yWindow.isTouchable()
		&& (a11yWindow.getType() != TYPE_DOCK_DIVIDER
		&& !a11yWindow.isPIPMenu())) {
		return false;
		}

		// If the window is completely covered by other windows - ignore.
		if (unaccountedSpace.quickReject(regionInScreen)) {
		return false;
		}

		// Add windows of certain types not covered by modal windows.
		if (isReportedWindowType(a11yWindow.getType())) {
		return true;
		}

		return false;
		}

		private void updateUnaccountedSpace(AccessibilityWindow a11yWindow,
		Region unaccountedSpace) {
		if (a11yWindow.getType()
		!= WindowManager.LayoutParams.TYPE_ACCESSIBILITY_OVERLAY) {
		// Account for the space this window takes if the window
		// is not an accessibility overlay which does not change
		// the reported windows.
		final Region touchableRegion = mTempRegion2;
		a11yWindow.getTouchableRegionInScreen(touchableRegion);
		unaccountedSpace.op(touchableRegion, unaccountedSpace,
		Region.Op.REVERSE_DIFFERENCE);
		}
		}

		private static void addPopulatedWindowInfo(AccessibilityWindow a11yWindow,
		Region regionInScreen, List<WindowInfo> out, Set<IBinder> tokenOut) {
		final WindowInfo window = a11yWindow.getWindowInfo();
		if (window.token == null) {
		// The window was used in calculating visible windows but does not have an
		// associated IWindow token, so exclude it from the list returned to accessibility.
		return;
		}
		window.regionInScreen.set(regionInScreen);
		window.layer = tokenOut.size();
		out.add(window);
		tokenOut.add(window.token);
		}

		private static boolean isReportedWindowType(int windowType) {
		return (windowType != WindowManager.LayoutParams.TYPE_WALLPAPER
		&& windowType != WindowManager.LayoutParams.TYPE_BOOT_PROGRESS
		&& windowType != WindowManager.LayoutParams.TYPE_DISPLAY_OVERLAY
		&& windowType != WindowManager.LayoutParams.TYPE_DRAG
		&& windowType != WindowManager.LayoutParams.TYPE_INPUT_CONSUMER
		&& windowType != WindowManager.LayoutParams.TYPE_POINTER
		&& windowType != TYPE_MAGNIFICATION_OVERLAY
		&& windowType != WindowManager.LayoutParams.TYPE_APPLICATION_MEDIA_OVERLAY
		&& windowType != WindowManager.LayoutParams.TYPE_SECURE_SYSTEM_OVERLAY
		&& windowType != WindowManager.LayoutParams.TYPE_PRIVATE_PRESENTATION);
		}

		// LINT.ThenChange(/services/accessibility/java/com/android/server/accessibility/AccessibilityWindowManager.java)

		private WindowState getTopFocusWindow() {
		return mService.mRoot.getTopFocusedDisplayContent().mCurrentFocus;
		}

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

+1 −2

Original line number	Diff line number	Diff line
		@@ -724,8 +724,7 @@ public final class AccessibilityWindowsPopulator extends WindowInfosListener {
		}

		// Compute system bar insets frame if needed.
		if (com.android.server.accessibility.Flags.computeWindowChangesOnA11yV2()
		&& windowState != null && instance.isUntouchableNavigationBar()) {
		if (windowState != null && instance.isUntouchableNavigationBar()) {
		final InsetsSourceProvider provider =
		windowState.getControllableInsetProvider();
		if (provider != null) {

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

+1 −20

Original line number	Diff line number	Diff line
		@@ -46,7 +46,6 @@ import android.view.RemoteAnimationTarget;
		import android.view.Surface;
		import android.view.SurfaceControl;
		import android.view.SurfaceControlViewHost;
		import android.view.WindowInfo;
		import android.view.WindowManager.DisplayImePolicy;
		import android.view.inputmethod.ImeTracker;
		import android.window.ScreenCapture;
		@@ -158,26 +157,8 @@ public abstract class WindowManagerInternal {
		* accessibility changed.
		*/
		public interface WindowsForAccessibilityCallback {

		/**
		* Called when the windows for accessibility changed. This is called if
		* {@link com.android.server.accessibility.Flags.FLAG_COMPUTE_WINDOW_CHANGES_ON_A11Y_V2} is
		* false.
		*
		* @param forceSend Send the windows for accessibility even if they haven't changed.
		* @param topFocusedDisplayId The display Id which has the top focused window.
		* @param topFocusedWindowToken The window token of top focused window.
		* @param windows The windows for accessibility.
		*/
		void onWindowsForAccessibilityChanged(boolean forceSend, int topFocusedDisplayId,
		IBinder topFocusedWindowToken, @NonNull List<WindowInfo> windows);

		/**
		* Called when the windows for accessibility changed. This is called if
		* {@link com.android.server.accessibility.Flags.FLAG_COMPUTE_WINDOW_CHANGES_ON_A11Y_V2} is
		* true.
		* TODO(b/322444245): Remove screenSize parameter by getting it from
		* DisplayManager#getDisplay(int).getRealSize() on the a11y side.
		* Called when the windows for accessibility changed.
		*
		* @param forceSend Send the windows for accessibility even if they haven't changed.
		* @param topFocusedDisplayId The display Id which has the top focused window.