From d314f169d79d8a3b1de4289190c3f420188426f6 Mon Sep 17 00:00:00 2001
From: Robert Carr <racarr@google.com>
Date: Wed, 15 Aug 2018 13:12:42 -0700
Subject: 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
---
 libs/gui/LayerState.cpp | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'libs/gui/LayerState.cpp')

diff --git a/libs/gui/LayerState.cpp b/libs/gui/LayerState.cpp
index 931c446275..05c24c5e1a 100644
--- a/libs/gui/LayerState.cpp
+++ b/libs/gui/LayerState.cpp
@@ -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
-- 
cgit v1.2.3-59-g8ed1b