From f474d3dba899ec315113b79e6baa2d4fe24c3e53 Mon Sep 17 00:00:00 2001 From: Daichi Hirono Date: Tue, 5 Nov 2019 08:54:07 +0900 Subject: Add AIDL for LayerMetadtaKey to share the same definition between C++ and Java code Bug: 143912669 Test: make Change-Id: I7f2a189f134f1f924906a22dfc30ccf221cfd2d7 --- libs/gui/LayerMetadata.cpp | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) (limited to 'libs/gui/LayerMetadata.cpp') diff --git a/libs/gui/LayerMetadata.cpp b/libs/gui/LayerMetadata.cpp index 04d2871c77..b3eb9940b2 100644 --- a/libs/gui/LayerMetadata.cpp +++ b/libs/gui/LayerMetadata.cpp @@ -18,6 +18,8 @@ #include #include +#include "android/view/LayerMetadataKey.h" + using android::base::StringPrintf; namespace android { @@ -113,12 +115,12 @@ void LayerMetadata::setInt32(uint32_t key, int32_t value) { std::string LayerMetadata::itemToString(uint32_t key, const char* separator) const { if (!has(key)) return std::string(); - switch (key) { - case METADATA_OWNER_UID: + switch (static_cast(key)) { + case view::LayerMetadataKey::METADATA_OWNER_UID: return StringPrintf("ownerUID%s%d", separator, getInt32(key, 0)); - case METADATA_WINDOW_TYPE: + case view::LayerMetadataKey::METADATA_WINDOW_TYPE: return StringPrintf("windowType%s%d", separator, getInt32(key, 0)); - case METADATA_TASK_ID: + case view::LayerMetadataKey::METADATA_TASK_ID: return StringPrintf("taskId%s%d", separator, getInt32(key, 0)); default: return StringPrintf("%d%s%dbytes", key, separator, -- cgit v1.2.3-59-g8ed1b