summaryrefslogtreecommitdiffstats
path: root/jni/com_android_bluetooth_a2dp.cpp
diff options
context:
space:
mode:
authorMatthew Xie <mattx@google.com>2012-06-05 23:57:59 -0700
committerAndroid (Google) Code Review <android-gerrit@google.com>2012-07-16 22:11:46 -0700
commite469f16e5a7d99471d7db1b216d422e8d12cc4cf (patch)
tree02be55a2b8a8263881dda1402499f32eedc71e10 /jni/com_android_bluetooth_a2dp.cpp
parent179fd2512d1a93bbd2a1a3803f5764cb417fe4c9 (diff)
downloadandroid_packages_apps_Bluetooth-e469f16e5a7d99471d7db1b216d422e8d12cc4cf.tar.gz
android_packages_apps_Bluetooth-e469f16e5a7d99471d7db1b216d422e8d12cc4cf.tar.bz2
android_packages_apps_Bluetooth-e469f16e5a7d99471d7db1b216d422e8d12cc4cf.zip
matt: my fix to get it compile, change logx to alogx, and etc
Change-Id: I0b361ad6ba9a5f6ac4db9203a389ee309b04019a
Diffstat (limited to 'jni/com_android_bluetooth_a2dp.cpp')
-rw-r--r--jni/com_android_bluetooth_a2dp.cpp18
1 files changed, 9 insertions, 9 deletions
diff --git a/jni/com_android_bluetooth_a2dp.cpp b/jni/com_android_bluetooth_a2dp.cpp
index 1dbbd6149..10c69b8b9 100644
--- a/jni/com_android_bluetooth_a2dp.cpp
+++ b/jni/com_android_bluetooth_a2dp.cpp
@@ -60,15 +60,15 @@ static void bta2dp_connection_state_callback(btav_connection_state_t state, bt_b
static void bta2dp_audio_state_callback(btav_audio_state_t state, bt_bdaddr_t* bd_addr) {
jbyteArray addr;
- LOGI("%s", __FUNCTION__);
+ ALOGI("%s", __FUNCTION__);
if (!checkCallbackThread()) { \
- LOGE("Callback: '%s' is not called on the correct thread", __FUNCTION__); \
+ ALOGE("Callback: '%s' is not called on the correct thread", __FUNCTION__); \
return; \
}
addr = sCallbackEnv->NewByteArray(sizeof(bt_bdaddr_t));
if (!addr) {
- LOGE("Fail to new jbyteArray bd addr for connection state");
+ ALOGE("Fail to new jbyteArray bd addr for connection state");
checkAndClearExceptionFromCallback(sCallbackEnv, __FUNCTION__);
return;
}
@@ -126,30 +126,30 @@ static void initNative(JNIEnv *env, jobject object) {
bt_status_t status;
if ( (btInf = getBluetoothInterface()) == NULL) {
- LOGE("Bluetooth module is not loaded");
+ ALOGE("Bluetooth module is not loaded");
return;
}
if (sBluetoothA2dpInterface !=NULL) {
- LOGW("Cleaning up A2DP Interface before initializing...");
+ ALOGW("Cleaning up A2DP Interface before initializing...");
sBluetoothA2dpInterface->cleanup();
sBluetoothA2dpInterface = NULL;
}
if (mCallbacksObj != NULL) {
- LOGW("Cleaning up A2DP callback object");
+ ALOGW("Cleaning up A2DP callback object");
env->DeleteGlobalRef(mCallbacksObj);
mCallbacksObj = NULL;
}
if ( (sBluetoothA2dpInterface = (btav_interface_t *)
btInf->get_profile_interface(BT_PROFILE_ADVANCED_AUDIO_ID)) == NULL) {
- LOGE("Failed to get Bluetooth A2DP Interface");
+ ALOGE("Failed to get Bluetooth A2DP Interface");
return;
}
if ( (status = sBluetoothA2dpInterface->init(&sBluetoothA2dpCallbacks)) != BT_STATUS_SUCCESS) {
- LOGE("Failed to initialize Bluetooth A2DP, status: %d", status);
+ ALOGE("Failed to initialize Bluetooth A2DP, status: %d", status);
sBluetoothA2dpInterface = NULL;
return;
}
@@ -162,7 +162,7 @@ static void cleanupNative(JNIEnv *env, jobject object) {
bt_status_t status;
if ( (btInf = getBluetoothInterface()) == NULL) {
- LOGE("Bluetooth module is not loaded");
+ ALOGE("Bluetooth module is not loaded");
return;
}