Snap for 13350447 from f665799b18b6d1c70ace337bd5abb295292236f4 to 25Q3-release (cc925fb8) · Commits · e / os / android_frameworks_base

core/java/android/app/UiAutomation.java

+4 −0

Original line number	Diff line number	Diff line
		@@ -1386,21 +1386,25 @@ public final class UiAutomation {
		@Nullable
		public Bitmap takeScreenshot(@NonNull Window window) {
		if (window == null) {
		Log.e(LOG_TAG, "Window is null");
		return null;
		}

		View decorView = window.peekDecorView();
		if (decorView == null) {
		Log.e(LOG_TAG, "Decor view is null");
		return null;
		}

		ViewRootImpl viewRoot = decorView.getViewRootImpl();
		if (viewRoot == null) {
		Log.e(LOG_TAG, "View root is null");
		return null;
		}

		SurfaceControl sc = viewRoot.getSurfaceControl();
		if (!sc.isValid()) {
		Log.e(LOG_TAG, "ViewRootImpl SurfaceControl is not valid");
		return null;
		}

+10 −2

Original line number	Diff line number	Diff line
		@@ -2701,8 +2701,16 @@ public final class MessageQueue {
		return false;
		}
		mLooperThread = Thread.currentThread();
		boolean wasInterrupted = false;
		try {
		while ((mQuittingRefCountValue & ~QUITTING_MASK) != 0) {
		LockSupport.park();
		wasInterrupted \|= Thread.interrupted();
		}
		} finally {
		if (wasInterrupted) {
		mLooperThread.interrupt();
		}
		}
		return true;
		}

+10 −3

Original line number	Diff line number	Diff line
		@@ -280,9 +280,16 @@ public final class MessageQueue {
		if (!getQuitting()) {
		return false;
		}
		mLooperThread = Thread.currentThread();
		boolean wasInterrupted = false;
		try {
		while ((mQuittingRefCountValue & ~QUITTING_MASK) != 0) {
		LockSupport.park();
		wasInterrupted \|= Thread.interrupted();
		}
		} finally {
		if (wasInterrupted) {
		mLooperThread.interrupt();
		}
		}
		return true;
		}

+0 −7

Original line number	Diff line number	Diff line
		@@ -43,13 +43,6 @@ flag {
		bug: "304478691"
		}

		flag {
		name: "a11y_qs_shortcut"
		namespace: "accessibility"
		description: "Add Quick Setting as one of the a11y shortcut options"
		bug: "297554934"
		}

		flag {
		name: "a11y_selection_api"
		namespace: "accessibility"

+2 −0

Original line number	Diff line number	Diff line
		@@ -83,6 +83,8 @@ public enum DesktopExperienceFlags {
		ENABLE_DESKTOP_TASK_LIMIT_SEPARATE_TRANSITION(
		Flags::enableDesktopTaskLimitSeparateTransition, false,
		Flags.FLAG_ENABLE_DESKTOP_TASK_LIMIT_SEPARATE_TRANSITION),
		ENABLE_DESKTOP_WINDOWING_PIP(Flags::enableDesktopWindowingPip, false,
		Flags.FLAG_ENABLE_DESKTOP_WINDOWING_PIP),
		ENABLE_DISPLAY_CONTENT_MODE_MANAGEMENT(
		com.android.server.display.feature.flags.Flags::enableDisplayContentModeManagement,
		true, FLAG_ENABLE_DISPLAY_CONTENT_MODE_MANAGEMENT),