Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 05ead5fa authored Feb 13, 2023 by Riddle Hsu Committed by Automerger Merge Worker Feb 13, 2023

Merge "Avoid pausing bar appearance by starting window when relaunching" into...

Merge "Avoid pausing bar appearance by starting window when relaunching" into tm-qpr-dev am: 32266155 am: d794b7da

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/21368119

Change-Id: I69984c43e483c131b835dc3e95d1c5846b10d4f1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

parents 41f87cff d794b7da

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

+1 −1

Original line number	Diff line number	Diff line
		@@ -1989,7 +1989,7 @@ public class DisplayPolicy {
		* Called when an app has started replacing its main window.
		*/
		void addRelaunchingApp(ActivityRecord app) {
		if (mSystemBarColorApps.contains(app)) {
		if (mSystemBarColorApps.contains(app) && !app.hasStartingWindow()) {
		mRelaunchingSystemBarColorApps.add(app);
		}
		}

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

+1 −1

Original line number	Diff line number	Diff line
		@@ -6012,7 +6012,7 @@ class WindowState extends WindowContainer<WindowState> implements WindowManagerP
		Slog.i(TAG, "finishDrawing of orientation change: " + this + " " + duration + "ms");
		mOrientationChangeRedrawRequestTime = 0;
		} else if (mActivityRecord != null && mActivityRecord.mRelaunchStartTime != 0
		&& mActivityRecord.findMainWindow() == this) {
		&& mActivityRecord.findMainWindow(false /* includeStartingApp */) == this) {
		final long duration =
		SystemClock.elapsedRealtime() - mActivityRecord.mRelaunchStartTime;
		Slog.i(TAG, "finishDrawing of relaunch: " + this + " " + duration + "ms");