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

Commit d742fa3f authored by Glenn Kasten's avatar Glenn Kasten Committed by Android (Google) Code Review
Browse files

Merge "Fix build warnings"

parents cc598b2b ed70933d

core/jni/android_bluetooth_HeadsetBase.cpp

+1 −1
Original line number Original line Diff line number Diff line
@@ -163,7 +163,7 @@ again: 
            bufit++;

            bufit++;

    }

    }





    *bufit = NULL;

    *bufit = 0;





    // According to ITU V.250 section 5.1, IA5 7 bit chars are used, 

    // According to ITU V.250 section 5.1, IA5 7 bit chars are used, 

    //   the eighth bit or higher bits are ignored if they exists

    //   the eighth bit or higher bits are ignored if they exists

core/jni/android_server_BluetoothService.cpp

+1 −1
Original line number Original line Diff line number Diff line
@@ -1035,7 +1035,7 @@ static jboolean removeReservedServiceRecordsNative(JNIEnv *env, jobject object, 
                            DBUS_ADAPTER_IFACE, "RemoveReservedServiceRecords",

                            DBUS_ADAPTER_IFACE, "RemoveReservedServiceRecords",

                            DBUS_TYPE_ARRAY, DBUS_TYPE_UINT32,

                            DBUS_TYPE_ARRAY, DBUS_TYPE_UINT32,

                            &values, len, DBUS_TYPE_INVALID);

                            &values, len, DBUS_TYPE_INVALID);

    env->ReleaseIntArrayElements(handles, values, NULL);

    env->ReleaseIntArrayElements(handles, values, 0);

    return reply ? JNI_TRUE : JNI_FALSE;

    return reply ? JNI_TRUE : JNI_FALSE;

#endif

#endif

    return JNI_FALSE;

    return JNI_FALSE;