[SQUASH] Revert QTI BT commits
Revert "Add broadcast active api"
This reverts commit f7e14f885c6eb3557b447d97d6bc80bdbde19f1b.
Revert "BLE Broadcast Isochronous channel support"
This reverts commit b655d796b0f1f6485dd293997a19af486df75ed8.
Revert "DeviceGroup: Add new system API's to support Group UI."
This reverts commit 0a9c8de0fb0cd812c1615c184514171be5b6d74b.
Revert "Enhanced Attribute protocol support"
This reverts commit 3b81a6fae8117971357e3115288507d376669b21.
Revert "Periodic Adv Sync Transfer feature support"
This reverts commit 1db38491ef1d5d16c16676e2c414e1d2d12eca7b.
Revert "Allow using alternative (higher) SBC HD bitrates with a property"
This reverts commit 7bef4797bb6d2821edbe1e6c133785530fde6898.
Revert "Explicit SBC Dual Channel (SBC HD) support"
This reverts commit 9b29f07c179fb4963cb80ce53e3709d3ef6803f7.
Revert "Increase maximum Bluetooth SBC codec bitrate for SBC HD"
This reverts commit 28fa6e941a1f673bddeff78968889e2a124367db.
Revert "bluetooth: select bluetooth modules by fully qualified namespace."
This reverts commit 58eea9a3f02cf87f9be780a7fe7cc39221c11ad8.
Revert "Bluetooth: Support to know if there is CS call"
This reverts commit 79cac113ed73ec09f3ab04011f4e2af485b25d94.
Revert "GAP: Reset bondingInitiatedLocally flag(3/3)"
This reverts commit 83ec2e59f238383245180eec23b72c400c6e81c2.
Revert "Add scan filter for Transport Discovery data"
This reverts commit 617ed892f9a6b0f1a99027810469eb8217379d78.
Revert "TWS-A2DP: Add TWS+ codec index"
This reverts commit 6febea4db8f132b35f819a21ba153d5657f5b089.
Revert "Bluetooth: Support to know if there is High Def call"
This reverts commit 2bb29cc6b400f29322dcdce01d1fa9b92751a05a.
Revert "BT: API to update quiet mode status in Adapter service [3/3]"
This reverts commit f19f43e75b486a024c3e4b2cab838ba0bbe660ba.
Revert "BT: Adding APTX-Adaptive codec to BT HAL"
This reverts commit 8884a8b312c274a530abde01575e13dacfb31421.
Revert "Add BLE Scan Phy parameter to scan API"
This reverts commit a8f2b1eff33a84e44c493806e7f23580a961f014.
Revert "Bluetooth: Add SDK API support for TWS feature (1)"
This reverts commit 1c5adc671fa5f5baabab539138c3c081ccbd1815.
Signed-off-by: Joey Huab <joey@evolution-x.org>
diff --git a/apex/Android.bp b/apex/Android.bp
index 82f8713..fc143ba 100644
--- a/apex/Android.bp
+++ b/apex/Android.bp
@@ -4,10 +4,10 @@
manifest: "apex_manifest.json",
native_shared_libs: [
- "//packages/apps/Bluetooth:libbluetooth_jni",
+ "libbluetooth_jni",
"libbluetooth"
],
- apps: ["//packages/apps/Bluetooth:Bluetooth"],
+ apps: ["Bluetooth"],
compile_multilib: "both",
diff --git a/audio_a2dp_hw/src/audio_a2dp_hw.cc b/audio_a2dp_hw/src/audio_a2dp_hw.cc
index 0b0d312..2fb139f 100644
--- a/audio_a2dp_hw/src/audio_a2dp_hw.cc
+++ b/audio_a2dp_hw/src/audio_a2dp_hw.cc
@@ -611,7 +611,6 @@
stream_config.is_stereo_to_mono = true;
break;
case BTAV_A2DP_CODEC_CHANNEL_MODE_STEREO:
- case BTAV_A2DP_CODEC_CHANNEL_MODE_DUAL_CHANNEL:
stream_config.channel_mask = AUDIO_CHANNEL_OUT_STEREO;
stream_config.is_stereo_to_mono = false;
break;
@@ -1076,7 +1075,6 @@
number_of_channels = 1;
break;
case BTAV_A2DP_CODEC_CHANNEL_MODE_STEREO:
- case BTAV_A2DP_CODEC_CHANNEL_MODE_DUAL_CHANNEL:
number_of_channels = 2;
break;
case BTAV_A2DP_CODEC_CHANNEL_MODE_NONE:
@@ -1287,9 +1285,7 @@
if (!param.empty()) param += "|";
param += "AUDIO_CHANNEL_OUT_MONO";
}
- if (codec_capability.channel_mode &
- (BTAV_A2DP_CODEC_CHANNEL_MODE_STEREO |
- BTAV_A2DP_CODEC_CHANNEL_MODE_DUAL_CHANNEL)) {
+ if (codec_capability.channel_mode & BTAV_A2DP_CODEC_CHANNEL_MODE_STEREO) {
if (!param.empty()) param += "|";
param += "AUDIO_CHANNEL_OUT_STEREO";
}
diff --git a/audio_a2dp_hw/test/audio_a2dp_hw_test.cc b/audio_a2dp_hw/test/audio_a2dp_hw_test.cc
index ce64e6e..8fcbae5 100644
--- a/audio_a2dp_hw/test/audio_a2dp_hw_test.cc
+++ b/audio_a2dp_hw/test/audio_a2dp_hw_test.cc
@@ -67,7 +67,6 @@
case BTAV_A2DP_CODEC_CHANNEL_MODE_MONO:
return 1;
case BTAV_A2DP_CODEC_CHANNEL_MODE_STEREO:
- case BTAV_A2DP_CODEC_CHANNEL_MODE_DUAL_CHANNEL:
return 2;
case BTAV_A2DP_CODEC_CHANNEL_MODE_NONE:
break;
diff --git a/audio_hearing_aid_hw/test/audio_hearing_aid_hw_test.cc b/audio_hearing_aid_hw/test/audio_hearing_aid_hw_test.cc
index 55b0515..c5d0e2b 100644
--- a/audio_hearing_aid_hw/test/audio_hearing_aid_hw_test.cc
+++ b/audio_hearing_aid_hw/test/audio_hearing_aid_hw_test.cc
@@ -67,7 +67,6 @@
case BTAV_A2DP_CODEC_CHANNEL_MODE_MONO:
return 1;
case BTAV_A2DP_CODEC_CHANNEL_MODE_STEREO:
- case BTAV_A2DP_CODEC_CHANNEL_MODE_DUAL_CHANNEL:
return 2;
case BTAV_A2DP_CODEC_CHANNEL_MODE_NONE:
break;
diff --git a/binder/android/bluetooth/IBluetooth.aidl b/binder/android/bluetooth/IBluetooth.aidl
index c56436b..0e554b7 100644
--- a/binder/android/bluetooth/IBluetooth.aidl
+++ b/binder/android/bluetooth/IBluetooth.aidl
@@ -1,38 +1,4 @@
/*
- * Copyright (C) 2018, The Linux Foundation. All rights reserved.
- * Not a Contribution.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted (subject to the limitations in the
- * disclaimer below) provided that the following conditions are met:
- *
- * * Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- *
- * * Redistributions in binary form must reproduce the above
- * copyright notice, this list of conditions and the following
- * disclaimer in the documentation and/or other materials provided
- * with the distribution.
- *
- * * Neither the name of The Linux Foundation nor the names of its
- * contributors may be used to endorse or promote products derived
- * from this software without specific prior written permission.
- *
- * NO EXPRESS OR IMPLIED LICENSES TO ANY PARTY'S PATENT RIGHTS ARE
- * GRANTED BY THIS LICENSE. THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT
- * HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED
- * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
- * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
- * IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR
- * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE
- * GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER
- * IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
- * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
- * IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-/*
* Copyright 2008, The Android Open Source Project
*
* Licensed under the Apache License, Version 2.0 (the "License");
@@ -106,7 +72,6 @@
boolean removeBond(in BluetoothDevice device);
int getBondState(in BluetoothDevice device);
boolean isBondingInitiatedLocally(in BluetoothDevice device);
- void setBondingInitiatedLocally(in BluetoothDevice devicei, in boolean localInitiated);
long getSupportedProfiles();
int getConnectionState(in BluetoothDevice device);
@@ -123,8 +88,6 @@
int getBatteryLevel(in BluetoothDevice device);
int getMaxConnectedAudioDevices();
- boolean isTwsPlusDevice(in BluetoothDevice device);
- String getTwsPlusPeerAddress(in BluetoothDevice device);
boolean setPin(in BluetoothDevice device, boolean accept, int len, in byte[] pinCode);
boolean setPasskey(in BluetoothDevice device, boolean accept, int len, in byte[]
passkey);
@@ -175,7 +138,6 @@
oneway void requestActivityInfo(in ResultReceiver result);
void onLeServiceUp();
- void updateQuietModeStatus(boolean quietMode);
void onBrEdrDown();
boolean connectAllEnabledProfiles(in BluetoothDevice device);
@@ -186,9 +148,4 @@
List<BluetoothDevice> getMostRecentlyConnectedDevices();
boolean removeActiveDevice(in int profiles);
-
- int getDeviceType(in BluetoothDevice device);
-
- boolean isBroadcastActive();
-
}
diff --git a/binder/android/bluetooth/IBluetoothGatt.aidl b/binder/android/bluetooth/IBluetoothGatt.aidl
index c9171d0..78d0261 100644
--- a/binder/android/bluetooth/IBluetoothGatt.aidl
+++ b/binder/android/bluetooth/IBluetoothGatt.aidl
@@ -70,10 +70,9 @@
void registerSync(in ScanResult scanResult, in int skip, in int timeout, in IPeriodicAdvertisingCallback callback);
void unregisterSync(in IPeriodicAdvertisingCallback callback);
- void transferSync(in BluetoothDevice bda, in int serviceData, in int syncHandle);
- void transferSetInfo(in BluetoothDevice bda, in int serviceData, in int advertisingHandle, in IPeriodicAdvertisingCallback callback);
+
@UnsupportedAppUsage
- void registerClient(in ParcelUuid appId, in IBluetoothGattCallback callback, in boolean eattSupport);
+ void registerClient(in ParcelUuid appId, in IBluetoothGattCallback callback);
@UnsupportedAppUsage
void unregisterClient(in int clientIf);
@@ -102,7 +101,7 @@
int maxInterval, int slaveLatency, int supervisionTimeout,
int minConnectionEventLen, int maxConnectionEventLen);
- void registerServer(in ParcelUuid appId, in IBluetoothGattServerCallback callback, in boolean eattSupport);
+ void registerServer(in ParcelUuid appId, in IBluetoothGattServerCallback callback);
void unregisterServer(in int serverIf);
void serverConnect(in int serverIf, in String address, in boolean isDirect, in int transport);
void serverDisconnect(in int serverIf, in String address);
diff --git a/binder/android/bluetooth/IBluetoothHeadsetPhone.aidl b/binder/android/bluetooth/IBluetoothHeadsetPhone.aidl
index 04f8341..8309780 100644
--- a/binder/android/bluetooth/IBluetoothHeadsetPhone.aidl
+++ b/binder/android/bluetooth/IBluetoothHeadsetPhone.aidl
@@ -31,9 +31,6 @@
String getSubscriberNumber();
boolean listCurrentCalls();
boolean queryPhoneState();
- boolean isHighDefCallInProgress();
- boolean isCsCallInProgress();
-
// Internal for phone app to call
void updateBtHandsfreeAfterRadioTechnologyChange();
diff --git a/binder/android/bluetooth/le/IPeriodicAdvertisingCallback.aidl b/binder/android/bluetooth/le/IPeriodicAdvertisingCallback.aidl
index 34eda66..84bbc14 100644
--- a/binder/android/bluetooth/le/IPeriodicAdvertisingCallback.aidl
+++ b/binder/android/bluetooth/le/IPeriodicAdvertisingCallback.aidl
@@ -28,5 +28,4 @@
in int skip, in int timeout, in int status);
void onPeriodicAdvertisingReport(in PeriodicAdvertisingReport report);
void onSyncLost(in int syncHandle);
- void onSyncTransfered(in BluetoothDevice device, in int status);
}
diff --git a/btif/src/btif_ble_advertiser.cc b/btif/src/btif_ble_advertiser.cc
index d150650..d1923bd 100644
--- a/btif/src/btif_ble_advertiser.cc
+++ b/btif/src/btif_ble_advertiser.cc
@@ -235,16 +235,6 @@
std::move(data), jni_thread_wrapper(FROM_HERE, cb)));
}
- void CreateBIG(int advertiser_id, CreateBIGParameters create_big_params,
- CreateBIGCallback cb) override {
- VLOG(1) << __func__ << " advertiser_id: " << +advertiser_id;
- }
-
- void TerminateBIG(int advertiser_id, int big_handle, int reason,
- TerminateBIGCallback cb) override {
- VLOG(1) << __func__ << "big_handle: " << +big_handle;
- }
-
void SetPeriodicAdvertisingEnable(int advertiser_id, bool enable,
StatusCallback cb) override {
VLOG(1) << __func__ << " advertiser_id: " << +advertiser_id
diff --git a/btif/src/btif_ble_scanner.cc b/btif/src/btif_ble_scanner.cc
index e01fe98..b314993 100644
--- a/btif/src/btif_ble_scanner.cc
+++ b/btif/src/btif_ble_scanner.cc
@@ -285,11 +285,10 @@
jni_thread_wrapper(FROM_HERE, std::move(cb))));
}
- void SetScanParameters(int scan_phy, std::vector<uint32_t> scan_interval,
- std::vector<uint32_t> scan_window,
+ void SetScanParameters(int scan_interval, int scan_window,
Callback cb) override {
do_in_main_thread(
- FROM_HERE, base::Bind(&BTM_BleSetScanParams, scan_interval[0], scan_window[0],
+ FROM_HERE, base::Bind(&BTM_BleSetScanParams, scan_interval, scan_window,
BTM_BLE_SCAN_MODE_ACTI,
jni_thread_wrapper(FROM_HERE, std::move(cb))));
}
@@ -331,14 +330,6 @@
SyncLostCb lost_cb) override {}
void StopSync(uint16_t handle) override {}
- void CancelCreateSync(uint8_t sid, RawAddress address) override {}
- void TransferSync(RawAddress address, uint16_t service_data,
- uint16_t sync_handle, SyncTransferCb cb) override {}
-
- void TransferSetInfo(RawAddress address, uint16_t service_data,
- uint8_t adv_handle, SyncTransferCb cb) override {}
- void SyncTxParameters(RawAddress address, uint8_t mode, uint16_t skip,
- uint16_t timeout, StartSyncCb cb) override {}
};
BleScannerInterface* btLeScannerInstance = nullptr;
diff --git a/btif/src/btif_gatt_client.cc b/btif/src/btif_gatt_client.cc
index 1a696d6..14433d3 100644
--- a/btif/src/btif_gatt_client.cc
+++ b/btif/src/btif_gatt_client.cc
@@ -220,7 +220,7 @@
* Client API Functions
******************************************************************************/
-bt_status_t btif_gattc_register_app(const Uuid& uuid, bool eatt_support) {
+bt_status_t btif_gattc_register_app(const Uuid& uuid) {
CHECK_BTGATT_INIT();
return do_in_jni_thread(Bind(
diff --git a/btif/src/btif_gatt_server.cc b/btif/src/btif_gatt_server.cc
index 62ca59f..6dc5eb7 100644
--- a/btif/src/btif_gatt_server.cc
+++ b/btif/src/btif_gatt_server.cc
@@ -266,7 +266,7 @@
/*******************************************************************************
* Server API Functions
******************************************************************************/
-static bt_status_t btif_gatts_register_app(const Uuid& bt_uuid, bool eatt_support) {
+static bt_status_t btif_gatts_register_app(const Uuid& bt_uuid) {
CHECK_BTGATT_INIT();
return do_in_jni_thread(
diff --git a/include/hardware/ble_advertiser.h b/include/hardware/ble_advertiser.h
index b8a07dc..6055d89 100644
--- a/include/hardware/ble_advertiser.h
+++ b/include/hardware/ble_advertiser.h
@@ -34,20 +34,6 @@
uint8_t scan_request_notification_enable;
};
-struct CreateBIGParameters {
- uint8_t adv_handle;
- uint8_t num_bis;
- uint32_t sdu_int;
- uint16_t max_sdu;
- uint16_t max_transport_latency;
- uint8_t rtn;
- uint8_t phy;
- uint8_t packing;
- uint8_t framing;
- uint8_t encryption;
- std::vector<uint8_t> broadcast_code;
-};
-
struct PeriodicAdvertisingParameters {
uint8_t enable;
uint16_t min_interval;
@@ -68,15 +54,7 @@
uint8_t /* status */)>;
using ParametersCallback =
base::Callback<void(uint8_t /* status */, int8_t /* tx_power */)>;
- using CreateBIGCallback = base::Callback<void(uint8_t /*adv_inst_id*/,
- uint8_t /*status*/, uint8_t /*big_handle*/, uint32_t /*big_sync_delay*/,
- uint32_t /*transport_latency_big*/, uint8_t /*phy*/, uint8_t /*nse*/,
- uint8_t /*bn*/, uint8_t /*pto*/, uint8_t /*irc*/, uint16_t /*max_pdu*/,
- uint16_t /*iso_int*/, uint8_t /*num_bis*/,
- std::vector<uint16_t> /*conn_handle_list*/)>;
- using TerminateBIGCallback =
- base::Callback<void(uint8_t /* status */, uint8_t /* advertiser_id */,
- uint8_t /* big_handle */, uint8_t /* reason */)>;
+
/** Registers an advertiser with the stack */
virtual void RegisterAdvertiser(IdStatusCallback) = 0;
@@ -125,14 +103,6 @@
std::vector<uint8_t> data,
StatusCallback cb) = 0;
- virtual void CreateBIG(
- int advertiser_id, CreateBIGParameters create_big_params,
- CreateBIGCallback cb) = 0;
-
- virtual void TerminateBIG(
- int advertiser_id, int big_handle, int reason,
- TerminateBIGCallback cb) = 0;
-
virtual void SetPeriodicAdvertisingEnable(int advertiser_id, bool enable,
StatusCallback cb) = 0;
};
diff --git a/include/hardware/ble_scanner.h b/include/hardware/ble_scanner.h
index d057392..efa9662 100644
--- a/include/hardware/ble_scanner.h
+++ b/include/hardware/ble_scanner.h
@@ -96,8 +96,7 @@
virtual void ScanFilterEnable(bool enable, EnableCallback cb) = 0;
/** Sets the LE scan interval and window in units of N*0.625 msec */
- virtual void SetScanParameters(int scan_phy, std::vector<uint32_t> scan_interval,
- std::vector<uint32_t> scan_window,
+ virtual void SetScanParameters(int scan_interval, int scan_window,
Callback cb) = 0;
/* Configure the batchscan storage */
@@ -129,16 +128,6 @@
uint16_t timeout, StartSyncCb start_cb,
SyncReportCb report_cb, SyncLostCb lost_cb) = 0;
virtual void StopSync(uint16_t handle) = 0;
- virtual void CancelCreateSync(uint8_t sid, RawAddress address) = 0;
- using SyncTransferCb =
- base::Callback<void(uint8_t /*status*/, RawAddress /*addr*/)>;
-
- virtual void TransferSync(RawAddress address, uint16_t service_data,
- uint16_t sync_handle, SyncTransferCb cb) = 0;
- virtual void TransferSetInfo(RawAddress address, uint16_t service_data,
- uint8_t adv_handle, SyncTransferCb cb) = 0;
- virtual void SyncTxParameters(RawAddress addr, uint8_t mode, uint16_t skip,
- uint16_t timeout,StartSyncCb start_cb) = 0;
};
-#endif /* ANDROID_INCLUDE_BLE_SCANNER_H */
+#endif /* ANDROID_INCLUDE_BLE_SCANNER_H */
\ No newline at end of file
diff --git a/include/hardware/bt_av.h b/include/hardware/bt_av.h
index b0d5e54..c4c0ecc 100644
--- a/include/hardware/bt_av.h
+++ b/include/hardware/bt_av.h
@@ -53,9 +53,7 @@
BTAV_A2DP_CODEC_INDEX_SOURCE_AAC,
BTAV_A2DP_CODEC_INDEX_SOURCE_APTX,
BTAV_A2DP_CODEC_INDEX_SOURCE_APTX_HD,
- BTAV_A2DP_CODEC_INDEX_SOURCE_APTX_ADAPTIVE,
BTAV_A2DP_CODEC_INDEX_SOURCE_LDAC,
- BTAV_A2DP_CODEC_INDEX_SOURCE_APTX_TWS,
BTAV_A2DP_CODEC_INDEX_SOURCE_MAX,
@@ -107,8 +105,7 @@
typedef enum {
BTAV_A2DP_CODEC_CHANNEL_MODE_NONE = 0x0,
BTAV_A2DP_CODEC_CHANNEL_MODE_MONO = 0x1 << 0,
- BTAV_A2DP_CODEC_CHANNEL_MODE_STEREO = 0x1 << 1,
- BTAV_A2DP_CODEC_CHANNEL_MODE_DUAL_CHANNEL = 0x1 << 2
+ BTAV_A2DP_CODEC_CHANNEL_MODE_STEREO = 0x1 << 1
} btav_a2dp_codec_channel_mode_t;
/*
@@ -149,15 +146,9 @@
case BTAV_A2DP_CODEC_INDEX_SOURCE_APTX_HD:
codec_name_str = "aptX HD";
break;
- case BTAV_A2DP_CODEC_INDEX_SOURCE_APTX_ADAPTIVE:
- codec_name_str = "aptX Adaptive";
- break;
case BTAV_A2DP_CODEC_INDEX_SOURCE_LDAC:
codec_name_str = "LDAC";
break;
- case BTAV_A2DP_CODEC_INDEX_SOURCE_APTX_TWS:
- codec_name_str = "aptX TWS";
- break;
case BTAV_A2DP_CODEC_INDEX_SINK_SBC:
codec_name_str = "SBC (Sink)";
break;
@@ -224,9 +215,6 @@
AppendCapability(channel_mode_str,
(channel_mode & BTAV_A2DP_CODEC_CHANNEL_MODE_STEREO),
"STEREO");
- AppendCapability(channel_mode_str,
- (channel_mode & BTAV_A2DP_CODEC_CHANNEL_MODE_DUAL_CHANNEL),
- "DUAL_CHANNEL");
return "codec: " + codec_name_str +
" priority: " + std::to_string(codec_priority) +
diff --git a/include/hardware/bt_common_types.h b/include/hardware/bt_common_types.h
index 34c7078..0a315fe 100644
--- a/include/hardware/bt_common_types.h
+++ b/include/hardware/bt_common_types.h
@@ -99,9 +99,6 @@
uint16_t company_mask;
std::vector<uint8_t> data;
std::vector<uint8_t> data_mask;
- uint8_t org_id;
- uint8_t tds_flags;
- uint8_t tds_flags_mask;
};
#endif /* ANDROID_INCLUDE_BT_COMMON_TYPES_H */
diff --git a/include/hardware/bt_gatt_client.h b/include/hardware/bt_gatt_client.h
index e56ccc5..6ea1c89 100644
--- a/include/hardware/bt_gatt_client.h
+++ b/include/hardware/bt_gatt_client.h
@@ -207,7 +207,7 @@
typedef struct {
/** Registers a GATT client application with the stack */
- bt_status_t (*register_client)(const bluetooth::Uuid& uuid, bool eatt_support);
+ bt_status_t (*register_client)(const bluetooth::Uuid& uuid);
/** Unregister a client application from the stack */
bt_status_t (*unregister_client)(int client_if);
diff --git a/include/hardware/bt_gatt_server.h b/include/hardware/bt_gatt_server.h
index 23389c3..1b1db37 100644
--- a/include/hardware/bt_gatt_server.h
+++ b/include/hardware/bt_gatt_server.h
@@ -138,7 +138,7 @@
/** Represents the standard BT-GATT server interface. */
typedef struct {
/** Registers a GATT server application with the stack */
- bt_status_t (*register_server)(const bluetooth::Uuid& uuid, bool eatt_support);
+ bt_status_t (*register_server)(const bluetooth::Uuid& uuid);
/** Unregister a server application from the stack */
bt_status_t (*unregister_server)(int server_if);
diff --git a/service/gatt_client.cc b/service/gatt_client.cc
index 6c9def5..629b82a 100644
--- a/service/gatt_client.cc
+++ b/service/gatt_client.cc
@@ -67,7 +67,7 @@
const btgatt_client_interface_t* hal_iface =
hal::BluetoothGattInterface::Get()->GetClientHALInterface();
- if (hal_iface->register_client(uuid, false) != BT_STATUS_SUCCESS) return false;
+ if (hal_iface->register_client(uuid) != BT_STATUS_SUCCESS) return false;
pending_calls_[uuid] = callback;
diff --git a/service/gatt_server.cc b/service/gatt_server.cc
index 8d8468a..f911f54 100644
--- a/service/gatt_server.cc
+++ b/service/gatt_server.cc
@@ -590,7 +590,7 @@
const btgatt_server_interface_t* hal_iface =
hal::BluetoothGattInterface::Get()->GetServerHALInterface();
- if (hal_iface->register_server(uuid, false) != BT_STATUS_SUCCESS) return false;
+ if (hal_iface->register_server(uuid) != BT_STATUS_SUCCESS) return false;
pending_calls_[uuid] = callback;
diff --git a/service/gatt_server_old.cc b/service/gatt_server_old.cc
index c6fd9fe..cfc394c 100644
--- a/service/gatt_server_old.cc
+++ b/service/gatt_server_old.cc
@@ -200,7 +200,7 @@
// It must be different than any other registered Uuid.
bluetooth::Uuid client_id = bluetooth::Uuid::GetRandom();
- bt_status_t btstat = g_internal->gatt->client->register_client(client_id, false);
+ bt_status_t btstat = g_internal->gatt->client->register_client(client_id);
if (btstat != BT_STATUS_SUCCESS) {
LOG_ERROR(LOG_TAG, "%s: Failed to register client", __func__);
}
@@ -546,7 +546,7 @@
return false;
}
- bt_status_t btstat = internal_->gatt->server->register_server(service_id, false);
+ bt_status_t btstat = internal_->gatt->server->register_server(service_id);
if (btstat != BT_STATUS_SUCCESS) {
LOG_ERROR(LOG_TAG, "Failed to register server");
return false;
diff --git a/service/hal/fake_bluetooth_gatt_interface.cc b/service/hal/fake_bluetooth_gatt_interface.cc
index 084aae1..dbbbcaa 100644
--- a/service/hal/fake_bluetooth_gatt_interface.cc
+++ b/service/hal/fake_bluetooth_gatt_interface.cc
@@ -28,8 +28,8 @@
std::shared_ptr<FakeBluetoothGattInterface::TestClientHandler> g_client_handler;
std::shared_ptr<FakeBluetoothGattInterface::TestServerHandler> g_server_handler;
-bt_status_t FakeRegisterClient(const bluetooth::Uuid& app_uuid, bool eatt_support) {
- if (g_client_handler) return g_client_handler->RegisterClient(app_uuid, eatt_support);
+bt_status_t FakeRegisterClient(const bluetooth::Uuid& app_uuid) {
+ if (g_client_handler) return g_client_handler->RegisterClient(app_uuid);
return BT_STATUS_FAIL;
}
@@ -57,8 +57,8 @@
return BT_STATUS_FAIL;
}
-bt_status_t FakeRegisterServer(const bluetooth::Uuid& app_uuid, bool eatt_support) {
- if (g_server_handler) return g_server_handler->RegisterServer(app_uuid, eatt_support);
+bt_status_t FakeRegisterServer(const bluetooth::Uuid& app_uuid) {
+ if (g_server_handler) return g_server_handler->RegisterServer(app_uuid);
return BT_STATUS_FAIL;
}
diff --git a/service/hal/fake_bluetooth_gatt_interface.h b/service/hal/fake_bluetooth_gatt_interface.h
index 6297e6c..a991a21 100644
--- a/service/hal/fake_bluetooth_gatt_interface.h
+++ b/service/hal/fake_bluetooth_gatt_interface.h
@@ -35,7 +35,7 @@
public:
virtual ~TestClientHandler() = default;
- virtual bt_status_t RegisterClient(const bluetooth::Uuid& app_uuid, bool eatt_support) = 0;
+ virtual bt_status_t RegisterClient(const bluetooth::Uuid& app_uuid) = 0;
virtual bt_status_t UnregisterClient(int client_if) = 0;
virtual bt_status_t Connect(int client_if, const RawAddress& bd_addr,
@@ -51,7 +51,7 @@
public:
virtual ~TestServerHandler() = default;
- virtual bt_status_t RegisterServer(const bluetooth::Uuid& app_uuid, bool eatt_support) = 0;
+ virtual bt_status_t RegisterServer(const bluetooth::Uuid& app_uuid) = 0;
virtual bt_status_t UnregisterServer(int server_if) = 0;
virtual bt_status_t AddService(
int server_if, std::vector<btgatt_db_element_t> service) = 0;
diff --git a/service/low_energy_client.cc b/service/low_energy_client.cc
index 7095619..cb8bcf1 100644
--- a/service/low_energy_client.cc
+++ b/service/low_energy_client.cc
@@ -218,7 +218,7 @@
const btgatt_client_interface_t* hal_iface =
hal::BluetoothGattInterface::Get()->GetClientHALInterface();
- if (hal_iface->register_client(uuid, false) != BT_STATUS_SUCCESS) return false;
+ if (hal_iface->register_client(uuid) != BT_STATUS_SUCCESS) return false;
pending_calls_[uuid] = callback;
diff --git a/service/test/gatt_client_unittest.cc b/service/test/gatt_client_unittest.cc
index 2552369..310e4b9 100644
--- a/service/test/gatt_client_unittest.cc
+++ b/service/test/gatt_client_unittest.cc
@@ -33,7 +33,7 @@
MockGattHandler() = default;
~MockGattHandler() override = default;
- MOCK_METHOD2(RegisterClient, bt_status_t(const bluetooth::Uuid&, bool));
+ MOCK_METHOD1(RegisterClient, bt_status_t(const bluetooth::Uuid&));
MOCK_METHOD1(UnregisterClient, bt_status_t(int));
MOCK_METHOD1(Scan, bt_status_t(bool));
MOCK_METHOD4(Connect, bt_status_t(int, const RawAddress&, bool, int));
@@ -77,7 +77,7 @@
};
TEST_F(GattClientTest, RegisterInstance) {
- EXPECT_CALL(*mock_handler_, RegisterClient(_, _))
+ EXPECT_CALL(*mock_handler_, RegisterClient(_))
.Times(2)
.WillOnce(Return(BT_STATUS_FAIL))
.WillOnce(Return(BT_STATUS_SUCCESS));
@@ -116,7 +116,7 @@
// Call with a different Uuid while one is pending.
Uuid uuid1 = Uuid::GetRandom();
- EXPECT_CALL(*mock_handler_, RegisterClient(_, _))
+ EXPECT_CALL(*mock_handler_, RegisterClient(_))
.Times(1)
.WillOnce(Return(BT_STATUS_SUCCESS));
EXPECT_TRUE(factory_->RegisterInstance(uuid1, callback));
diff --git a/service/test/gatt_server_unittest.cc b/service/test/gatt_server_unittest.cc
index 830836a..e19742d 100644
--- a/service/test/gatt_server_unittest.cc
+++ b/service/test/gatt_server_unittest.cc
@@ -32,7 +32,7 @@
MockGattHandler() = default;
~MockGattHandler() override = default;
- MOCK_METHOD2(RegisterServer, bt_status_t(const bluetooth::Uuid&, bool));
+ MOCK_METHOD1(RegisterServer, bt_status_t(const bluetooth::Uuid&));
MOCK_METHOD1(UnregisterServer, bt_status_t(int));
MOCK_METHOD2(AddService, bt_status_t(int, std::vector<btgatt_db_element_t>));
MOCK_METHOD5(AddCharacteristic,
@@ -223,7 +223,7 @@
static_cast<GattServer*>(in_client.release()));
};
- EXPECT_CALL(*mock_handler_, RegisterServer(_, _))
+ EXPECT_CALL(*mock_handler_, RegisterServer(_))
.Times(1)
.WillOnce(Return(BT_STATUS_SUCCESS));
@@ -298,7 +298,7 @@
};
TEST_F(GattServerTest, RegisterServer) {
- EXPECT_CALL(*mock_handler_, RegisterServer(_, _))
+ EXPECT_CALL(*mock_handler_, RegisterServer(_))
.Times(2)
.WillOnce(Return(BT_STATUS_FAIL))
.WillOnce(Return(BT_STATUS_SUCCESS));
@@ -337,7 +337,7 @@
// Call with a different Uuid while one is pending.
Uuid uuid1 = Uuid::GetRandom();
- EXPECT_CALL(*mock_handler_, RegisterServer(_, _))
+ EXPECT_CALL(*mock_handler_, RegisterServer(_))
.Times(1)
.WillOnce(Return(BT_STATUS_SUCCESS));
EXPECT_TRUE(factory_->RegisterInstance(uuid1, callback));
diff --git a/service/test/low_energy_advertiser_unittest.cc b/service/test/low_energy_advertiser_unittest.cc
index 96beceb..ad76d82 100644
--- a/service/test/low_energy_advertiser_unittest.cc
+++ b/service/test/low_energy_advertiser_unittest.cc
@@ -68,8 +68,6 @@
void(int, PeriodicAdvertisingParameters, StatusCallback));
MOCK_METHOD3(SetPeriodicAdvertisingData,
void(int, std::vector<uint8_t>, StatusCallback));
- MOCK_METHOD3(CreateBIG, void(int, CreateBIGParameters, CreateBIGCallback));
- MOCK_METHOD4(TerminateBIG, void(int, int, int, TerminateBIGCallback));
MOCK_METHOD3(SetPeriodicAdvertisingEnable, void(int, bool, StatusCallback));
private:
diff --git a/service/test/low_energy_client_unittest.cc b/service/test/low_energy_client_unittest.cc
index 6478dba..ce3c7c0 100644
--- a/service/test/low_energy_client_unittest.cc
+++ b/service/test/low_energy_client_unittest.cc
@@ -40,7 +40,7 @@
MockGattHandler(){};
~MockGattHandler() override = default;
- MOCK_METHOD2(RegisterClient, bt_status_t(const bluetooth::Uuid&, bool));
+ MOCK_METHOD1(RegisterClient, bt_status_t(const bluetooth::Uuid&));
MOCK_METHOD1(UnregisterClient, bt_status_t(int));
MOCK_METHOD4(Connect, bt_status_t(int, const RawAddress&, bool, int));
MOCK_METHOD3(Disconnect, bt_status_t(int, const RawAddress&, int));
@@ -145,7 +145,7 @@
static_cast<LowEnergyClient*>(in_client.release())));
};
- EXPECT_CALL(*mock_handler_, RegisterClient(_, _))
+ EXPECT_CALL(*mock_handler_, RegisterClient(_))
.Times(1)
.WillOnce(Return(BT_STATUS_SUCCESS));
@@ -166,7 +166,7 @@
};
TEST_F(LowEnergyClientTest, RegisterInstance) {
- EXPECT_CALL(*mock_handler_, RegisterClient(_, _))
+ EXPECT_CALL(*mock_handler_, RegisterClient(_))
.Times(2)
.WillOnce(Return(BT_STATUS_FAIL))
.WillOnce(Return(BT_STATUS_SUCCESS));
@@ -205,7 +205,7 @@
// Call with a different Uuid while one is pending.
Uuid uuid1 = Uuid::GetRandom();
- EXPECT_CALL(*mock_handler_, RegisterClient(_, _))
+ EXPECT_CALL(*mock_handler_, RegisterClient(_))
.Times(1)
.WillOnce(Return(BT_STATUS_SUCCESS));
EXPECT_TRUE(ble_factory_->RegisterInstance(uuid1, callback));
diff --git a/service/test/low_energy_scanner_unittest.cc b/service/test/low_energy_scanner_unittest.cc
index a3999a3..9a7875d 100644
--- a/service/test/low_energy_scanner_unittest.cc
+++ b/service/test/low_energy_scanner_unittest.cc
@@ -51,8 +51,8 @@
FilterParamSetupCallback cb));
MOCK_METHOD2(ScanFilterClear, void(int filt_index, FilterConfigCallback cb));
MOCK_METHOD2(ScanFilterEnable, void(bool enable, EnableCallback cb));
- MOCK_METHOD4(SetScanParameters,
- void(int scan_phy, std::vector<uint32_t> scan_interval, std::vector<uint32_t> scan_window, Callback cb));
+ MOCK_METHOD3(SetScanParameters,
+ void(int scan_interval, int scan_window, Callback cb));
MOCK_METHOD5(BatchscanConfigStorage,
void(int client_if, int batch_scan_full_max,
@@ -71,14 +71,6 @@
StartSyncCb, SyncReportCb, SyncLostCb));
MOCK_METHOD1(StopSync, void(uint16_t));
- MOCK_METHOD2(CancelCreateSync, void(uint8_t, RawAddress));
-
- MOCK_METHOD4(TransferSync, void(RawAddress, uint16_t, uint16_t, SyncTransferCb));
-
- MOCK_METHOD4(TransferSetInfo, void(RawAddress, uint16_t, uint8_t, SyncTransferCb));
-
- MOCK_METHOD5(SyncTxParameters, void(RawAddress, uint8_t, uint16_t, uint16_t, StartSyncCb));
-
void ScanFilterAdd(int filter_index, std::vector<ApcfCommand> filters,
FilterConfigCallback cb) override{};
diff --git a/stack/a2dp/a2dp_aac.cc b/stack/a2dp/a2dp_aac.cc
index eb87acb..2e915b0 100644
--- a/stack/a2dp/a2dp_aac.cc
+++ b/stack/a2dp/a2dp_aac.cc
@@ -1015,7 +1015,6 @@
return true;
}
break;
- case BTAV_A2DP_CODEC_CHANNEL_MODE_DUAL_CHANNEL:
case BTAV_A2DP_CODEC_CHANNEL_MODE_NONE:
break;
}
@@ -1295,7 +1294,6 @@
codec_config_.channel_mode = codec_user_config_.channel_mode;
}
break;
- case BTAV_A2DP_CODEC_CHANNEL_MODE_DUAL_CHANNEL:
case BTAV_A2DP_CODEC_CHANNEL_MODE_NONE:
codec_capability_.channel_mode = BTAV_A2DP_CODEC_CHANNEL_MODE_NONE;
codec_config_.channel_mode = BTAV_A2DP_CODEC_CHANNEL_MODE_NONE;
diff --git a/stack/a2dp/a2dp_codec_config.cc b/stack/a2dp/a2dp_codec_config.cc
index 5f4371f..edf7e0c 100644
--- a/stack/a2dp/a2dp_codec_config.cc
+++ b/stack/a2dp/a2dp_codec_config.cc
@@ -128,16 +128,12 @@
case BTAV_A2DP_CODEC_INDEX_SOURCE_APTX_HD:
codec_config = new A2dpCodecConfigAptxHd(codec_priority);
break;
- case BTAV_A2DP_CODEC_INDEX_SOURCE_APTX_ADAPTIVE:
- break;
case BTAV_A2DP_CODEC_INDEX_SOURCE_LDAC:
codec_config = new A2dpCodecConfigLdacSource(codec_priority);
break;
case BTAV_A2DP_CODEC_INDEX_SINK_LDAC:
codec_config = new A2dpCodecConfigLdacSink(codec_priority);
break;
- case BTAV_A2DP_CODEC_INDEX_SOURCE_APTX_TWS:
- break;
case BTAV_A2DP_CODEC_INDEX_MAX:
break;
}
@@ -340,9 +336,6 @@
uint8_t* p_result_codec_config, bool* p_restart_input,
bool* p_restart_output, bool* p_config_updated) {
std::lock_guard<std::recursive_mutex> lock(codec_mutex_);
- auto stereo_dualchannel_inv_mask =
- ~(BTAV_A2DP_CODEC_CHANNEL_MODE_DUAL_CHANNEL |
- BTAV_A2DP_CODEC_CHANNEL_MODE_STEREO);
*p_restart_input = false;
*p_restart_output = false;
*p_config_updated = false;
@@ -373,9 +366,7 @@
if ((saved_codec_config.sample_rate != new_codec_config.sample_rate) ||
(saved_codec_config.bits_per_sample !=
new_codec_config.bits_per_sample) ||
- ((saved_codec_config.channel_mode != new_codec_config.channel_mode) &&
- (saved_codec_config.channel_mode & stereo_dualchannel_inv_mask) !=
- (new_codec_config.channel_mode & stereo_dualchannel_inv_mask))) {
+ (saved_codec_config.channel_mode != new_codec_config.channel_mode)) {
*p_restart_input = true;
}
@@ -504,10 +495,6 @@
if (!result.empty()) result += "|";
result += "STEREO";
}
- if (codec_channel_mode & BTAV_A2DP_CODEC_CHANNEL_MODE_DUAL_CHANNEL) {
- if (!result.empty()) result += "|";
- result += "DUAL_CHANNEL";
- }
if (result.empty()) {
std::stringstream ss;
ss << "UnknownChannelMode(0x" << std::hex << codec_channel_mode << ")";
diff --git a/stack/a2dp/a2dp_sbc.cc b/stack/a2dp/a2dp_sbc.cc
index 78148a4..388419b 100644
--- a/stack/a2dp/a2dp_sbc.cc
+++ b/stack/a2dp/a2dp_sbc.cc
@@ -55,9 +55,8 @@
/* SBC Source codec capabilities */
static const tA2DP_SBC_CIE a2dp_sbc_source_caps = {
- (A2DP_SBC_IE_SAMP_FREQ_44), /* samp_freq */
- (A2DP_SBC_IE_CH_MD_MONO | A2DP_SBC_IE_CH_MD_JOINT |
- A2DP_SBC_IE_CH_MD_DUAL), /* ch_mode */
+ (A2DP_SBC_IE_SAMP_FREQ_44), /* samp_freq */
+ (A2DP_SBC_IE_CH_MD_MONO | A2DP_SBC_IE_CH_MD_JOINT), /* ch_mode */
(A2DP_SBC_IE_BLOCKS_16 | A2DP_SBC_IE_BLOCKS_12 | A2DP_SBC_IE_BLOCKS_8 |
A2DP_SBC_IE_BLOCKS_4), /* block_len */
A2DP_SBC_IE_SUBBAND_8, /* num_subbands */
@@ -866,11 +865,10 @@
if (config_cie.ch_mode & A2DP_SBC_IE_CH_MD_MONO)
result->channel_mode |= BTAV_A2DP_CODEC_CHANNEL_MODE_MONO;
- if (config_cie.ch_mode & (A2DP_SBC_IE_CH_MD_STEREO | A2DP_SBC_IE_CH_MD_JOINT))
+ if (config_cie.ch_mode & (A2DP_SBC_IE_CH_MD_STEREO | A2DP_SBC_IE_CH_MD_JOINT |
+ A2DP_SBC_IE_CH_MD_DUAL)) {
result->channel_mode |= BTAV_A2DP_CODEC_CHANNEL_MODE_STEREO;
-
- if (config_cie.ch_mode & A2DP_SBC_IE_CH_MD_DUAL)
- result->channel_mode |= BTAV_A2DP_CODEC_CHANNEL_MODE_DUAL_CHANNEL;
+ }
}
A2dpCodecConfigSbcSource::A2dpCodecConfigSbcSource(
@@ -896,8 +894,7 @@
codec_local_capability_.channel_mode |= BTAV_A2DP_CODEC_CHANNEL_MODE_STEREO;
}
if (a2dp_sbc_source_caps.ch_mode & A2DP_SBC_IE_CH_MD_DUAL) {
- codec_local_capability_.channel_mode |=
- BTAV_A2DP_CODEC_CHANNEL_MODE_DUAL_CHANNEL;
+ codec_local_capability_.channel_mode |= BTAV_A2DP_CODEC_CHANNEL_MODE_STEREO;
}
}
@@ -1024,7 +1021,7 @@
}
if (ch_mode & A2DP_SBC_IE_CH_MD_DUAL) {
p_result->ch_mode = A2DP_SBC_IE_CH_MD_DUAL;
- p_codec_config->channel_mode = BTAV_A2DP_CODEC_CHANNEL_MODE_DUAL_CHANNEL;
+ p_codec_config->channel_mode = BTAV_A2DP_CODEC_CHANNEL_MODE_STEREO;
return true;
}
if (ch_mode & A2DP_SBC_IE_CH_MD_MONO) {
@@ -1063,12 +1060,9 @@
p_codec_config->channel_mode = BTAV_A2DP_CODEC_CHANNEL_MODE_STEREO;
return true;
}
- break;
- case BTAV_A2DP_CODEC_CHANNEL_MODE_DUAL_CHANNEL:
if (ch_mode & A2DP_SBC_IE_CH_MD_DUAL) {
p_result->ch_mode = A2DP_SBC_IE_CH_MD_DUAL;
- p_codec_config->channel_mode =
- BTAV_A2DP_CODEC_CHANNEL_MODE_DUAL_CHANNEL;
+ p_codec_config->channel_mode = BTAV_A2DP_CODEC_CHANNEL_MODE_STEREO;
return true;
}
break;
@@ -1118,9 +1112,17 @@
}
// Try using the prefered peer codec config (if valid), instead of the peer
// capability.
- if (is_capability && !is_source_) {
- if (A2DP_IsPeerSourceCodecValidSbc(ota_codec_peer_config_)) {
- status = A2DP_ParseInfoSbc(&peer_info_cie, ota_codec_peer_config_, false);
+ if (is_capability) {
+ if (is_source_) {
+ if (A2DP_IsPeerSinkCodecValidSbc(ota_codec_peer_config_)) {
+ status =
+ A2DP_ParseInfoSbc(&peer_info_cie, ota_codec_peer_config_, false);
+ }
+ } else {
+ if (A2DP_IsPeerSourceCodecValidSbc(ota_codec_peer_config_)) {
+ status =
+ A2DP_ParseInfoSbc(&peer_info_cie, ota_codec_peer_config_, false);
+ }
}
if (status != A2DP_SUCCESS) {
// Use the peer codec capability
@@ -1294,12 +1296,11 @@
codec_config_.channel_mode = codec_user_config_.channel_mode;
break;
}
- break;
- case BTAV_A2DP_CODEC_CHANNEL_MODE_DUAL_CHANNEL:
if (ch_mode & A2DP_SBC_IE_CH_MD_DUAL) {
result_config_cie.ch_mode = A2DP_SBC_IE_CH_MD_DUAL;
codec_capability_.channel_mode = codec_user_config_.channel_mode;
codec_config_.channel_mode = codec_user_config_.channel_mode;
+ break;
}
break;
case BTAV_A2DP_CODEC_CHANNEL_MODE_NONE:
@@ -1325,7 +1326,7 @@
}
if (ch_mode & A2DP_SBC_IE_CH_MD_DUAL) {
codec_selectable_capability_.channel_mode |=
- BTAV_A2DP_CODEC_CHANNEL_MODE_DUAL_CHANNEL;
+ BTAV_A2DP_CODEC_CHANNEL_MODE_STEREO;
}
if (codec_config_.channel_mode != BTAV_A2DP_CODEC_CHANNEL_MODE_NONE) break;
@@ -1333,11 +1334,10 @@
// Compute the common capability
if (ch_mode & A2DP_SBC_IE_CH_MD_MONO)
codec_capability_.channel_mode |= BTAV_A2DP_CODEC_CHANNEL_MODE_MONO;
- if (ch_mode & (A2DP_SBC_IE_CH_MD_JOINT | A2DP_SBC_IE_CH_MD_STEREO)) {
+ if (ch_mode & (A2DP_SBC_IE_CH_MD_JOINT | A2DP_SBC_IE_CH_MD_STEREO |
+ A2DP_SBC_IE_CH_MD_DUAL)) {
codec_capability_.channel_mode |= BTAV_A2DP_CODEC_CHANNEL_MODE_STEREO;
}
- if (ch_mode & A2DP_SBC_IE_CH_MD_DUAL)
- codec_capability_.channel_mode |= BTAV_A2DP_CODEC_CHANNEL_MODE_DUAL_CHANNEL;
// No user preference - use the codec audio config
if (select_audio_channel_mode(&codec_audio_config_, ch_mode,
@@ -1540,7 +1540,7 @@
}
if (ch_mode & A2DP_SBC_IE_CH_MD_DUAL) {
codec_selectable_capability_.channel_mode |=
- BTAV_A2DP_CODEC_CHANNEL_MODE_DUAL_CHANNEL;
+ BTAV_A2DP_CODEC_CHANNEL_MODE_STEREO;
}
status = A2DP_BuildInfoSbc(AVDT_MEDIA_TYPE_AUDIO, &peer_info_cie,
diff --git a/stack/a2dp/a2dp_sbc_encoder.cc b/stack/a2dp/a2dp_sbc_encoder.cc
index ddcd1f8..5773462 100644
--- a/stack/a2dp/a2dp_sbc_encoder.cc
+++ b/stack/a2dp/a2dp_sbc_encoder.cc
@@ -33,7 +33,6 @@
#include "embdrv/sbc/encoder/include/sbc_encoder.h"
#include "osi/include/log.h"
#include "osi/include/osi.h"
-#include "osi/include/properties.h"
/* Buffer pool */
#define A2DP_SBC_BUFFER_SIZE BT_DEFAULT_BUFFER_SIZE
@@ -41,38 +40,15 @@
// A2DP SBC encoder interval in milliseconds.
#define A2DP_SBC_ENCODER_INTERVAL_MS 20
-/*
- * Higher quality setting. 492 kbps @ 48 khz, 452 kbps @ 44.1 khz.
- * Up to 4 frames for 2DH5, 6 frames for 3DH5.
- */
-#define A2DP_SBC_DEFAULT_BITRATE 454
-#define A2DP_SBC_48KHZ_BITRATE 494
-
-/*
- * SBC Dual Channel (SBC HD) 3DH5 bitrates.
- * 600 kbps @ 48 khz, 551.3 kbps @ 44.1 khz.
- * Up to 5 frames for 3DH5.
- */
-#define A2DP_SBC_3DH5_DEFAULT_BITRATE 552
-#define A2DP_SBC_3DH5_48KHZ_BITRATE 601
-
-/*
- * SBC Dual Channel (SBC HD) 2DH5 alternative bitrates.
- * 648 kbps @ 48 khz, 595.4 kbps @ 44.1 khz.
- * Up to 3 frames for 2DH5.
- */
-#define A2DP_SBC_2DH5_ALT_BITRATE 596
-#define A2DP_SBC_2DH5_ALT_48KHZ_BITRATE 649
-
-// SBC HD alternative bitrate property
-#define A2DP_SBC_HD_PROP "persist.bluetooth.sbc_hd_higher_bitrate"
+/* High quality quality setting @ 44.1 khz */
+#define A2DP_SBC_DEFAULT_BITRATE 328
#define A2DP_SBC_NON_EDR_MAX_RATE 229
#define A2DP_SBC_MAX_PCM_ITER_NUM_PER_TICK 3
-#define A2DP_SBC_MAX_HQ_FRAME_SIZE_44_1 165
-#define A2DP_SBC_MAX_HQ_FRAME_SIZE_48 165
+#define A2DP_SBC_MAX_HQ_FRAME_SIZE_44_1 119
+#define A2DP_SBC_MAX_HQ_FRAME_SIZE_48 115
/* Define the bitrate step when trying to match bitpool value */
#define A2DP_SBC_BITRATE_STEP 5
@@ -872,25 +848,6 @@
static uint16_t a2dp_sbc_source_rate() {
uint16_t rate = A2DP_SBC_DEFAULT_BITRATE;
- if (a2dp_sbc_encoder_cb.sbc_encoder_params.s16SamplingFreq == SBC_sf48000)
- rate = A2DP_SBC_48KHZ_BITRATE;
-
- /* 3DH5 maximum bitrates */
- if (a2dp_sbc_encoder_cb.peer_supports_3mbps &&
- a2dp_sbc_encoder_cb.TxAaMtuSize >= MIN_3MBPS_AVDTP_SAFE_MTU) {
- rate = A2DP_SBC_3DH5_DEFAULT_BITRATE;
- if (a2dp_sbc_encoder_cb.sbc_encoder_params.s16SamplingFreq == SBC_sf48000)
- rate = A2DP_SBC_3DH5_48KHZ_BITRATE;
- }
-
- /* 2DH5 alternative bitrates */
- if (!a2dp_sbc_encoder_cb.peer_supports_3mbps &&
- osi_property_get_int32(A2DP_SBC_HD_PROP, 0)) {
- rate = A2DP_SBC_2DH5_ALT_BITRATE;
- if (a2dp_sbc_encoder_cb.sbc_encoder_params.s16SamplingFreq == SBC_sf48000)
- rate = A2DP_SBC_2DH5_ALT_48KHZ_BITRATE;
- }
-
/* restrict bitrate if a2dp link is non-edr */
if (!a2dp_sbc_encoder_cb.is_peer_edr) {
rate = A2DP_SBC_NON_EDR_MAX_RATE;
diff --git a/stack/a2dp/a2dp_vendor.cc b/stack/a2dp/a2dp_vendor.cc
index 804fcc9..bcea13d 100644
--- a/stack/a2dp/a2dp_vendor.cc
+++ b/stack/a2dp/a2dp_vendor.cc
@@ -595,14 +595,10 @@
return A2DP_VendorCodecIndexStrAptx();
case BTAV_A2DP_CODEC_INDEX_SOURCE_APTX_HD:
return A2DP_VendorCodecIndexStrAptxHd();
- case BTAV_A2DP_CODEC_INDEX_SOURCE_APTX_ADAPTIVE:
- break;
case BTAV_A2DP_CODEC_INDEX_SOURCE_LDAC:
return A2DP_VendorCodecIndexStrLdac();
case BTAV_A2DP_CODEC_INDEX_SINK_LDAC:
return A2DP_VendorCodecIndexStrLdacSink();
- case BTAV_A2DP_CODEC_INDEX_SOURCE_APTX_TWS:
- break;
// Add a switch statement for each vendor-specific codec
case BTAV_A2DP_CODEC_INDEX_MAX:
break;
@@ -624,14 +620,10 @@
return A2DP_VendorInitCodecConfigAptx(p_cfg);
case BTAV_A2DP_CODEC_INDEX_SOURCE_APTX_HD:
return A2DP_VendorInitCodecConfigAptxHd(p_cfg);
- case BTAV_A2DP_CODEC_INDEX_SOURCE_APTX_ADAPTIVE:
- break;
case BTAV_A2DP_CODEC_INDEX_SOURCE_LDAC:
return A2DP_VendorInitCodecConfigLdac(p_cfg);
case BTAV_A2DP_CODEC_INDEX_SINK_LDAC:
return A2DP_VendorInitCodecConfigLdacSink(p_cfg);
- case BTAV_A2DP_CODEC_INDEX_SOURCE_APTX_TWS:
- break;
// Add a switch statement for each vendor-specific codec
case BTAV_A2DP_CODEC_INDEX_MAX:
break;
diff --git a/stack/a2dp/a2dp_vendor_aptx.cc b/stack/a2dp/a2dp_vendor_aptx.cc
index 62c1da9..e3e844d 100644
--- a/stack/a2dp/a2dp_vendor_aptx.cc
+++ b/stack/a2dp/a2dp_vendor_aptx.cc
@@ -611,7 +611,6 @@
return true;
}
break;
- case BTAV_A2DP_CODEC_CHANNEL_MODE_DUAL_CHANNEL:
case BTAV_A2DP_CODEC_CHANNEL_MODE_NONE:
break;
}
@@ -813,7 +812,6 @@
codec_config_.channel_mode = codec_user_config_.channel_mode;
}
break;
- case BTAV_A2DP_CODEC_CHANNEL_MODE_DUAL_CHANNEL:
case BTAV_A2DP_CODEC_CHANNEL_MODE_NONE:
codec_capability_.channel_mode = BTAV_A2DP_CODEC_CHANNEL_MODE_NONE;
codec_config_.channel_mode = BTAV_A2DP_CODEC_CHANNEL_MODE_NONE;
diff --git a/stack/a2dp/a2dp_vendor_aptx_hd.cc b/stack/a2dp/a2dp_vendor_aptx_hd.cc
index 36e3530..9e19d5f 100644
--- a/stack/a2dp/a2dp_vendor_aptx_hd.cc
+++ b/stack/a2dp/a2dp_vendor_aptx_hd.cc
@@ -629,7 +629,6 @@
return true;
}
break;
- case BTAV_A2DP_CODEC_CHANNEL_MODE_DUAL_CHANNEL:
case BTAV_A2DP_CODEC_CHANNEL_MODE_NONE:
break;
}
@@ -832,7 +831,6 @@
codec_config_.channel_mode = codec_user_config_.channel_mode;
}
break;
- case BTAV_A2DP_CODEC_CHANNEL_MODE_DUAL_CHANNEL:
case BTAV_A2DP_CODEC_CHANNEL_MODE_NONE:
codec_capability_.channel_mode = BTAV_A2DP_CODEC_CHANNEL_MODE_NONE;
codec_config_.channel_mode = BTAV_A2DP_CODEC_CHANNEL_MODE_NONE;
diff --git a/stack/a2dp/a2dp_vendor_ldac.cc b/stack/a2dp/a2dp_vendor_ldac.cc
index f2617e2..0a1017c 100644
--- a/stack/a2dp/a2dp_vendor_ldac.cc
+++ b/stack/a2dp/a2dp_vendor_ldac.cc
@@ -942,7 +942,6 @@
return true;
}
break;
- case BTAV_A2DP_CODEC_CHANNEL_MODE_DUAL_CHANNEL:
case BTAV_A2DP_CODEC_CHANNEL_MODE_NONE:
break;
}
@@ -1223,7 +1222,6 @@
break;
}
break;
- case BTAV_A2DP_CODEC_CHANNEL_MODE_DUAL_CHANNEL:
case BTAV_A2DP_CODEC_CHANNEL_MODE_NONE:
codec_capability_.channel_mode = BTAV_A2DP_CODEC_CHANNEL_MODE_NONE;
codec_config_.channel_mode = BTAV_A2DP_CODEC_CHANNEL_MODE_NONE;
diff --git a/stack/include/avdt_api.h b/stack/include/avdt_api.h
index e62a960..09e7f7c 100644
--- a/stack/include/avdt_api.h
+++ b/stack/include/avdt_api.h
@@ -73,7 +73,6 @@
#define MAX_2MBPS_AVDTP_MTU 663 // 2DH5 MTU=679, -12 for AVDTP, -4 for L2CAP
#define MAX_3MBPS_AVDTP_MTU 1005 // 3DH5 MTU=1021, -12 for AVDTP, -4 for L2CAP
-#define MIN_3MBPS_AVDTP_SAFE_MTU 801 // 3DH5 minimum safe payload size for 4 audio frames
/* SEP Type. This indicates the stream endpoint type. */
#define AVDT_TSEP_SRC 0 /* Source SEP */
diff --git a/stack/test/stack_a2dp_test.cc b/stack/test/stack_a2dp_test.cc
index bfe20c1..fecb3ca 100644
--- a/stack/test/stack_a2dp_test.cc
+++ b/stack/test/stack_a2dp_test.cc
@@ -172,8 +172,6 @@
static const char* APTX_ENCODER_LIB_NAME = "libaptX_encoder.so";
static const char* APTX_HD_ENCODER_LIB_NAME = "libaptXHD_encoder.so";
-static const char* APTX_ADAPTIVE_ENCODER_LIB_NAME = "libaptXAdaptive_encoder.so";
-static const char* APTX_TWS_ENCODER_LIB_NAME = "libaptXTws_encoder.so";
static const char* LDAC_ENCODER_LIB_NAME = "libldacBT_enc.so";
static const char* LDAC_DECODER_LIB_NAME = "libldacBT_dec.so";
@@ -215,21 +213,11 @@
// shared library installed.
supported = has_shared_library(APTX_HD_ENCODER_LIB_NAME);
break;
- case BTAV_A2DP_CODEC_INDEX_SOURCE_APTX_ADAPTIVE:
- // Codec aptX-HD is supported only if the device has the corresponding
- // shared library installed.
- supported = has_shared_library(APTX_ADAPTIVE_ENCODER_LIB_NAME);
- break;
case BTAV_A2DP_CODEC_INDEX_SOURCE_LDAC:
// Codec LDAC is supported only if the device has the corresponding
// shared library installed.
supported = has_shared_library(LDAC_ENCODER_LIB_NAME);
break;
- case BTAV_A2DP_CODEC_INDEX_SOURCE_APTX_TWS:
- // Codec aptX-TWS is supported only if the device has the corresponding
- // shared library installed.
- supported = has_shared_library(APTX_TWS_ENCODER_LIB_NAME);
- break;
case BTAV_A2DP_CODEC_INDEX_SINK_SBC:
supported = true;
break;
diff --git a/test/suite/gatt/gatt_unittest.cc b/test/suite/gatt/gatt_unittest.cc
index e91e7f6..b02c96a 100644
--- a/test/suite/gatt/gatt_unittest.cc
+++ b/test/suite/gatt/gatt_unittest.cc
@@ -27,7 +27,7 @@
TEST_F(GattTest, GattClientRegister) {
// Registers gatt client.
bluetooth::Uuid gatt_client_uuid = bluetooth::Uuid::GetRandom();
- gatt_client_interface()->register_client(gatt_client_uuid, false);
+ gatt_client_interface()->register_client(gatt_client_uuid);
semaphore_wait(register_client_callback_sem_);
EXPECT_TRUE(status() == BT_STATUS_SUCCESS)
<< "Error registering GATT client app callback.";
@@ -39,7 +39,7 @@
TEST_F(GattTest, GattServerRegister) {
// Registers gatt server.
bluetooth::Uuid gatt_server_uuid = bluetooth::Uuid::GetRandom();
- gatt_server_interface()->register_server(gatt_server_uuid, false);
+ gatt_server_interface()->register_server(gatt_server_uuid);
semaphore_wait(register_server_callback_sem_);
EXPECT_TRUE(status() == BT_STATUS_SUCCESS)
<< "Error registering GATT server app callback.";
@@ -51,7 +51,7 @@
TEST_F(GattTest, GattServerBuild) {
// Registers gatt server.
bluetooth::Uuid gatt_server_uuid = bluetooth::Uuid::GetRandom();
- gatt_server_interface()->register_server(gatt_server_uuid, false);
+ gatt_server_interface()->register_server(gatt_server_uuid);
semaphore_wait(register_server_callback_sem_);
EXPECT_TRUE(status() == BT_STATUS_SUCCESS)
<< "Error registering GATT server app callback.";