Merge 56cbb802df3767d76f1d11f424296de1c0a7760f on remote branch
Change-Id: Ia5a2d4e19e221caa8becbb6ff1b13e99ab7646f9
diff --git a/packages_apps_bluetooth_ext/jni/com_android_bluetooth_btservice_vendor.cpp b/packages_apps_bluetooth_ext/jni/com_android_bluetooth_btservice_vendor.cpp
index f3acfc5..d78f0c8 100644
--- a/packages_apps_bluetooth_ext/jni/com_android_bluetooth_btservice_vendor.cpp
+++ b/packages_apps_bluetooth_ext/jni/com_android_bluetooth_btservice_vendor.cpp
@@ -526,6 +526,21 @@
return swb_pm_supported;
}
+static jboolean setClockSyncConfigNative(JNIEnv* env, jobject object, jboolean enable, jint mode,
+ jint adv_interval, jint channel, jint jitter, jint offset)
+{
+ if (!sBluetoothVendorInterface) return false;
+ return (jboolean)sBluetoothVendorInterface->set_clock_sync_config(enable, mode, adv_interval,
+ channel, jitter, offset);
+}
+
+static jboolean startClockSyncNative(JNIEnv* env)
+{
+ if (!sBluetoothVendorInterface) return false;
+ sBluetoothVendorInterface->start_clock_sync();
+ return true;
+}
+
static JNINativeMethod sMethods[] = {
{"classInitNative", "()V", (void *) classInitNative},
{"initNative", "()V", (void *) initNative},
@@ -544,6 +559,8 @@
{"isSplitA2dpEnabledNative", "()Z", (void*) isSplitA2dpEnabledNative},
{"isSwbEnabledNative", "()Z", (void*) isSwbEnabledNative},
{"isSwbPmEnabledNative", "()Z", (void*) isSwbPmEnabledNative},
+ {"setClockSyncConfigNative", "(ZIIIII)Z", (void*) setClockSyncConfigNative},
+ {"startClockSyncNative", "()Z", (void*) startClockSyncNative},
};
int load_bt_configstore_lib() {
diff --git a/packages_apps_bluetooth_ext/src/avrcp/Avrcp_ext.java b/packages_apps_bluetooth_ext/src/avrcp/Avrcp_ext.java
index 710afbb..9dab1b3 100644
--- a/packages_apps_bluetooth_ext/src/avrcp/Avrcp_ext.java
+++ b/packages_apps_bluetooth_ext/src/avrcp/Avrcp_ext.java
@@ -91,6 +91,7 @@
import java.util.Objects;
import com.android.bluetooth.hfp.HeadsetService;
import java.util.Arrays;
+import java.util.concurrent.ConcurrentHashMap;
/******************************************************************************
* support Bluetooth AVRCP profile. support metadata, play status, event
* notifications, address player selection and browse feature implementation.
@@ -4834,7 +4835,7 @@
}
public class AvrcpBrowseManager {
- Map<String, BrowsedMediaPlayer_ext> connList = new HashMap<String, BrowsedMediaPlayer_ext>();
+ Map<String, BrowsedMediaPlayer_ext> connList = new ConcurrentHashMap<String, BrowsedMediaPlayer_ext>();
private AvrcpMediaRspInterface_ext mMediaInterface;
private Context mContext;
diff --git a/packages_apps_bluetooth_ext/src/btservice/Vendor.java b/packages_apps_bluetooth_ext/src/btservice/Vendor.java
index 31338db..cd5dab1 100644
--- a/packages_apps_bluetooth_ext/src/btservice/Vendor.java
+++ b/packages_apps_bluetooth_ext/src/btservice/Vendor.java
@@ -295,6 +295,24 @@
public boolean isSwbPmEnabled() {
return isSwbPmEnabled;
}
+
+ public boolean setClockSyncConfig(boolean enable, int mode, int adv_interval,
+ int channel, int jitter, int offset) {
+ if (mode != 0 && mode != 1) {
+ Log.e(TAG, "invalid mode setting(0: GPIO, 1: VSC) " + mode);
+ return false;
+ }
+ Log.d(TAG, "enable: " + enable + "mode: " + mode + "adv_interval: " +
+ adv_interval + "channel: " + channel + "jitter: " + jitter +
+ "offset: " + offset);
+ return setClockSyncConfigNative(enable, mode, adv_interval, channel,
+ jitter, offset);
+ }
+
+ public boolean startClockSync() {
+ return startClockSyncNative();
+ }
+
private native void bredrcleanupNative();
private native void bredrstartupNative();
private native void initNative();
@@ -311,4 +329,7 @@
private native boolean isSplitA2dpEnabledNative();
private native boolean isSwbEnabledNative();
private native boolean isSwbPmEnabledNative();
+ private native boolean setClockSyncConfigNative(boolean enable, int mode, int adv_interval,
+ int channel, int jitter, int offset);
+ private native boolean startClockSyncNative();
}
diff --git a/system_bt_ext/btif/src/btif_ba.cc b/system_bt_ext/btif/src/btif_ba.cc
index 4ee9219..982b3f7 100644
--- a/system_bt_ext/btif/src/btif_ba.cc
+++ b/system_bt_ext/btif/src/btif_ba.cc
@@ -739,7 +739,9 @@
// this command.
case BTIF_BA_API_SET_VOL_LEVEL:
btif_ba_cb.curr_vol_level = *((uint8_t*)p_data);
- //memorize_msg(event, BTIF_BA_STATE_PENDING_AUDIO_NS);
+ BTIF_TRACE_DEBUG("%s: curr_vol_level: %d",
+ __FUNCTION__, btif_ba_cb.curr_vol_level);
+ memorize_msg(event, BTIF_BA_STATE_PENDING_AUDIO_NS);
break;
case BTIF_BA_CMD_PAUSE_REQ_EVT:
if (*((uint8_t*)p_data))
@@ -962,7 +964,12 @@
NULL);
break;
case BTIF_BA_API_SET_VOL_LEVEL:
- btif_ba_cb.curr_vol_level = *((uint8_t*)p_data);
+ if (p_data != NULL) {
+ btif_ba_cb.curr_vol_level = *((uint8_t*)p_data);
+ } else {
+ BTIF_TRACE_DEBUG("%s: p_data is null, curr_vol_level: %d",
+ __FUNCTION__, btif_ba_cb.curr_vol_level);
+ }
btif_sm_change_state(btif_ba_cb.sm_handle,
BTIF_BA_STATE_PENDING_AUDIO_NS);
btif_sm_dispatch(btif_ba_cb.sm_handle, BTIF_BA_CMD_SEND_VOL_UPDATE,
diff --git a/system_bt_ext/btif/src/btif_vendor.cc b/system_bt_ext/btif/src/btif_vendor.cc
index 208444f..23fd5eb 100644
--- a/system_bt_ext/btif/src/btif_vendor.cc
+++ b/system_bt_ext/btif/src/btif_vendor.cc
@@ -465,6 +465,112 @@
/*******************************************************************************
**
+** Function clock_sync_cback
+**
+** Description callback function for set_clock_sync_config and start_clock_sync
+**
+** Returns None
+**
+*******************************************************************************/
+static void clock_sync_cback(tBTM_VSC_CMPL *param)
+{
+ CHECK(param->param_len > 1);
+
+ BTIF_TRACE_DEBUG("%s: opcode=%x, subopcode=%x, status=%d",
+ __func__, param->opcode, param->p_param_buf[1], param->p_param_buf[0]);
+}
+
+/*******************************************************************************
+**
+** Function set_clock_sync_config
+**
+** Description Enable/Disable clock sync protocol and config clock sync paramters
+**
+** enable : 0 - disable, 1 -enable
+** mode : 0x00 - GPIO sync, 0x01 - VSC sync
+** adv_internal : advertising interval, 0xA0 ~ 0x4000
+** channel : BIT0: channel 37, BIT1: channel 38, BIT2: channel 39
+** jitter : 0~8, 0 - random jitter, other - (jitter-1)*1.25
+** offset : -32768~32767us, timing between sync pulse and advert,
+** Positive value move the sync edge close to the advert
+** and therefore make the offset smaller.
+**
+** Return None
+**
+*******************************************************************************/
+static bool set_clock_sync_config(bool enable, int mode, int adv_interval,
+ int channel, int jitter, int offset)
+{
+ uint16_t opcode = 0xfc35;
+ uint8_t cmdbuf[128], *ptr = cmdbuf;
+ uint32_t cmdlen = 0;
+
+ BTIF_TRACE_DEBUG("%s", __func__);
+ if (mode != 0 && mode != 1) {
+ BTIF_TRACE_DEBUG("%s: invalid mode %d", __func__, mode);
+ return false;
+ }
+
+ *ptr++ = (uint8_t)0; // subcode
+ cmdlen ++;
+
+ *ptr++ = (uint8_t) enable; // enable
+ cmdlen ++;
+
+ *ptr++ = (uint8_t) mode; // mode - 00: GPIO, 1: VSC
+ cmdlen ++;
+
+ if (adv_interval < 0xa0)
+ adv_interval = 0xa0;
+ if (adv_interval > 0x4000)
+ adv_interval = 0x4000;
+ *(uint16_t *)ptr = (uint16_t) adv_interval; // advertise interval
+ ptr +=2;
+ cmdlen += 2;
+
+ channel &= 0x7;
+ *ptr++ = (uint8_t) channel; // channel
+ cmdlen ++;
+
+ if (jitter < 0)
+ jitter = 0;
+ if (jitter > 8)
+ jitter = 8;
+ *ptr++ = (uint8_t) jitter; // jitter
+ cmdlen ++;
+
+ if (offset < -32768)
+ offset = -32768;
+ if (offset > 32767)
+ offset = 32767;
+ *(uint16_t *)ptr = (uint16_t) offset; // offset
+ ptr += 2;
+ cmdlen += 2;
+
+ BTM_VendorSpecificCommand(opcode, cmdlen, cmdbuf, clock_sync_cback);
+ return true;
+}
+
+/*******************************************************************************
+**
+** Function start_clock_sync
+**
+** Description start clock sync
+**
+** Return None
+**
+*******************************************************************************/
+static void start_clock_sync(void)
+{
+ uint16_t opcode = 0xfc35;
+ uint8_t cmdbuf[] = {0x01}; // subcode
+
+ BTIF_TRACE_DEBUG("%s", __func__);
+ BTM_VendorSpecificCommand(opcode, 1, cmdbuf, clock_sync_cback);
+}
+
+/*******************************************************************************
+**
** Function get_testapp_interface
**
** Description Get the Test interface
@@ -515,6 +621,8 @@
cleanup,
voip_network_type_wifi,
hciclose,
+ set_clock_sync_config,
+ start_clock_sync,
};
/*******************************************************************************
diff --git a/vhal/include/hardware/vendor.h b/vhal/include/hardware/vendor.h
index 4ba6ac6..6afb556 100644
--- a/vhal/include/hardware/vendor.h
+++ b/vhal/include/hardware/vendor.h
@@ -214,6 +214,12 @@
bthf_voip_call_network_type_t is_network_wifi);
void (*hciclose)(void);
+ /** enable/disable clock sync protocol */
+ bool (*set_clock_sync_config)(bool enable, int mode, int adv_interval,
+ int channel, int jitter, int offset);
+
+ /** start clock sync protocol */
+ void (*start_clock_sync)(void);
} btvendor_interface_t;