From b88b5349d6c97b386cd9f45f19bf3d4be4887735 Mon Sep 17 00:00:00 2001 From: Pablo Gamito Date: Wed, 1 Sep 2021 15:25:42 +0000 Subject: [PATCH] [DO NOT MERGE] Dump SurfaceControl's layerId to proto Test: Data appears in Winscope Bug: 197712697 Change-Id: Ida47f5506a56b19902fcaafc644d1df34ce6c4a3 (cherry picked from commit 120ee45bd05755f5325ba33b706f2c1e431122dc) --- core/java/android/view/SurfaceControl.java | 2 ++ core/proto/android/view/surfacecontrol.proto | 1 + 2 files changed, 3 insertions(+) diff --git a/core/java/android/view/SurfaceControl.java b/core/java/android/view/SurfaceControl.java index 1121133892051..c786f0f3cc680 100644 --- a/core/java/android/view/SurfaceControl.java +++ b/core/java/android/view/SurfaceControl.java @@ -23,6 +23,7 @@ import static android.graphics.Matrix.MSKEW_Y; import static android.graphics.Matrix.MTRANS_X; import static android.graphics.Matrix.MTRANS_Y; import static android.view.SurfaceControlProto.HASH_CODE; +import static android.view.SurfaceControlProto.LAYER_ID; import static android.view.SurfaceControlProto.NAME; import android.annotation.FloatRange; @@ -1540,6 +1541,7 @@ public final class SurfaceControl implements Parcelable { final long token = proto.start(fieldId); proto.write(HASH_CODE, System.identityHashCode(this)); proto.write(NAME, mName); + proto.write(LAYER_ID, getLayerId()); proto.end(token); } diff --git a/core/proto/android/view/surfacecontrol.proto b/core/proto/android/view/surfacecontrol.proto index cbb243ba7872f..5a5f035412b2c 100644 --- a/core/proto/android/view/surfacecontrol.proto +++ b/core/proto/android/view/surfacecontrol.proto @@ -29,4 +29,5 @@ message SurfaceControlProto { optional int32 hash_code = 1; optional string name = 2 [ (android.privacy).dest = DEST_EXPLICIT ]; + optional int32 layerId = 3; }