summaryrefslogtreecommitdiffstats
path: root/jni
diff options
context:
space:
mode:
authorGaurav Asati <gasati@codeaurora.org>2015-08-11 12:07:45 +0530
committerLinux Build Service Account <lnxbuild@localhost>2015-10-06 03:25:52 -0600
commite9b5ace257010e5b6dc325159a980f09a6437630 (patch)
tree5f0caeadcf9be3079026b48e22acf3effd165992 /jni
parentbc5700f34a1a892e8a76d1bbbd6cf06596ebd5e6 (diff)
downloadandroid_packages_apps_Bluetooth-e9b5ace257010e5b6dc325159a980f09a6437630.tar.gz
android_packages_apps_Bluetooth-e9b5ace257010e5b6dc325159a980f09a6437630.tar.bz2
android_packages_apps_Bluetooth-e9b5ace257010e5b6dc325159a980f09a6437630.zip
Bluetooth: Update Connected Icon properly.
- add connected device list to maintain connection status for each device. - add device when state has changed to connected - for fake broadcast check device in list before adding - remove device when disconnect is broadcast for device - cleanup device list when bt is turned off. Change-Id: I2236a0fcab884fbf5134fbc67e05d27d5a6e837f CRs-Fixed: 722184 Bluetooth: Proper update of the tracknumber and initialize - Proper update of the tracknumber. - initialize mCurrentPosMs with -1L. - when music app does not send current track position -1L should be sent when requested by remote. Change-Id: Ie424a8de27cd1eca8bed332295977a3f952a6d2a CRs-Fixed: 775209 Add device to blacklist. - add Roman 9020 Headset to black-list - add Bose HS to black-list Change-Id: I715b6f616346b9c58a3061c2495da6325dcb8377 Change-Id: Ifde711b4a01ed602c7d8be9771930e24d9df0671
Diffstat (limited to 'jni')
-rw-r--r--jni/com_android_bluetooth_avrcp.cpp5
1 files changed, 2 insertions, 3 deletions
diff --git a/jni/com_android_bluetooth_avrcp.cpp b/jni/com_android_bluetooth_avrcp.cpp
index 701679853..4983221c9 100644
--- a/jni/com_android_bluetooth_avrcp.cpp
+++ b/jni/com_android_bluetooth_avrcp.cpp
@@ -81,14 +81,13 @@ static void btavrcp_remote_features_callback(bt_bdaddr_t* bd_addr, btrc_remote_f
return;
}
+ sCallbackEnv->SetByteArrayRegion(addr, 0, sizeof(bt_bdaddr_t), (jbyte*) bd_addr);
if (mCallbacksObj) {
- sCallbackEnv->SetByteArrayRegion(addr, 0, sizeof(bt_bdaddr_t), (jbyte*) bd_addr);
sCallbackEnv->CallVoidMethod(mCallbacksObj, method_getRcFeatures, addr,
(jint)features, addr);
} else {
ALOGE("%s: mCallbacksObj is null", __FUNCTION__);
}
-
checkAndClearExceptionFromCallback(sCallbackEnv, __FUNCTION__);
sCallbackEnv->DeleteLocalRef(addr);
@@ -1834,7 +1833,7 @@ static jboolean getItemAttrRspNative(JNIEnv *env, jobject object, jbyte numAttr,
pAttrs[i].attr_id = attr[i];
if (utfStringLength >= BTRC_MAX_ATTR_STR_LEN) {
ALOGE("get_item_attr_rsp: string length exceed maximum");
- strlcpy((char *)pAttrs[i].text, textStr, BTRC_MAX_ATTR_STR_LEN-1);
+ strlcpy((char *)pAttrs[i].text, textStr, BTRC_MAX_ATTR_STR_LEN);
pAttrs[i].text[BTRC_MAX_ATTR_STR_LEN-1] = 0;
} else {
strlcpy((char *)pAttrs[i].text, textStr, utfStringLength + 1);