Merge "Fix incomplete magnification mode transition" (2d3e3569) · Commits · e / os / android_frameworks_base

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

+4 −0

Original line number	Diff line number	Diff line
		@@ -1704,6 +1704,10 @@ abstract class AbstractAccessibilityServiceConnection extends IAccessibilityServ
		* @param displayId The logical display id.
		*/
		private void ensureWindowsAvailableTimedLocked(int displayId) {
		if (displayId == Display.INVALID_DISPLAY) {
		return;
		}

		if (mA11yWindowManager.getWindowListLocked(displayId) != null) {
		return;
		}

+5 −3

Original line number	Diff line number	Diff line
		@@ -189,10 +189,10 @@ public class MagnificationController implements WindowMagnificationManager.Callb
		if (animationCallback.mCurrentMode == targetMode) {
		animationCallback.restoreToCurrentMagnificationMode();
		return;
		} else {
		Slog.w(TAG, "discard duplicate request");
		return;
		}
		Slog.w(TAG, "request during transition, abandon current:"
		+ animationCallback.mTargetMode);
		animationCallback.setExpiredAndRemoveFromListLocked();
		}

		if (magnificationCenter == null) {
		@@ -464,7 +464,9 @@ public class MagnificationController implements WindowMagnificationManager.Callb
		private final TransitionCallBack mTransitionCallBack;
		private boolean mExpired = false;
		private final int mDisplayId;
		// The mode the in-progress animation is going to.
		private final int mTargetMode;
		// The mode the in-progress animation is going from.
		private final int mCurrentMode;
		private final float mCurrentScale;
		private final PointF mCurrentCenter = new PointF();