diff options
| author | Scott Lobdell <slobdell@google.com> | 2022-03-11 19:27:15 +0000 |
|---|---|---|
| committer | Scott Lobdell <slobdell@google.com> | 2022-03-11 19:57:21 +0000 |
| commit | 0fbb358dabc07cf1bf8e9719c35847b6e80bf0f0 (patch) | |
| tree | c353c6da217dc5b9ee64e0a4b853438a17154733 | |
| parent | 7c4bb1d65158c777905fbf4e7bc4172cf2f8589d (diff) | |
| parent | b1dcde35e375d6079b7e5356cbc19ab05ec1a70b (diff) | |
Merge TP1A.220225.003
Change-Id: Ic358313af0648bcf54092600a231c76a7584f6c6
| -rw-r--r-- | Android.bp | 6 | ||||
| -rw-r--r-- | include/hardware/bluetooth.h | 2 |
2 files changed, 7 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, @@ -98,4 +99,9 @@ cc_library_shared { }, }, min_sdk_version: "29", + apex_available: [ + "//apex_available:platform", + "com.android.media.swcodec", + "test_com.android.media.swcodec", + ], } 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 */ /** |