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

Commit f05fbcfb authored by Sharvil Nanavati's avatar Sharvil Nanavati
Browse files

Update PAN JNI code to match updated interface definition. 

This also fixes some weird internal reordering of arguments. All
of the implementations should match the interfaces now.

http://b/12853951

Change-Id: I019da4892204dd92ebf203e77bdb23af96c57697
parent 322480a0

jni/com_android_bluetooth_pan.cpp

+3 −3
Original line number Original line Diff line number Diff line
@@ -56,13 +56,13 @@ static bool checkCallbackThread() { 
    return true;

    return true;

}

}





static void control_state_callback(btpan_control_state_t state, bt_status_t error, int local_role,

static void control_state_callback(btpan_control_state_t state, int local_role, bt_status_t error,

                const char* ifname) {

                const char* ifname) {

    debug("state:%d, local_role:%d, ifname:%s", state, local_role, ifname);

    debug("state:%d, local_role:%d, ifname:%s", state, local_role, ifname);

    CHECK_CALLBACK_ENV

    CHECK_CALLBACK_ENV

    jstring js_ifname = sCallbackEnv->NewStringUTF(ifname);

    jstring js_ifname = sCallbackEnv->NewStringUTF(ifname);

    sCallbackEnv->CallVoidMethod(mCallbacksObj, method_onControlStateChanged, (jint)state, (jint)error,

    sCallbackEnv->CallVoidMethod(mCallbacksObj, method_onControlStateChanged, (jint)local_role, (jint)state,

                                (jint)local_role, js_ifname);

                                (jint)error, js_ifname);

    sCallbackEnv->DeleteLocalRef(js_ifname);

    sCallbackEnv->DeleteLocalRef(js_ifname);

}

}