| commit | fdb740937a9d42c42b815c9993d1a9a1434434c0 | [log] [tgz] |
|---|---|---|
| author | TreeHugger Robot <treehugger-gerrit@google.com> | Fri Mar 11 00:49:40 2022 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri Mar 11 00:49:40 2022 +0000 |
| tree | d3422744c9ded33efa28f47405f8a79a31f2e748 | |
| parent | b71e2fa5796a888d3065e8135ae91deeae5b069b [diff] | |
| parent | cf510f03a94ea898cd7d97f525974848b4992eb3 [diff] |
Merge "Hide all GNSS AIDL interfaces/parcelables/enums" into tm-dev am: 92035b8b9c am: cf510f03a9 Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/interfaces/+/17160829 Change-Id: I1ce56b1132529d27a8d5640494cf60b0e4dcb6d8
diff --git a/security/keymint/aidl/default/android.hardware.hardware_keystore.xml b/security/keymint/aidl/default/android.hardware.hardware_keystore.xml index e5a9345..2ebf1fe 100644 --- a/security/keymint/aidl/default/android.hardware.hardware_keystore.xml +++ b/security/keymint/aidl/default/android.hardware.hardware_keystore.xml
@@ -14,5 +14,5 @@ limitations under the License. --> <permissions> - <feature name="android.hardware.hardware_keystore" version="100" /> + <feature name="android.hardware.hardware_keystore" version="200" /> </permissions>
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;