Commit ccfd682b authored Feb 21, 2018 by Jiwen 'Steve' Cai

Fix VrFlinger handoff

In ag/3368932, hotplug processing was moved to main thread and deferred
the actual display devices creation to the next cycle of
SurfaceFlinger's main thread. This breaks UpdateVrFlinger logic, which
runs on the main thread and assumes all new display devices get created
synchronously during the handoff.

This CL fixes the issue by allowing synchronous calling
processDisplayHotplugEventsLocked() from onHotplugReceived() if and only
if the callback is called on main thread.

Bug: 72103899
Test: VrApp now renders fine
Change-Id: I2abd5d5861e0bb74419f12142f7f7c33190a022c

parent c1d316f4

services/surfaceflinger/SurfaceFlinger.cpp

+5 −0

Original line number	Diff line number	Diff line
		@@ -1289,6 +1289,11 @@ void SurfaceFlinger::onHotplugReceived(int32_t sequenceId, hwc2_display_t displa

		mPendingHotplugEvents.emplace_back(HotplugEvent{display, connection});

		if (std::this_thread::get_id() == mMainThreadId) {
		// Process all pending hot plug events immediately if we are on the main thread.
		processDisplayHotplugEventsLocked();
		}

		setTransactionFlags(eDisplayTransactionNeeded);
		}