Merge "SurfaceFlinger: Avoid overlapping calls to BOOT_FINISHED" into rvc-dev... (5e2da24d) · Commits · e / devices / smdk4412 / android_frameworks_native

services/surfaceflinger/SurfaceFlinger.cpp

+6 −0

Original line number	Diff line number	Diff line
		@@ -413,6 +413,7 @@ SurfaceFlinger::~SurfaceFlinger() = default;
		void SurfaceFlinger::binderDied(const wp<IBinder>& /* who */)
		{
		// the window manager died on us. prepare its eulogy.
		mBootFinished = false;

		// restore initial conditions (default device unblank, etc)
		initializeDisplays();
		@@ -529,6 +530,11 @@ compositionengine::CompositionEngine& SurfaceFlinger::getCompositionEngine() con

		void SurfaceFlinger::bootFinished()
		{
		if (mBootFinished == true) {
		ALOGE("Extra call to bootFinished");
		return;
		}
		mBootFinished = true;
		if (mStartPropertySetThread->join() != NO_ERROR) {
		ALOGE("Join StartPropertySetThread failed!");
		}

+4 −0

Original line number	Diff line number	Diff line
		@@ -1133,6 +1133,10 @@ private:

		// to linkToDeath
		sp<IBinder> mWindowManager;
		// We want to avoid multiple calls to BOOT_FINISHED as they come in on
		// different threads without a lock and could trigger unsynchronized writes to
		// to mWindowManager or mInputFlinger
		std::atomic<bool> mBootFinished = false;

		std::unique_ptr<dvr::VrFlinger> mVrFlinger;
		std::atomic<bool> mVrFlingerRequestsDisplay = false;