diff options
| author | Linux Build Service Account <lnxbuild@localhost> | 2022-04-05 12:05:52 -0700 |
|---|---|---|
| committer | Linux Build Service Account <lnxbuild@localhost> | 2022-04-05 12:05:52 -0700 |
| commit | 942dd4d7c456eb871465c2d6f25daef4ce8ea558 (patch) | |
| tree | e301bcd63b460b7e75d8b32a637890ca354aca2a | |
| parent | d1e00b83d0957733eb417a88177ebd8ab4639346 (diff) | |
| parent | 6116bc824984d741a4f1d6a32f74041ca9208a6f (diff) | |
Merge 6116bc824984d741a4f1d6a32f74041ca9208a6f on remote branch
Change-Id: I14d741ae3e15685fff3865c0d253c1e48bdf8c64
| -rw-r--r-- | Android.bp | 1 | ||||
| -rw-r--r-- | include/hardware/bluetooth.h | 2 |
2 files changed, 2 insertions, 1 deletions
@@ -61,6 +61,7 @@ cc_library_headers { apex_available: [ "//apex_available:platform", "com.android.bluetooth", + "com.android.media.swcodec", ], min_sdk_version: "29", host_supported: true, diff --git a/include/hardware/bluetooth.h b/include/hardware/bluetooth.h index 431c71a8..93ef9aea 100644 --- a/include/hardware/bluetooth.h +++ b/include/hardware/bluetooth.h @@ -226,7 +226,7 @@ typedef enum { * Access mode - GET and SET * Data type - uint32_t */ - BT_PROPERTY_ADAPTER_DISCOVERY_TIMEOUT, + BT_PROPERTY_ADAPTER_DISCOVERABLE_TIMEOUT, /* Properties unique to remote device */ /** |