Snap for 8291837 from 98524bb5ff985ee4c94c1059afbf4495b377824c to sc-qpr3-release (eb37359a) · Commits · e / os / android_frameworks_base

core/java/android/view/ViewRootImpl.java

+6 −0

Original line number	Diff line number	Diff line
		@@ -3390,6 +3390,12 @@ public final class ViewRootImpl implements ViewParent,
		mReportNextDraw = false;
		pendingDrawFinished();
		}

		// Make sure the consumer is not waiting if the view root was just made invisible.
		if (mBLASTDrawConsumer != null) {
		mBLASTDrawConsumer.accept(null);
		mBLASTDrawConsumer = null;
		}
		}
		}

+1 −0

Original line number	Diff line number	Diff line
		@@ -24,5 +24,6 @@
		<permission name="android.car.permission.CONTROL_CAR_CLIMATE"/>
		<permission name="android.car.permission.CONTROL_CAR_EVS_ACTIVITY"/>
		<permission name="android.car.permission.MONITOR_CAR_EVS_STATUS"/>
		<permission name="android.car.permission.CONTROL_CAR_APP_LAUNCH"/>
		</privapp-permissions>
		</permissions>

+4 −0

Original line number	Diff line number	Diff line
		@@ -351,6 +351,10 @@ public class StatusBarTest extends SysuiTestCase {
		when(mStatusBarComponentFactory.create()).thenReturn(mStatusBarComponent);
		when(mStatusBarComponent.getNotificationShadeWindowViewController()).thenReturn(
		mNotificationShadeWindowViewController);
		doAnswer(invocation -> {
		((Runnable) invocation.getArgument(0)).run();
		return null;
		}).when(mNotificationShadeWindowController).batchApplyWindowLayoutParams(any());

		mShadeController = new ShadeControllerImpl(mCommandQueue,
		mStatusBarStateController, mNotificationShadeWindowController,

+9 −3

Original line number	Diff line number	Diff line
		@@ -3624,11 +3624,17 @@ class RootWindowContainer extends WindowContainer<DisplayContent>
		return new ArrayList<>();
		}
		} else {
		final RecentTasks recentTasks = mWindowManager.mAtmService.getRecentTasks();
		final int recentsComponentUid = recentTasks != null
		? recentTasks.getRecentsComponentUid()
		: -1;
		final ArrayList<ActivityRecord> activities = new ArrayList<>();
		forAllRootTasks(rootTask -> {
		if (!dumpVisibleRootTasksOnly \|\| rootTask.shouldBeVisible(null)) {
		activities.addAll(rootTask.getDumpActivitiesLocked(name));
		forAllLeafTasks(task -> {
		final boolean isRecents = (task.effectiveUid == recentsComponentUid);
		if (!dumpVisibleRootTasksOnly \|\| task.shouldBeVisible(null) \|\| isRecents) {
		activities.addAll(task.getDumpActivitiesLocked(name));
		}
		return false;
		});
		return activities;
		}

+6 −1

Original line number	Diff line number	Diff line
		@@ -513,9 +513,14 @@ public class WindowManagerShellCommand extends ShellCommand {
		try (ZipOutputStream out = new ZipOutputStream(getRawOutputStream())) {
		ArrayList<Pair<String, ByteTransferPipe>> requestList = new ArrayList<>();
		synchronized (mInternal.mGlobalLock) {
		final RecentTasks recentTasks = mInternal.mAtmService.getRecentTasks();
		final int recentsComponentUid = recentTasks != null
		? recentTasks.getRecentsComponentUid()
		: -1;
		// Request dump from all windows parallelly before writing to disk.
		mInternal.mRoot.forAllWindows(w -> {
		if (w.isVisible()) {
		final boolean isRecents = (w.mSession.mUid == recentsComponentUid);
		if (w.isVisible() \|\| isRecents) {
		ByteTransferPipe pipe = null;
		try {
		pipe = new ByteTransferPipe();