Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

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

Change-Id: I624e2596053e92b094fceea4bcb8d33ba3ef7a0e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Riddle Hsu
2023-02-13 08:55:26 +00:00
committed by Automerger Merge Worker
parent dd87306712 3226615582
commit d794b7dad1
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
services/core/java/com/android/server/wm/DisplayPolicy.java
View File

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

2
services/core/java/com/android/server/wm/WindowState.java
View File

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