Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b241cda1 authored by Brian Carlstrom's avatar Brian Carlstrom
Browse files

resolved conflicts for merge of c508483d to jb-mr2-dev 

Change-Id: I7f32e6dd98c3cc61030cded700587aa852c0fc0a
parent 03b8386d

jni/com_android_bluetooth_btservice_AdapterService.cpp

+84 −85
Original line number Diff line number Diff line
@@ -428,8 +428,7 @@ static void callback_thread_event(bt_cb_thread_evt event) { 
    if (event  == ASSOCIATE_JVM) {

        JavaVMAttachArgs args;

        char name[] = "BT Service Callback Thread";

        //TODO(BT)

        //args.version = nat->envVer;

        args.version = JNI_VERSION_1_6;

        args.name = name;

        args.group = NULL;

        vm->AttachCurrentThread(&callbackEnv, &args);
@@ -612,7 +611,7 @@ static jboolean createBondNative(JNIEnv* env, jobject obj, jbyteArray address) { 
    }



    int ret = sBluetoothInterface->create_bond((bt_bdaddr_t *)addr);

    env->ReleaseByteArrayElements(address, addr, NULL);

    env->ReleaseByteArrayElements(address, addr, 0);

    result = (ret == BT_STATUS_SUCCESS) ? JNI_TRUE : JNI_FALSE;



    return result;
@@ -632,7 +631,7 @@ static jboolean removeBondNative(JNIEnv* env, jobject obj, jbyteArray address) { 
    }



    int ret = sBluetoothInterface->remove_bond((bt_bdaddr_t *)addr);

    env->ReleaseByteArrayElements(address, addr, NULL);

    env->ReleaseByteArrayElements(address, addr, 0);

    result = (ret == BT_STATUS_SUCCESS) ? JNI_TRUE : JNI_FALSE;



    return result;
@@ -652,7 +651,7 @@ static jboolean cancelBondNative(JNIEnv* env, jobject obj, jbyteArray address) { 
    }



    int ret = sBluetoothInterface->cancel_bond((bt_bdaddr_t *)addr);

    env->ReleaseByteArrayElements(address, addr, NULL);

    env->ReleaseByteArrayElements(address, addr, 0);

    result = (ret == BT_STATUS_SUCCESS) ? JNI_TRUE : JNI_FALSE;



    return result;
@@ -676,15 +675,15 @@ static jboolean pinReplyNative(JNIEnv *env, jobject obj, jbyteArray address, jbo 
        pinPtr = env->GetByteArrayElements(pinArray, NULL);

        if (pinPtr == NULL) {

           jniThrowIOException(env, EINVAL);

           env->ReleaseByteArrayElements(address, addr, NULL);

           env->ReleaseByteArrayElements(address, addr, 0);

           return result;

        }

    }



    int ret = sBluetoothInterface->pin_reply((bt_bdaddr_t*)addr, accept, len,

                                              (bt_pin_code_t *) pinPtr);

    env->ReleaseByteArrayElements(address, addr, NULL);

    env->ReleaseByteArrayElements(pinArray, pinPtr, NULL);

    env->ReleaseByteArrayElements(address, addr, 0);

    env->ReleaseByteArrayElements(pinArray, pinPtr, 0);

    result = (ret == BT_STATUS_SUCCESS) ? JNI_TRUE : JNI_FALSE;



    return result;
@@ -706,7 +705,7 @@ static jboolean sspReplyNative(JNIEnv *env, jobject obj, jbyteArray address, 


    int ret = sBluetoothInterface->ssp_reply((bt_bdaddr_t *)addr,

         (bt_ssp_variant_t) type, accept, passkey);

    env->ReleaseByteArrayElements(address, addr, NULL);

    env->ReleaseByteArrayElements(address, addr, 0);

    result = (ret == BT_STATUS_SUCCESS) ? JNI_TRUE : JNI_FALSE;



    return result;
@@ -726,7 +725,7 @@ static jboolean setAdapterPropertyNative(JNIEnv *env, jobject obj, jint type, jb 
    prop.val = val;



    int ret = sBluetoothInterface->set_adapter_property(&prop);

    env->ReleaseByteArrayElements(value, val, NULL);

    env->ReleaseByteArrayElements(value, val, 0);

    result = (ret == BT_STATUS_SUCCESS) ? JNI_TRUE : JNI_FALSE;



    return result;
@@ -771,7 +770,7 @@ static jboolean getDevicePropertyNative(JNIEnv *env, jobject obj, jbyteArray add 


    int ret = sBluetoothInterface->get_remote_device_property((bt_bdaddr_t *)addr,

                                                              (bt_property_type_t) type);

    env->ReleaseByteArrayElements(address, addr, NULL);

    env->ReleaseByteArrayElements(address, addr, 0);

    result = (ret == BT_STATUS_SUCCESS) ? JNI_TRUE : JNI_FALSE;



    return result;
@@ -793,7 +792,7 @@ static jboolean setDevicePropertyNative(JNIEnv *env, jobject obj, jbyteArray add 


    addr = env->GetByteArrayElements(address, NULL);

    if (addr == NULL) {

        env->ReleaseByteArrayElements(value, val, NULL);

        env->ReleaseByteArrayElements(value, val, 0);

        jniThrowIOException(env, EINVAL);

        return result;

    }
@@ -805,8 +804,8 @@ static jboolean setDevicePropertyNative(JNIEnv *env, jobject obj, jbyteArray add 
    prop.val = val;



    int ret = sBluetoothInterface->set_remote_device_property((bt_bdaddr_t *)addr, &prop);

    env->ReleaseByteArrayElements(value, val, NULL);

    env->ReleaseByteArrayElements(address, addr, NULL);

    env->ReleaseByteArrayElements(value, val, 0);

    env->ReleaseByteArrayElements(address, addr, 0);



    result = (ret == BT_STATUS_SUCCESS) ? JNI_TRUE : JNI_FALSE;
@@ -827,7 +826,7 @@ static jboolean getRemoteServicesNative(JNIEnv *env, jobject obj, jbyteArray add 
    }



    int ret = sBluetoothInterface->get_remote_services((bt_bdaddr_t *)addr);

    env->ReleaseByteArrayElements(address, addr, NULL);

    env->ReleaseByteArrayElements(address, addr, 0);

    result = (ret == BT_STATUS_SUCCESS) ? JNI_TRUE : JNI_FALSE;

    return result;

}
@@ -838,7 +837,7 @@ static int connectSocketNative(JNIEnv *env, jobject object, jbyteArray address, 
    int socket_fd;

    bt_status_t status;



    if (!sBluetoothSocketInterface) return NULL;

    if (!sBluetoothSocketInterface) return -1;



    addr = env->GetByteArrayElements(address, NULL);

    if (!addr) {
@@ -881,7 +880,7 @@ static int createSocketChannelNative(JNIEnv *env, jobject object, jint type, 
    int socket_fd;

    bt_status_t status;



    if (!sBluetoothSocketInterface) return NULL;

    if (!sBluetoothSocketInterface) return -1;



    service_name = env->GetStringUTFChars(name_str, NULL);