Merge "Fix PerfUnitTest Regression" (c2d5e6b2) · Commits · e / os / android_frameworks_base

core/java/android/view/ViewRootImpl.java

+9 −2

Original line number	Diff line number	Diff line
		@@ -848,6 +848,8 @@ public final class ViewRootImpl implements ViewParent,

		private int mLastTransformHint = Integer.MIN_VALUE;

		private AccessibilityWindowAttributes mAccessibilityWindowAttributes;

		/**
		* A temporary object used so relayoutWindow can return the latest SyncSeqId
		* system. The SyncSeqId system was designed to work without synchronous relayout
		@@ -1412,9 +1414,13 @@ public final class ViewRootImpl implements ViewParent,
		if (registered) {
		final AccessibilityWindowAttributes attributes = new AccessibilityWindowAttributes(
		mWindowAttributes);
		if (!attributes.equals(mAccessibilityWindowAttributes)) {
		mAccessibilityWindowAttributes = attributes;
		mAccessibilityManager.setAccessibilityWindowAttributes(getDisplayId(),
		mAttachInfo.mAccessibilityWindowId, attributes);
		}

		}
		}

		/**
		@@ -10365,6 +10371,7 @@ public final class ViewRootImpl implements ViewParent,
		!= AccessibilityWindowInfo.UNDEFINED_WINDOW_ID;
		if (registered) {
		mAttachInfo.mAccessibilityWindowId = AccessibilityWindowInfo.UNDEFINED_WINDOW_ID;
		mAccessibilityWindowAttributes = null;
		mAccessibilityManager.removeAccessibilityInteractionConnection(mWindow);
		}
		}

+2 −5

Original line number	Diff line number	Diff line
		@@ -146,12 +146,9 @@ public class AccessibilityWindowManager {
		if (getWindowTokenForUserAndWindowIdLocked(resolvedUserId, windowId) == null) {
		return;
		}
		final AccessibilityWindowAttributes currentAttrs = mWindowAttributes.get(windowId);
		if (currentAttrs == null \|\| !currentAttrs.equals(attributes)) {
		mWindowAttributes.put(windowId, attributes);
		shouldComputeWindows = findWindowInfoByIdLocked(windowId) != null;
		}
		}
		if (shouldComputeWindows) {
		mWindowManagerInternal.computeWindowsForAccessibility(displayId);
		}