Merge "Set property that terminates boot anim in WMS instead of SF" into oc-dr1-dev (a68ecbfd) · Commits · e / os / android_frameworks_base

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);