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

Commit 32266155 authored by Riddle Hsu's avatar Riddle Hsu Committed by Android (Google) Code Review
Browse files

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

parents 5c978d3f 51c23d3c

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

+1 −1
Original line number Diff line number Diff line
@@ -2200,7 +2200,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
@@ -6029,7 +6029,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");