Merge "Do not magnify if surface control is not set" into pi-dev am: 1072d0d18a (957593af) · Commits · e / os / android_frameworks_base

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

+4 −0

Original line number	Diff line number	Diff line
		@@ -922,6 +922,10 @@ class WindowContainer<E extends WindowContainer> extends ConfigurationContainer<
		* @return Whether this WindowContainer should be magnified by the accessibility magnifier.
		*/
		boolean shouldMagnify() {
		if (mSurfaceControl == null) {
		return false;
		}

		for (int i = 0; i < mChildren.size(); i++) {
		if (!mChildren.get(i).shouldMagnify()) {
		return false;