commit a171c7c5905e165567a627d93e5e8fb6e7f44569
author Brian Duddie <bduddie@google.com> Wed Mar 17 16:50:51 2021 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Wed Mar 17 16:50:51 2021 +0000
tree 21d81ed2aef744e276d673efb4655424c4ee0a07
parent cac86374e6a98de0d86fc43406e0e6b3704de723
parent f0ca8651c21abc18f3fba893e78afab93f61a58c

Merge "Add missing union members to ASensorEvent" into sc-dev am: f0ca8651c2

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/native/+/13887473

Change-Id: Iddc3f619c723561fc48d4bd69fe2ac3ad241e1f4

include/android/sensor.h

diff --git a/include/android/sensor.h b/include/android/sensor.h
index 6447844..92b79c7 100644
--- a/include/android/sensor.h
+++ b/include/android/sensor.h
@@ -448,12 +448,14 @@
             float           data[16];
             ASensorVector   vector;
             ASensorVector   acceleration;
+            ASensorVector   gyro;
             ASensorVector   magnetic;
             float           temperature;
             float           distance;
             float           light;
             float           pressure;
             float           relative_humidity;
+            AUncalibratedEvent uncalibrated_acceleration;
             AUncalibratedEvent uncalibrated_gyro;
             AUncalibratedEvent uncalibrated_magnetic;
             AMetaDataEvent meta_data;