| commit | 706ee1a5c8194d24a8fd0c9c2e423db59e308faa | [log] [tgz] |
|---|---|---|
| author | Yichun Li <yichunli@google.com> | Fri May 19 04:00:31 2023 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri May 19 04:00:31 2023 +0000 |
| tree | 407162fd3c437d0acb805e5b710db8352759dd0c | |
| parent | c72cb83a2a78d5416de5cad744d4133534d39857 [diff] | |
| parent | 5d55546bfba5334236f75f4a508593af039829bc [diff] |
Merge "Revert "Remove unused hardware/bluetooth.h include"" am: 3ac998fa8c am: 79119d91d0 am: f1c107e68d am: e908a03e1d am: 5d55546bfb Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2594896 Change-Id: Iab0646564298f9a9c9621cdca25debdce9dbfbe4 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>