Merge "Merge RQ1A.210205.004 to aosp-master - DO NOT MERGE" (24e69068) · Commits · e / os / android_frameworks_native

services/surfaceflinger/SurfaceFlinger.cpp

+9 −8

Original line number	Diff line number	Diff line
		@@ -596,13 +596,6 @@ void SurfaceFlinger::bootFinished()
		if (mWindowManager != 0) {
		mWindowManager->linkToDeath(static_cast<IBinder::DeathRecipient*>(this));
		}
		sp<IBinder> input(defaultServiceManager()->getService(
		String16("inputflinger")));
		if (input == nullptr) {
		ALOGE("Failed to link to input service");
		} else {
		mInputFlinger = interface_cast<IInputFlinger>(input);
		}

		// stop boot animation
		// formerly we would just kill the process, but we now ask it to exit so it
		@@ -613,7 +606,15 @@ void SurfaceFlinger::bootFinished()
		LOG_EVENT_LONG(LOGTAG_SF_STOP_BOOTANIM,
		ns2ms(systemTime(SYSTEM_TIME_MONOTONIC)));

		static_cast<void>(schedule([this] {
		sp<IBinder> input(defaultServiceManager()->getService(String16("inputflinger")));

		static_cast<void>(schedule([=] {
		if (input == nullptr) {
		ALOGE("Failed to link to input service");
		} else {
		mInputFlinger = interface_cast<IInputFlinger>(input);
		}

		readPersistentProperties();
		mPowerAdvisor.onBootFinished();
		mBootStage = BootStage::FINISHED;