| commit | 51eba9d0f1dd91470b82995fe532b07e41c88c93 | [log] [tgz] |
|---|---|---|
| author | Xin Li <delphij@google.com> | Fri Sep 11 02:02:20 2020 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri Sep 11 02:02:20 2020 +0000 |
| tree | 28947e5a0dd3016b5d10de6ca64b668fa24ed088 | |
| parent | bebd516578449d7b0bccb6a6bfecf2fcfcdcabe0 [diff] | |
| parent | 5f3a19f76a34e9021e4f7dca148eb6b9976c92dc [diff] |
[automerger skipped] Merge "Merge Android R" am: 02dfcc7c15 -s ours am: 5f3a19f76a -s ours am skip reason: Change-Id Ib50a9978c77eda7e20e27f2d63615599f0517b6d with SHA-1 fae361f24e is in history Original change: https://android-review.googlesource.com/c/platform/hardware/libhardware/+/1422436 Change-Id: Ie11c65689005146632761708cfa20033aaa32b20
diff --git a/include/hardware/bluetooth.h b/include/hardware/bluetooth.h index 40ccc60..3fe6aa8 100644 --- a/include/hardware/bluetooth.h +++ b/include/hardware/bluetooth.h
@@ -454,8 +454,9 @@ /** * Opens the interface and provides the callback routines * to the implemenation of this interface. + * The |is_atv| flag indicates whether the local device is an Android TV */ - int (*init)(bt_callbacks_t* callbacks ); + int (*init)(bt_callbacks_t* callbacks, bool is_atv); /** Enable Bluetooth. */ int (*enable)(bool guest_mode);