Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Add check for null name on SCO connect"

Browse Source
This commit is contained in:
Eric Olsen
2010-03-19 14:51:53 -07:00
committed by Android (Google) Code Review
parent a0a59122eb aa0071d11b
commit db129b886f
1 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
core/jni/android_bluetooth_ScoSocket.cpp
View File

@@ -404,11 +404,15 @@ static jboolean connectNative(JNIEnv *env, jobject object, jstring address,
env->ReleaseStringUTFChars(address, c_address);
data->is_accept = false;
c_name = env->GetStringUTFChars(name, NULL);
/* See if this device is in the black list */
data->sco_pkt_type = getScoType(data->address, c_name);
env->ReleaseStringUTFChars(name, c_name);
if (name == NULL) {
LOGE("%s: Null pointer passed in for device name", __FUNCTION__);
data->sco_pkt_type = 0;
} else {
c_name = env->GetStringUTFChars(name, NULL);
/* See if this device is in the black list */
data->sco_pkt_type = getScoType(data->address, c_name);
env->ReleaseStringUTFChars(name, c_name);
}
if (pthread_create(&thread, NULL, &work_thread, (void *)data) < 0) {
LOGE("%s: pthread_create() failed: %s", __FUNCTION__, strerror(errno));
return JNI_FALSE;