| commit | b4a05e31e2492cb53b2ef98a96c0646abbd1f66f | [log] [tgz] |
|---|---|---|
| author | Eran Messeri <eranm@google.com> | Fri Mar 11 00:49:52 2022 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri Mar 11 00:49:52 2022 +0000 |
| tree | d3422744c9ded33efa28f47405f8a79a31f2e748 | |
| parent | fdb740937a9d42c42b815c9993d1a9a1434434c0 [diff] | |
| parent | f2021d36c4649b435a2f9e13d4d206a8c77a509a [diff] |
Merge "Update the default KeyMint version" am: 7fc756ee1a am: e3e82c9d53 am: d6ef5852b5 am: 059a030d48 am: f2021d36c4 Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2020439 Change-Id: I2620382b15040c912815c75bb0d96d91aaaecfa3
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;