Merge "compiler based array initialization"
diff --git a/bta/hearing_aid/hearing_aid.cc b/bta/hearing_aid/hearing_aid.cc
index a96d9de..885c062 100644
--- a/bta/hearing_aid/hearing_aid.cc
+++ b/bta/hearing_aid/hearing_aid.cc
@@ -171,6 +171,24 @@
g722_encode_state_t* encoder_state_left = nullptr;
g722_encode_state_t* encoder_state_right = nullptr;
+inline void encoder_state_init() {
+ if (encoder_state_left != nullptr) {
+ LOG(WARNING) << __func__ << ": encoder already initialized";
+ return;
+ }
+ encoder_state_left = g722_encode_init(nullptr, 64000, G722_PACKED);
+ encoder_state_right = g722_encode_init(nullptr, 64000, G722_PACKED);
+}
+
+inline void encoder_state_release() {
+ if (encoder_state_left != nullptr) {
+ g722_encode_release(encoder_state_left);
+ encoder_state_left = nullptr;
+ g722_encode_release(encoder_state_right);
+ encoder_state_right = nullptr;
+ }
+}
+
class HearingAidImpl : public HearingAid {
private:
// Keep track of whether the Audio Service has resumed audio playback
@@ -846,8 +864,7 @@
VLOG(0) << __func__ << ": device=" << hearingDevice.address;
if (encoder_state_left == nullptr) {
- encoder_state_left = g722_encode_init(nullptr, 64000, G722_PACKED);
- encoder_state_right = g722_encode_init(nullptr, 64000, G722_PACKED);
+ encoder_state_init();
seq_counter = 0;
// use the best codec avaliable for this pair of devices.
@@ -909,12 +926,8 @@
audio_running = true;
// TODO: shall we also reset the encoder ?
- if (encoder_state_left != nullptr) {
- g722_encode_release(encoder_state_left);
- g722_encode_release(encoder_state_right);
- }
- encoder_state_left = g722_encode_init(nullptr, 64000, G722_PACKED);
- encoder_state_right = g722_encode_init(nullptr, 64000, G722_PACKED);
+ encoder_state_release();
+ encoder_state_init();
seq_counter = 0;
for (auto& device : hearingDevices.devices) {
@@ -1002,12 +1015,7 @@
if (left == nullptr && right == nullptr) {
HearingAidAudioSource::Stop();
- if (encoder_state_left != nullptr) {
- g722_encode_release(encoder_state_left);
- encoder_state_left = nullptr;
- g722_encode_release(encoder_state_right);
- encoder_state_right = nullptr;
- }
+ encoder_state_release();
current_volume = VOLUME_UNKNOWN;
return;
}
@@ -1360,6 +1368,8 @@
}
hearingDevices.devices.clear();
+
+ encoder_state_release();
}
private:
diff --git a/bta/hf_client/bta_hf_client_main.cc b/bta/hf_client/bta_hf_client_main.cc
index 9bb8ab5..fac61c7 100644
--- a/bta/hf_client/bta_hf_client_main.cc
+++ b/bta/hf_client/bta_hf_client_main.cc
@@ -329,6 +329,8 @@
client_cb->state = BTA_HF_CLIENT_OPENING_ST;
tBTA_HF_CLIENT_DATA msg;
msg.hdr.layer_specific = client_cb->handle;
+ msg.api_open.bd_addr = client_cb->peer_addr;
+ msg.api_open.sec_mask = client_cb->cli_sec_mask;
bta_hf_client_start_open(&msg);
}
}
@@ -749,19 +751,14 @@
evt.bd_addr = client_cb->peer_addr;
if (client_cb->state == BTA_HF_CLIENT_INIT_ST) {
bta_hf_client_app_callback(BTA_HF_CLIENT_CLOSE_EVT, &evt);
+ APPL_TRACE_DEBUG("%s: marking CB handle %d to false", __func__, client_cb->handle);
+ client_cb->is_allocated = false;
} else if (client_cb->state == BTA_HF_CLIENT_OPEN_ST) {
evt.open.handle = client_cb->handle;
bta_hf_client_app_callback(BTA_HF_CLIENT_OPEN_EVT, &evt);
}
}
- /* if the next state is INIT then release the cb for future use */
- if (client_cb->state == BTA_HF_CLIENT_INIT_ST) {
- APPL_TRACE_DEBUG("%s: marking CB handle %d to false", __func__,
- client_cb->handle);
- client_cb->is_allocated = false;
- }
-
VLOG(2) << __func__ << ": device " << client_cb->peer_addr
<< "state change: [" << bta_hf_client_state_str(in_state) << "] -> ["
<< bta_hf_client_state_str(client_cb->state) << "] after Event ["
diff --git a/stack/l2cap/l2c_fcr.cc b/stack/l2cap/l2c_fcr.cc
index 6e8e34c..857a0bf 100644
--- a/stack/l2cap/l2c_fcr.cc
+++ b/stack/l2cap/l2c_fcr.cc
@@ -835,7 +835,16 @@
}
if (p_ccb->is_first_seg) {
+ if (p_buf->len < sizeof(sdu_length)) {
+ L2CAP_TRACE_ERROR("%s: buffer length=%d too small. Need at least 2.",
+ __func__, p_buf->len);
+ android_errorWriteWithInfoLog(0x534e4554, "120665616", -1, NULL, 0);
+ /* Discard the buffer */
+ osi_free(p_buf);
+ return;
+ }
STREAM_TO_UINT16(sdu_length, p);
+
/* Check the SDU Length with local MTU size */
if (sdu_length > p_ccb->local_conn_cfg.mtu) {
/* Discard the buffer */
@@ -844,6 +853,7 @@
}
p_buf->len -= sizeof(sdu_length);
+ p_buf->offset += sizeof(sdu_length);
if (sdu_length < p_buf->len) {
L2CAP_TRACE_ERROR("%s: Invalid sdu_length: %d", __func__, sdu_length);
@@ -863,7 +873,6 @@
p_data->len = 0;
p_ccb->ble_sdu_length = sdu_length;
L2CAP_TRACE_DEBUG("%s SDU Length = %d", __func__, sdu_length);
- p_buf->offset += sizeof(sdu_length);
p_data->offset = 0;
} else {
