Merge "[SurfaceFlinger] Disable HDR dimming when screen rotates." (4d3e564f) · Commits · e / os / android_frameworks_native

libs/gui/LayerState.cpp

+6 −0

Original line number	Diff line number	Diff line
		@@ -134,6 +134,7 @@ status_t layer_state_t::write(Parcel& output) const
		SAFE_PARCEL(output.writeByte, changeFrameRateStrategy);
		SAFE_PARCEL(output.writeUint32, fixedTransformHint);
		SAFE_PARCEL(output.writeBool, autoRefresh);
		SAFE_PARCEL(output.writeBool, dimmingEnabled);

		SAFE_PARCEL(output.writeUint32, blurRegions.size());
		for (auto region : blurRegions) {
		@@ -243,6 +244,7 @@ status_t layer_state_t::read(const Parcel& input)
		SAFE_PARCEL(input.readUint32, &tmpUint32);
		fixedTransformHint = static_cast<ui::Transform::RotationFlags>(tmpUint32);
		SAFE_PARCEL(input.readBool, &autoRefresh);
		SAFE_PARCEL(input.readBool, &dimmingEnabled);

		uint32_t numRegions = 0;
		SAFE_PARCEL(input.readUint32, &numRegions);
		@@ -598,6 +600,10 @@ void layer_state_t::merge(const layer_state_t& other) {
		what \|= eColorSpaceAgnosticChanged;
		colorSpaceAgnostic = other.colorSpaceAgnostic;
		}
		if (other.what & eDimmingEnabledChanged) {
		what \|= eDimmingEnabledChanged;
		dimmingEnabled = other.dimmingEnabled;
		}
		if ((other.what & what) != other.what) {
		ALOGE("Unmerged SurfaceComposer Transaction properties. LayerState::merge needs updating? "
		"other.what=0x%" PRIX64 " what=0x%" PRIX64 " unmerged flags=0x%" PRIX64,

+14 −0

Original line number	Diff line number	Diff line
		@@ -1224,6 +1224,20 @@ SurfaceComposerClient::Transaction& SurfaceComposerClient::Transaction::setTrans
		return *this;
		}

		SurfaceComposerClient::Transaction& SurfaceComposerClient::Transaction::setDimmingEnabled(
		const sp<SurfaceControl>& sc, bool dimmingEnabled) {
		layer_state_t* s = getLayerState(sc);
		if (!s) {
		mStatus = BAD_INDEX;
		return *this;
		}
		s->what \|= layer_state_t::eDimmingEnabledChanged;
		s->dimmingEnabled = dimmingEnabled;

		registerSurfaceControlForCallback(sc);
		return *this;
		}

		SurfaceComposerClient::Transaction& SurfaceComposerClient::Transaction::setAlpha(
		const sp<SurfaceControl>& sc, float alpha) {
		layer_state_t* s = getLayerState(sc);

+4 −2

Original line number	Diff line number	Diff line
		@@ -150,7 +150,7 @@ struct layer_state_t {
		eTransparentRegionChanged = 0x00000020,
		eFlagsChanged = 0x00000040,
		eLayerStackChanged = 0x00000080,
		/* unused 0x00000400, */
		eDimmingEnabledChanged = 0x00000400,
		eShadowRadiusChanged = 0x00000800,
		/* unused 0x00001000, */
		eBufferCropChanged = 0x00002000,
		@@ -187,7 +187,7 @@ struct layer_state_t {
		eAutoRefreshChanged = 0x1000'00000000,
		eStretchChanged = 0x2000'00000000,
		eTrustedOverlayChanged = 0x4000'00000000,
		eDropInputModeChanged = 0x8000'00000000,
		eDropInputModeChanged = 0x8000'00000000
		};

		layer_state_t();
		@@ -298,6 +298,8 @@ struct layer_state_t {

		// Force inputflinger to drop all input events for the layer and its children.
		gui::DropInputMode dropInputMode;

		bool dimmingEnabled;
		};

		struct ComposerState {

+1 −0

Original line number	Diff line number	Diff line
		@@ -492,6 +492,7 @@ public:
		uint32_t flags, uint32_t mask);
		Transaction& setTransparentRegionHint(const sp<SurfaceControl>& sc,
		const Region& transparentRegion);
		Transaction& setDimmingEnabled(const sp<SurfaceControl>& sc, bool dimmingEnabled);
		Transaction& setAlpha(const sp<SurfaceControl>& sc,
		float alpha);
		Transaction& setMatrix(const sp<SurfaceControl>& sc,

+7 −0

Original line number	Diff line number	Diff line
		@@ -1098,6 +1098,13 @@ bool BufferStateLayer::simpleBufferUpdate(const layer_state_t& s) const {
		}
		}

		if (s.what & layer_state_t::eDimmingEnabledChanged) {
		if (mDrawingState.dimmingEnabled != s.dimmingEnabled) {
		ALOGV("%s: false [eDimmingEnabledChanged changed]", __func__);
		return false;
		}
		}

		ALOGV("%s: true", __func__);
		return true;
		}