Merge "[SurfaceFlinger] Fix HWComposer error message." into pi-dev (02a7a668) · Commits · e / os / platform_frameworks_native

services/surfaceflinger/DisplayHardware/HWComposer.cpp

+11 −3

Original line number	Diff line number	Diff line
		@@ -596,7 +596,10 @@ status_t HWComposer::setPowerMode(int32_t displayId, int32_t intMode) {
		ALOGV("setPowerMode: Calling HWC %s", to_string(mode).c_str());
		{
		auto error = hwcDisplay->setPowerMode(mode);
		LOG_HWC_ERROR(("setPowerMode(" + to_string(mode) + ")").c_str(), error, displayId);
		if (error != HWC2::Error::None) {
		LOG_HWC_ERROR(("setPowerMode(" + to_string(mode) + ")").c_str(),
		error, displayId);
		}
		}
		break;
		case HWC2::PowerMode::Doze:
		@@ -605,14 +608,19 @@ status_t HWComposer::setPowerMode(int32_t displayId, int32_t intMode) {
		{
		bool supportsDoze = false;
		auto error = hwcDisplay->supportsDoze(&supportsDoze);
		if (error != HWC2::Error::None) {
		LOG_HWC_ERROR("supportsDoze", error, displayId);
		}

		if (!supportsDoze) {
		mode = HWC2::PowerMode::On;
		}

		error = hwcDisplay->setPowerMode(mode);
		LOG_HWC_ERROR(("setPowerMode(" + to_string(mode) + ")").c_str(), error, displayId);
		if (error != HWC2::Error::None) {
		LOG_HWC_ERROR(("setPowerMode(" + to_string(mode) + ")").c_str(),
		error, displayId);
		}
		}
		break;
		default: