| commit | de12b9273e4dd4ba25003b6217eb0515c70adc7d | [log] [tgz] |
|---|---|---|
| author | Christopher Ferris <cferris@google.com> | Thu Nov 03 02:30:27 2022 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Thu Nov 03 02:30:27 2022 +0000 |
| tree | 6961bb47d1b65b80a5468101aa2701e073825c0d | |
| parent | 2e6815d22afda997dd456e2fc5df37508c980f97 [diff] | |
| parent | 9d6b418d6f4c81058c6ccfe41e941faabe445e91 [diff] |
Merge "Modify a data structure into a union." am: 8e965d90de am: 9d6b418d6f Original change: https://android-review.googlesource.com/c/platform/hardware/libhardware/+/2243423 Change-Id: Id3bbeac041d086619e7313286e144ea2b7c1a931 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
diff --git a/modules/sensors/dynamic_sensor/ConnectionDetector.cpp b/modules/sensors/dynamic_sensor/ConnectionDetector.cpp index 85b9901..99dab5b 100644 --- a/modules/sensors/dynamic_sensor/ConnectionDetector.cpp +++ b/modules/sensors/dynamic_sensor/ConnectionDetector.cpp
@@ -194,9 +194,9 @@ } bool FileConnectionDetector::readInotifyData() { - struct { + union { struct inotify_event ev; - char padding[NAME_MAX + 1]; + char raw[sizeof(inotify_event) + NAME_MAX + 1]; } buffer; bool ret = true;