| commit | 9606c9befce2c4fb47ce7816e18fe43fe33c2b5c | [log] [tgz] |
|---|---|---|
| author | Yichun Li <yichunli@google.com> | Fri May 19 04:41:17 2023 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri May 19 04:41:17 2023 +0000 |
| tree | bb67ffdf10a25166c692cd304f101bd90e2e1d6a | |
| parent | 61e8758c8b7089f8db26692cc634ec2e86c2bfeb [diff] | |
| parent | 706ee1a5c8194d24a8fd0c9c2e423db59e308faa [diff] |
Merge "Revert "Remove unused hardware/bluetooth.h include"" am: 3ac998fa8c am: 79119d91d0 am: f1c107e68d am: e908a03e1d am: 5d55546bfb am: 706ee1a5c8 Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2594896 Change-Id: I3b463c04f03b7228b8038be3af8173f46a4583ae Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
diff --git a/bluetooth/1.0/vts/functional/VtsHalBluetoothV1_0TargetTest.cpp b/bluetooth/1.0/vts/functional/VtsHalBluetoothV1_0TargetTest.cpp index af90651..9451087 100644 --- a/bluetooth/1.0/vts/functional/VtsHalBluetoothV1_0TargetTest.cpp +++ b/bluetooth/1.0/vts/functional/VtsHalBluetoothV1_0TargetTest.cpp
@@ -20,6 +20,7 @@ #include <android/hardware/bluetooth/1.0/IBluetoothHci.h> #include <android/hardware/bluetooth/1.0/IBluetoothHciCallbacks.h> #include <android/hardware/bluetooth/1.0/types.h> +#include <hardware/bluetooth.h> #include <utils/Log.h> #include <VtsHalHidlTargetCallbackBase.h>
diff --git a/bluetooth/1.1/vts/functional/VtsHalBluetoothV1_1TargetTest.cpp b/bluetooth/1.1/vts/functional/VtsHalBluetoothV1_1TargetTest.cpp index 2a5b826..28ac603 100644 --- a/bluetooth/1.1/vts/functional/VtsHalBluetoothV1_1TargetTest.cpp +++ b/bluetooth/1.1/vts/functional/VtsHalBluetoothV1_1TargetTest.cpp
@@ -20,6 +20,7 @@ #include <android/hardware/bluetooth/1.0/types.h> #include <android/hardware/bluetooth/1.1/IBluetoothHci.h> #include <android/hardware/bluetooth/1.1/IBluetoothHciCallbacks.h> +#include <hardware/bluetooth.h> #include <utils/Log.h> #include <VtsHalHidlTargetCallbackBase.h>
diff --git a/bluetooth/a2dp/1.0/vts/functional/VtsHalBluetoothA2dpV1_0TargetTest.cpp b/bluetooth/a2dp/1.0/vts/functional/VtsHalBluetoothA2dpV1_0TargetTest.cpp index 6eb8dab..f7fdf31 100644 --- a/bluetooth/a2dp/1.0/vts/functional/VtsHalBluetoothA2dpV1_0TargetTest.cpp +++ b/bluetooth/a2dp/1.0/vts/functional/VtsHalBluetoothA2dpV1_0TargetTest.cpp
@@ -20,6 +20,7 @@ #include <android/hardware/bluetooth/a2dp/1.0/IBluetoothAudioHost.h> #include <android/hardware/bluetooth/a2dp/1.0/IBluetoothAudioOffload.h> #include <gtest/gtest.h> +#include <hardware/bluetooth.h> #include <hidl/GtestPrinter.h> #include <hidl/MQDescriptor.h> #include <hidl/ServiceManagement.h>