diff options
| author | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2022-03-13 09:56:11 +0000 |
|---|---|---|
| committer | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2022-03-13 09:56:11 +0000 |
| commit | 49e8f8965a346d9424e7f12cf846328cfbcea317 (patch) | |
| tree | c353c6da217dc5b9ee64e0a4b853438a17154733 | |
| parent | 24371eec6b1154cc3a4962ef21c10176676c0db9 (diff) | |
| parent | 0fbb358dabc07cf1bf8e9719c35847b6e80bf0f0 (diff) | |
Snap for 8293597 from 0fbb358dabc07cf1bf8e9719c35847b6e80bf0f0 to t-keystone-qcom-release
Change-Id: I65c4b3fcd8859f73d201cd18a4d280b67b5ef841
| -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 */ /** |