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

Commit 2653a1e7 authored by Jaikumar Ganesh's avatar Jaikumar Ganesh
Browse files

Fix compiler errors when compiled with debug option. 

The Logv statement was missing the format specifier.

Change-Id: Ibf986d28dabfdbb3fbfd75381cb349448c6e57e7
parent 4ab0e774

core/jni/android_bluetooth_BluetoothAudioGateway.cpp

+32 −32
Original line number Diff line number Diff line
@@ -89,7 +89,7 @@ static int setup_listening_socket(int dev, int channel); 
#endif



static void classInitNative(JNIEnv* env, jclass clazz) {

    LOGV(__FUNCTION__);

    LOGV("%s", __FUNCTION__);

#ifdef HAVE_BLUETOOTH



    /* in */
@@ -122,7 +122,7 @@ static void classInitNative(JNIEnv* env, jclass clazz) { 
}



static void initializeNativeDataNative(JNIEnv* env, jobject object) {

    LOGV(__FUNCTION__);

    LOGV("%s", __FUNCTION__);

#ifdef HAVE_BLUETOOTH

    native_data_t *nat = (native_data_t *)calloc(1, sizeof(native_data_t));

    if (NULL == nat) {
@@ -150,7 +150,7 @@ static void initializeNativeDataNative(JNIEnv* env, jobject object) { 
}



static void cleanupNativeDataNative(JNIEnv* env, jobject object) {

    LOGV(__FUNCTION__);

    LOGV("%s", __FUNCTION__);

#ifdef HAVE_BLUETOOTH

    native_data_t *nat = get_native_data(env, object);

    if (nat) {
@@ -255,7 +255,7 @@ static inline int on_accept_set_fields(JNIEnv* env, jobject object, 


static jboolean waitForHandsfreeConnectNative(JNIEnv* env, jobject object,

                                              jint timeout_ms) {

//    LOGV(__FUNCTION__);

//    LOGV("%s", __FUNCTION__);

#ifdef HAVE_BLUETOOTH



    env->SetIntField(object, field_mTimeoutRemainingMs, timeout_ms);
@@ -444,7 +444,7 @@ static jboolean waitForHandsfreeConnectNative(JNIEnv* env, jobject object, 
}



static jboolean setUpListeningSocketsNative(JNIEnv* env, jobject object) {

    LOGV(__FUNCTION__);

    LOGV("%s", __FUNCTION__);

#ifdef HAVE_BLUETOOTH

    native_data_t *nat = get_native_data(env, object);
@@ -509,7 +509,7 @@ static int setup_listening_socket(int dev, int channel) { 
    private native void tearDownListeningSocketsNative();

*/

static void tearDownListeningSocketsNative(JNIEnv *env, jobject object) {

    LOGV(__FUNCTION__);

    LOGV("%s", __FUNCTION__);

#ifdef HAVE_BLUETOOTH

    native_data_t *nat = get_native_data(env, object);

core/jni/android_bluetooth_BluetoothSocket.cpp

+10 −10
Original line number Diff line number Diff line
@@ -66,7 +66,7 @@ static struct asocket *get_socketData(JNIEnv *env, jobject obj) { 


static void initSocketFromFdNative(JNIEnv *env, jobject obj, jint fd) {

#ifdef HAVE_BLUETOOTH

    LOGV(__FUNCTION__);

    LOGV("%s", __FUNCTION__);



    struct asocket *s = asocket_init(fd);
@@ -85,7 +85,7 @@ static void initSocketFromFdNative(JNIEnv *env, jobject obj, jint fd) { 


static void initSocketNative(JNIEnv *env, jobject obj) {

#ifdef HAVE_BLUETOOTH

    LOGV(__FUNCTION__);

    LOGV("%s", __FUNCTION__);



    int fd;

    int lm = 0;
@@ -161,7 +161,7 @@ static void initSocketNative(JNIEnv *env, jobject obj) { 


static void connectNative(JNIEnv *env, jobject obj) {

#ifdef HAVE_BLUETOOTH

    LOGV(__FUNCTION__);

    LOGV("%s", __FUNCTION__);



    int ret;

    jint type;
@@ -240,7 +240,7 @@ static void connectNative(JNIEnv *env, jobject obj) { 
/* Returns errno instead of throwing, so java can check errno */

static int bindListenNative(JNIEnv *env, jobject obj) {

#ifdef HAVE_BLUETOOTH

    LOGV(__FUNCTION__);

    LOGV("%s", __FUNCTION__);



    jint type;

    socklen_t addr_sz;
@@ -307,7 +307,7 @@ static int bindListenNative(JNIEnv *env, jobject obj) { 


static jobject acceptNative(JNIEnv *env, jobject obj, int timeout) {

#ifdef HAVE_BLUETOOTH

    LOGV(__FUNCTION__);

    LOGV("%s", __FUNCTION__);



    int fd;

    jint type;
@@ -380,7 +380,7 @@ static jobject acceptNative(JNIEnv *env, jobject obj, int timeout) { 


static jint availableNative(JNIEnv *env, jobject obj) {

#ifdef HAVE_BLUETOOTH

    LOGV(__FUNCTION__);

    LOGV("%s", __FUNCTION__);



    int available;

    struct asocket *s = get_socketData(env, obj);
@@ -403,7 +403,7 @@ static jint availableNative(JNIEnv *env, jobject obj) { 
static jint readNative(JNIEnv *env, jobject obj, jbyteArray jb, jint offset,

        jint length) {

#ifdef HAVE_BLUETOOTH

    LOGV(__FUNCTION__);

    LOGV("%s", __FUNCTION__);



    int ret;

    jbyte *b;
@@ -446,7 +446,7 @@ static jint readNative(JNIEnv *env, jobject obj, jbyteArray jb, jint offset, 
static jint writeNative(JNIEnv *env, jobject obj, jbyteArray jb, jint offset,

        jint length) {

#ifdef HAVE_BLUETOOTH

    LOGV(__FUNCTION__);

    LOGV("%s", __FUNCTION__);



    int ret;

    jbyte *b;
@@ -488,7 +488,7 @@ static jint writeNative(JNIEnv *env, jobject obj, jbyteArray jb, jint offset, 


static void abortNative(JNIEnv *env, jobject obj) {

#ifdef HAVE_BLUETOOTH

    LOGV(__FUNCTION__);

    LOGV("%s", __FUNCTION__);

    struct asocket *s = get_socketData(env, obj);



    if (!s)
@@ -504,7 +504,7 @@ static void abortNative(JNIEnv *env, jobject obj) { 


static void destroyNative(JNIEnv *env, jobject obj) {

#ifdef HAVE_BLUETOOTH

    LOGV(__FUNCTION__);

    LOGV("%s", __FUNCTION__);

    struct asocket *s = get_socketData(env, obj);

    int fd = s->fd;

core/jni/android_bluetooth_HeadsetBase.cpp

+7 −7
Original line number Diff line number Diff line
@@ -180,7 +180,7 @@ again: 
#endif



static void classInitNative(JNIEnv* env, jclass clazz) {

    LOGV(__FUNCTION__);

    LOGV("%s", __FUNCTION__);

#ifdef HAVE_BLUETOOTH

    field_mNativeData = get_field(env, clazz, "mNativeData", "I");

    field_mAddress = get_field(env, clazz, "mAddress", "Ljava/lang/String;");
@@ -191,7 +191,7 @@ static void classInitNative(JNIEnv* env, jclass clazz) { 


static void initializeNativeDataNative(JNIEnv* env, jobject object,

                                       jint socketFd) {

    LOGV(__FUNCTION__);

    LOGV("%s", __FUNCTION__);

#ifdef HAVE_BLUETOOTH

    native_data_t *nat = (native_data_t *)calloc(1, sizeof(native_data_t));

    if (NULL == nat) {
@@ -213,7 +213,7 @@ static void initializeNativeDataNative(JNIEnv* env, jobject object, 
}



static void cleanupNativeDataNative(JNIEnv* env, jobject object) {

    LOGV(__FUNCTION__);

    LOGV("%s", __FUNCTION__);

#ifdef HAVE_BLUETOOTH

    native_data_t *nat =

        (native_data_t *)env->GetIntField(object, field_mNativeData);
@@ -226,7 +226,7 @@ static void cleanupNativeDataNative(JNIEnv* env, jobject object) { 


static jboolean connectNative(JNIEnv *env, jobject obj)

{

    LOGV(__FUNCTION__);

    LOGV("%s", __FUNCTION__);

#ifdef HAVE_BLUETOOTH

    int lm;

    struct sockaddr_rc addr;
@@ -278,7 +278,7 @@ static jboolean connectNative(JNIEnv *env, jobject obj) 
}



static jint connectAsyncNative(JNIEnv *env, jobject obj) {

    LOGV(__FUNCTION__);

    LOGV("%s", __FUNCTION__);

#ifdef HAVE_BLUETOOTH

    struct sockaddr_rc addr;

    native_data_t *nat = get_native_data(env, obj);
@@ -357,7 +357,7 @@ static jint connectAsyncNative(JNIEnv *env, jobject obj) { 


static jint waitForAsyncConnectNative(JNIEnv *env, jobject obj,

                                           jint timeout_ms) {

    LOGV(__FUNCTION__);

    LOGV("%s", __FUNCTION__);

#ifdef HAVE_BLUETOOTH

    struct sockaddr_rc addr;

    native_data_t *nat = get_native_data(env, obj);
@@ -463,7 +463,7 @@ static jint waitForAsyncConnectNative(JNIEnv *env, jobject obj, 
}



static void disconnectNative(JNIEnv *env, jobject obj) {

    LOGV(__FUNCTION__);

    LOGV("%s", __FUNCTION__);

#ifdef HAVE_BLUETOOTH

    native_data_t *nat = get_native_data(env, obj);

    if (nat->rfcomm_sock >= 0) {

core/jni/android_server_BluetoothA2dpService.cpp

+10 −10
Original line number Diff line number Diff line
@@ -61,7 +61,7 @@ static Properties sink_properties[] = { 
 * Return false if dbus is down, or another serious error (out of memory)

*/

static bool initNative(JNIEnv* env, jobject object) {

    LOGV(__FUNCTION__);

    LOGV("%s", __FUNCTION__);

#ifdef HAVE_BLUETOOTH

    nat = (native_data_t *)calloc(1, sizeof(native_data_t));

    if (NULL == nat) {
@@ -88,7 +88,7 @@ static bool initNative(JNIEnv* env, jobject object) { 


static void cleanupNative(JNIEnv* env, jobject object) {

#ifdef HAVE_BLUETOOTH

    LOGV(__FUNCTION__);

    LOGV("%s", __FUNCTION__);

    if (nat) {

        dbus_connection_close(nat->conn);

        env->DeleteGlobalRef(nat->me);
@@ -101,7 +101,7 @@ static void cleanupNative(JNIEnv* env, jobject object) { 
static jobjectArray getSinkPropertiesNative(JNIEnv *env, jobject object,

                                            jstring path) {

#ifdef HAVE_BLUETOOTH

    LOGV(__FUNCTION__);

    LOGV("%s", __FUNCTION__);

    if (nat) {

        DBusMessage *msg, *reply;

        DBusError err;
@@ -132,7 +132,7 @@ static jobjectArray getSinkPropertiesNative(JNIEnv *env, jobject object, 


static jboolean connectSinkNative(JNIEnv *env, jobject object, jstring path) {

#ifdef HAVE_BLUETOOTH

    LOGV(__FUNCTION__);

    LOGV("%s", __FUNCTION__);

    if (nat) {

        const char *c_path = env->GetStringUTFChars(path, NULL);

        int len = env->GetStringLength(path) + 1;
@@ -153,7 +153,7 @@ static jboolean connectSinkNative(JNIEnv *env, jobject object, jstring path) { 
static jboolean disconnectSinkNative(JNIEnv *env, jobject object,

                                     jstring path) {

#ifdef HAVE_BLUETOOTH

    LOGV(__FUNCTION__);

    LOGV("%s", __FUNCTION__);

    if (nat) {

        const char *c_path = env->GetStringUTFChars(path, NULL);
@@ -171,7 +171,7 @@ static jboolean disconnectSinkNative(JNIEnv *env, jobject object, 
static jboolean suspendSinkNative(JNIEnv *env, jobject object,

                                     jstring path) {

#ifdef HAVE_BLUETOOTH

    LOGV(__FUNCTION__);

    LOGV("%s", __FUNCTION__);

    if (nat) {

        const char *c_path = env->GetStringUTFChars(path, NULL);

        bool ret = dbus_func_args_async(env, nat->conn, -1, NULL, NULL, nat,
@@ -187,7 +187,7 @@ static jboolean suspendSinkNative(JNIEnv *env, jobject object, 
static jboolean resumeSinkNative(JNIEnv *env, jobject object,

                                     jstring path) {

#ifdef HAVE_BLUETOOTH

    LOGV(__FUNCTION__);

    LOGV("%s", __FUNCTION__);

    if (nat) {

        const char *c_path = env->GetStringUTFChars(path, NULL);

        bool ret = dbus_func_args_async(env, nat->conn, -1, NULL, NULL, nat,
@@ -203,7 +203,7 @@ static jboolean resumeSinkNative(JNIEnv *env, jobject object, 
static jboolean avrcpVolumeUpNative(JNIEnv *env, jobject object,

                                     jstring path) {

#ifdef HAVE_BLUETOOTH

    LOGV(__FUNCTION__);

    LOGV("%s", __FUNCTION__);

    if (nat) {

        const char *c_path = env->GetStringUTFChars(path, NULL);

        bool ret = dbus_func_args_async(env, nat->conn, -1, NULL, NULL, nat,
@@ -219,7 +219,7 @@ static jboolean avrcpVolumeUpNative(JNIEnv *env, jobject object, 
static jboolean avrcpVolumeDownNative(JNIEnv *env, jobject object,

                                     jstring path) {

#ifdef HAVE_BLUETOOTH

    LOGV(__FUNCTION__);

    LOGV("%s", __FUNCTION__);

    if (nat) {

        const char *c_path = env->GetStringUTFChars(path, NULL);

        bool ret = dbus_func_args_async(env, nat->conn, -1, NULL, NULL, nat,
@@ -278,7 +278,7 @@ DBusHandlerResult a2dp_event_filter(DBusMessage *msg, JNIEnv *env) { 
}



void onConnectSinkResult(DBusMessage *msg, void *user, void *n) {

    LOGV(__FUNCTION__);

    LOGV("%s", __FUNCTION__);



    native_data_t *nat = (native_data_t *)n;

    const char *path = (const char *)user;

core/jni/android_server_BluetoothEventLoop.cpp

+11 −11
Original line number Diff line number Diff line
@@ -88,7 +88,7 @@ native_data_t *get_EventLoop_native_data(JNIEnv *env, jobject object) { 


#endif

static void classInitNative(JNIEnv* env, jclass clazz) {

    LOGV(__FUNCTION__);

    LOGV("%s", __FUNCTION__);



#ifdef HAVE_BLUETOOTH

    method_onPropertyChanged = env->GetMethodID(clazz, "onPropertyChanged",
@@ -147,7 +147,7 @@ static void classInitNative(JNIEnv* env, jclass clazz) { 
}



static void initializeNativeDataNative(JNIEnv* env, jobject object) {

    LOGV(__FUNCTION__);

    LOGV("%s", __FUNCTION__);

#ifdef HAVE_BLUETOOTH

    native_data_t *nat = (native_data_t *)calloc(1, sizeof(native_data_t));

    if (NULL == nat) {
@@ -175,7 +175,7 @@ static void initializeNativeDataNative(JNIEnv* env, jobject object) { 
}



static void cleanupNativeDataNative(JNIEnv* env, jobject object) {

    LOGV(__FUNCTION__);

    LOGV("%s", __FUNCTION__);

#ifdef HAVE_BLUETOOTH

    native_data_t *nat =

            (native_data_t *)env->GetIntField(object, field_mNativeData);
@@ -216,7 +216,7 @@ static short dbus_flags_to_unix_events(unsigned int flags) { 
}



static jboolean setUpEventLoop(native_data_t *nat) {

    LOGV(__FUNCTION__);

    LOGV("%s", __FUNCTION__);



    if (nat != NULL && nat->conn != NULL) {

        dbus_threads_init_default();
@@ -395,7 +395,7 @@ static int register_agent(native_data_t *nat, 
}



static void tearDownEventLoop(native_data_t *nat) {

    LOGV(__FUNCTION__);

    LOGV("%s", __FUNCTION__);

    if (nat != NULL && nat->conn != NULL) {



        DBusMessage *msg, *reply;
@@ -1229,7 +1229,7 @@ success: 
#ifdef HAVE_BLUETOOTH



void onCreatePairedDeviceResult(DBusMessage *msg, void *user, void *n) {

    LOGV(__FUNCTION__);

    LOGV("%s", __FUNCTION__);



    native_data_t *nat = (native_data_t *)n;

    const char *address = (const char *)user;
@@ -1298,7 +1298,7 @@ done: 
}



void onCreateDeviceResult(DBusMessage *msg, void *user, void *n) {

    LOGV(__FUNCTION__);

    LOGV("%s", __FUNCTION__);



    native_data_t *nat = (native_data_t *)n;

    const char *address= (const char *)user;
@@ -1328,7 +1328,7 @@ void onCreateDeviceResult(DBusMessage *msg, void *user, void *n) { 
}



void onDiscoverServicesResult(DBusMessage *msg, void *user, void *n) {

    LOGV(__FUNCTION__);

    LOGV("%s", __FUNCTION__);



    native_data_t *nat = (native_data_t *)n;

    const char *path = (const char *)user;
@@ -1354,7 +1354,7 @@ void onDiscoverServicesResult(DBusMessage *msg, void *user, void *n) { 
}



void onGetDeviceServiceChannelResult(DBusMessage *msg, void *user, void *n) {

    LOGV(__FUNCTION__);

    LOGV("%s", __FUNCTION__);



    const char *address = (const char *) user;

    native_data_t *nat = (native_data_t *) n;
@@ -1387,7 +1387,7 @@ done: 
}



void onInputDeviceConnectionResult(DBusMessage *msg, void *user, void *n) {

    LOGV(__FUNCTION__);

    LOGV("%s", __FUNCTION__);



    native_data_t *nat = (native_data_t *)n;

    const char *path = (const char *)user;
@@ -1426,7 +1426,7 @@ void onInputDeviceConnectionResult(DBusMessage *msg, void *user, void *n) { 
}



void onPanDeviceConnectionResult(DBusMessage *msg, void *user, void *n) {

    LOGV(__FUNCTION__);

    LOGV("%s", __FUNCTION__);



    native_data_t *nat = (native_data_t *)n;

    const char *path = (const char *)user;