commit | f1c107e68d8ba055d01279bee6ec6fe32350d531 | [log] [tgz] |
---|---|---|
author | Yichun Li <yichunli@google.com> | Fri May 19 02:08:39 2023 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri May 19 02:08:39 2023 +0000 |
tree | 5c5aec32af6725e9d0a7e142d1144b66b41cb8fe | |
parent | f229895e69f1351b7c583d442f1d8a1fd5c47d27 [diff] | |
parent | 79119d91d0c2d55354a852eebc80cd81988d894a [diff] |
Merge "Revert "Remove unused hardware/bluetooth.h include"" am: 3ac998fa8c am: 79119d91d0 Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2594896 Change-Id: I32ee6b1a5feac6fb786171335bd9166935cae6c2 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>