Merge "Update currentConfig variable when active display is changed." into lmp-dev (eb21986d) · Commits · e / os / android_frameworks_native

services/surfaceflinger/DisplayHardware/HWComposer.cpp

+2 −0

Original line number	Diff line number	Diff line
		@@ -780,6 +780,8 @@ status_t HWComposer::setPowerMode(int disp, int mode) {

		status_t HWComposer::setActiveConfig(int disp, int mode) {
		LOG_FATAL_IF(disp >= VIRTUAL_DISPLAY_ID_BASE);
		DisplayData& dd(mDisplayData[disp]);
		dd.currentConfig = mode;
		if (mHwc && hwcHasApiVersion(mHwc, HWC_DEVICE_API_VERSION_1_4)) {
		return (status_t)mHwc->setActiveConfig(mHwc, disp, mode);
		} else {