commit | 6bb92e00b8ae85e095e73ffd48d5fa210177416a | [log] [tgz] |
---|---|---|
author | Jooyung Han <jooyung@google.com> | Mon Feb 28 20:00:08 2022 +0900 |
committer | Jooyung Han <jooyung@google.com> | Thu Mar 17 09:56:28 2022 +0000 |
tree | f42b140242aad08328daf8651151deb7f0ace1d0 | |
parent | 500f3e04361f6ba255b9f39a1207e6b9e01802be [diff] |
Cast to int for union tag Union tag will be changed from `enum` to `enum class`. We need explicit casting with enum class. Bug: 225119187 Bug: 218912230 Test: m Merged-In: I2401e66dc9d8bc511a601fcdce365e5f823576d4 Change-Id: I2401e66dc9d8bc511a601fcdce365e5f823576d4 (cherry picked from commit 1c4e9829ec684f1c33447f522db516b14e011255)
diff --git a/sensors/aidl/default/multihal/ConvertUtils.cpp b/sensors/aidl/default/multihal/ConvertUtils.cpp index 7751fd2..9b2d8fe 100644 --- a/sensors/aidl/default/multihal/ConvertUtils.cpp +++ b/sensors/aidl/default/multihal/ConvertUtils.cpp
@@ -173,7 +173,7 @@ } default: ALOGE("Invalid sensor additioanl info tag: %d", - additionalInfo.payload.getTag()); + static_cast<int32_t>(additionalInfo.payload.getTag())); break; } break;