commit 84a46182cf80e643a9385e55d702e964a044e8ca
author Nataniel Borges <natanieljr@google.com> Tue Feb 26 15:36:32 2019 -0800
committer Nataniel Borges <natanieljr@google.com> Wed Mar 06 01:22:12 2019 +0000
tree b6dc8fe420a84731586196e38901430d03156037
parent 543f6bebcaa423e65c7c1fe6629fb90f82adfa0c

Add the transform type to the Winscope protobuf

Test: Record a SF trace. Open it in Winscope. Transforms should have a
value information in the properties list

Change-Id: I64c90c82f0004926d704f26cc1e1f8d9097f61b1

services/surfaceflinger/LayerProtoHelper.cpp

diff --git a/services/surfaceflinger/LayerProtoHelper.cpp b/services/surfaceflinger/LayerProtoHelper.cpp
index 2d6d33c..04e8796 100644
--- a/services/surfaceflinger/LayerProtoHelper.cpp
+++ b/services/surfaceflinger/LayerProtoHelper.cpp
@@ -92,12 +92,10 @@
 
 void LayerProtoHelper::writeToProto(const ui::Transform& transform,
                                     TransformProto* transformProto) {
-    const uint32_t type = transform.getType();
+    const uint32_t type = transform.getType() | (transform.getOrientation() << 8);
     transformProto->set_type(type);
 
-    if (type &
-        (ui::Transform::SCALE | ui::Transform::ROTATE | ui::Transform::TRANSLATE |
-         ui::Transform::UNKNOWN)) {
+    if (type & (ui::Transform::SCALE | ui::Transform::UNKNOWN)) {
         transformProto->set_dsdx(transform[0][0]);
         transformProto->set_dtdx(transform[0][1]);
         transformProto->set_dsdy(transform[1][0]);