| commit | bebd516578449d7b0bccb6a6bfecf2fcfcdcabe0 | [log] [tgz] |
|---|---|---|
| author | Xin Li <delphij@google.com> | Tue Sep 01 20:36:48 2020 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Tue Sep 01 20:36:48 2020 +0000 |
| tree | 28947e5a0dd3016b5d10de6ca64b668fa24ed088 | |
| parent | e7438cd2e891b5e8747791f53815d1d669b5d48f [diff] | |
| parent | fae361f24ee625714eb9053e1061cd5869461a8c [diff] |
[automerger skipped] Merge Android R (rvc-dev-plus-aosp-without-vendor@6692709) am: fae361f24e -s ours am skip reason: Change-Id I500b53e89f132b3925e6a1912c75b7834ea47ff4 with SHA-1 0d57727f5a is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/libhardware/+/12470210 Change-Id: Ie456f76702a06d46e628202a79b4c70dc19c75ae
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);