Safe-guard Transaction::merge against programmer error.

We can warn on unmerged properties ensuring that this function
is updated when new properties are added.

Test: None.
Change-Id: I718b0e73e8fb5543360ec82a6f0645eb8be8a25c

parent 38f38f38

libs/gui/LayerState.cpp

+4 −0

Original line number	Diff line number	Diff line
		@@ -318,6 +318,10 @@ void layer_state_t::merge(const layer_state_t& other) {
		what \|= eSidebandStreamChanged;
		sidebandStream = other.sidebandStream;
		}

		if (other.what != what) {
		ALOGE("Unmerged SurfaceComposer Transaction properties. LayerState::merge needs updating?");
		}
		}

		}; // namespace android