am f0c89b28: Merge "Fix HDMI unblank behavior" into jb-mr1-dev (9349b510) · Commits · e / os / android_frameworks_native

services/surfaceflinger/DisplayHardware/HWComposer.cpp

+1 −0

Original line number	Diff line number	Diff line
		@@ -696,6 +696,7 @@ void HWComposer::disconnectDisplay(int disp) {
		free(dd.list);
		dd.list = NULL;
		dd.framebufferTarget = NULL; // points into dd.list
		dd.fbTargetHandle = NULL;
		}
		}

+3 −2

Original line number	Diff line number	Diff line
		@@ -772,8 +772,7 @@ void SurfaceFlinger::onHotplugReceived(int type, bool connected) {
		}
		setTransactionFlags(eDisplayTransactionNeeded);

		// we should only receive DisplayDevice::DisplayType from the vsync callback
		mEventThread->onHotplugReceived(type, connected);
		// Defer EventThread notification until SF has updated mDisplays.
		}
		}

		@@ -1130,6 +1129,7 @@ void SurfaceFlinger::handleTransactionLocked(uint32_t transactionFlags)
		DisplayDevice::makeCurrent(mEGLDisplay, hw, mEGLContext);
		mDisplays.removeItem(draw.keyAt(i));
		getHwComposer().disconnectDisplay(draw[i].type);
		mEventThread->onHotplugReceived(draw[i].type, false);
		} else {
		ALOGW("trying to remove the main display");
		}
		@@ -1212,6 +1212,7 @@ void SurfaceFlinger::handleTransactionLocked(uint32_t transactionFlags)
		state.viewport, state.frame);
		hw->setDisplayName(state.displayName);
		mDisplays.add(display, hw);
		mEventThread->onHotplugReceived(state.type, true);
		}
		}
		}