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

Commit f4b61d9d authored by Geoffrey Pitsch's avatar Geoffrey Pitsch Committed by Dan Stoza
Browse files

Set property that terminates boot anim in WMS instead of SF 

This delays setting the color mode in the SurfaceFlinger until the
animation is fully finished.

Bug: 63823274
Test: Manual
Change-Id: I0bfcaeb05ad37efd50f4f9f7041d2a13f798cc85
parent 61ad5ae9

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

+18 −14
Original line number Diff line number Diff line
@@ -3471,8 +3471,19 @@ public class WindowManagerService extends IWindowManager.Stub 
            }



            if (!mBootAnimationStopped) {

                // Do this one time.

                Trace.asyncTraceBegin(TRACE_TAG_WINDOW_MANAGER, "Stop bootanim", 0);

                // stop boot animation

                // formerly we would just kill the process, but we now ask it to exit so it

                // can choose where to stop the animation.

                SystemProperties.set("service.bootanim.exit", "1");

                mBootAnimationStopped = true;

            }



            if (!mForceDisplayEnabled && !checkBootAnimationCompleteLocked()) {

                if (DEBUG_BOOT) Slog.i(TAG_WM, "performEnableScreen: Waiting for anim complete");

                return;

            }



            try {

                IBinder surfaceFlinger = ServiceManager.getService("SurfaceFlinger");

                if (surfaceFlinger != null) {
@@ -3486,13 +3497,6 @@ public class WindowManagerService extends IWindowManager.Stub 
            } catch (RemoteException ex) {

                Slog.e(TAG_WM, "Boot completed: SurfaceFlinger is dead!");

            }

                mBootAnimationStopped = true;

            }



            if (!mForceDisplayEnabled && !checkBootAnimationCompleteLocked()) {

                if (DEBUG_BOOT) Slog.i(TAG_WM, "performEnableScreen: Waiting for anim complete");

                return;

            }



            EventLog.writeEvent(EventLogTags.WM_BOOT_ANIMATION_DONE, SystemClock.uptimeMillis());

            Trace.asyncTraceEnd(TRACE_TAG_WINDOW_MANAGER, "Stop bootanim", 0);