Merge "surfaceflinger: call into hardware composer to blank screen" (f0048f96) · Commits · e / os / platform_frameworks_native

services/surfaceflinger/DisplayHardware.cpp

+3 −0

Original line number	Diff line number	Diff line
		@@ -434,6 +434,9 @@ void DisplayHardware::releaseScreen() const

		void DisplayHardware::acquireScreen() const
		{
		if (mHwc->initCheck() == NO_ERROR) {
		mHwc->acquire();
		}
		DisplayHardwareBase::acquireScreen();
		}

+22 −0

Original line number	Diff line number	Diff line
		@@ -286,8 +286,30 @@ status_t HWComposer::release() const {
		mHwc->methods->eventControl(mHwc, HWC_EVENT_VSYNC, 0);
		}
		int err = mHwc->set(mHwc, NULL, NULL, NULL);
		if (err < 0) {
		return (status_t)err;
		}

		if (hwcHasVersion(mHwc, HWC_DEVICE_API_VERSION_1_0)) {
		if (mHwc->methods && mHwc->methods->blank) {
		err = mHwc->methods->blank(mHwc, 1);
		}
		}
		return (status_t)err;
		}
		return NO_ERROR;
		}

		status_t HWComposer::acquire() const {
		if (mHwc) {
		if (hwcHasVersion(mHwc, HWC_DEVICE_API_VERSION_1_0)) {
		if (mHwc->methods && mHwc->methods->blank) {
		int err = mHwc->methods->blank(mHwc, 0);
		return (status_t)err;
		}
		}
		}

		return NO_ERROR;
		}

+4 −1

Original line number	Diff line number	Diff line
		@@ -71,9 +71,12 @@ public:
		// commits the list
		status_t commit() const;

		// release hardware resources
		// release hardware resources and blank screen
		status_t release() const;

		// acquire hardware resources and unblank screen
		status_t acquire() const;

		// create a work list for numLayers layer. sets HWC_GEOMETRY_CHANGED.
		status_t createWorkList(size_t numLayers);