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
diff --git a/libs/gui/LayerState.cpp b/libs/gui/LayerState.cpp
index 931c446..05c24c5 100644
--- a/libs/gui/LayerState.cpp
+++ b/libs/gui/LayerState.cpp
@@ -318,6 +318,10 @@
what |= eSidebandStreamChanged;
sidebandStream = other.sidebandStream;
}
+
+ if (other.what != what) {
+ ALOGE("Unmerged SurfaceComposer Transaction properties. LayerState::merge needs updating?");
+ }
}
}; // namespace android