Merge "JNI: clang-format code" (6fc6ffe3) · Commits · e / os / android_packages_apps_Bluetooth

PREUPLOAD.cfg

0 → 100644

+6 −0

Original line number	Diff line number	Diff line
		[Options]
		ignore_merged_commits = true

		[Builtin Hooks]
		clang_format = true

jni/.clang-format

0 → 100644

+24 −0

Original line number	Diff line number	Diff line
		#
		# Copyright (C) 2016 The Android Open Source Project
		#
		# Licensed under the Apache License, Version 2.0 (the "License");
		# you may not use this file except in compliance with the License.
		# You may obtain a copy of the License at
		#
		# http://www.apache.org/licenses/LICENSE-2.0
		#
		# Unless required by applicable law or agreed to in writing, software
		# distributed under the License is distributed on an "AS IS" BASIS,
		# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
		# See the License for the specific language governing permissions and
		# limitations under the License.
		#

		#
		# Below are some minor deviations from the default Google style to
		# accommodate for handling of the large legacy code base.
		#

		BasedOnStyle: Google
		CommentPragmas: NOLINT:.*
		DerivePointerAlignment: false

jni/com_android_bluetooth_a2dp.cpp

+138 −136

Original line number	Diff line number	Diff line
		@@ -18,10 +18,10 @@

		#define LOG_NDEBUG 0

		#include "android_runtime/AndroidRuntime.h"
		#include "com_android_bluetooth.h"
		#include "hardware/bt_av.h"
		#include "utils/Log.h"
		#include "android_runtime/AndroidRuntime.h"

		#include <string.h>

		@@ -32,7 +32,8 @@ static jmethodID method_onAudioStateChanged;
		static const btav_interface_t* sBluetoothA2dpInterface = NULL;
		static jobject mCallbacksObj = NULL;

		static void bta2dp_connection_state_callback(btav_connection_state_t state, bt_bdaddr_t* bd_addr) {
		static void bta2dp_connection_state_callback(btav_connection_state_t state,
		bt_bdaddr_t* bd_addr) {
		ALOGI("%s", __func__);
		CallbackEnv sCallbackEnv(__func__);
		if (!sCallbackEnv.valid()) return;
		@@ -43,13 +44,15 @@ static void bta2dp_connection_state_callback(btav_connection_state_t state, bt_b
		return;
		}

		sCallbackEnv->SetByteArrayRegion(addr, 0, sizeof(bt_bdaddr_t), (jbyte*) bd_addr);
		sCallbackEnv->CallVoidMethod(mCallbacksObj, method_onConnectionStateChanged, (jint) state,
		addr);
		sCallbackEnv->SetByteArrayRegion(addr, 0, sizeof(bt_bdaddr_t),
		(jbyte*)bd_addr);
		sCallbackEnv->CallVoidMethod(mCallbacksObj, method_onConnectionStateChanged,
		(jint)state, addr);
		sCallbackEnv->DeleteLocalRef(addr);
		}

		static void bta2dp_audio_state_callback(btav_audio_state_t state, bt_bdaddr_t* bd_addr) {
		static void bta2dp_audio_state_callback(btav_audio_state_t state,
		bt_bdaddr_t* bd_addr) {
		ALOGI("%s", __func__);
		CallbackEnv sCallbackEnv(__func__);
		if (!sCallbackEnv.valid()) return;
		@@ -60,17 +63,16 @@ static void bta2dp_audio_state_callback(btav_audio_state_t state, bt_bdaddr_t* b
		return;
		}

		sCallbackEnv->SetByteArrayRegion(addr, 0, sizeof(bt_bdaddr_t), (jbyte*) bd_addr);
		sCallbackEnv->CallVoidMethod(mCallbacksObj, method_onAudioStateChanged, (jint) state,
		addr);
		sCallbackEnv->SetByteArrayRegion(addr, 0, sizeof(bt_bdaddr_t),
		(jbyte*)bd_addr);
		sCallbackEnv->CallVoidMethod(mCallbacksObj, method_onAudioStateChanged,
		(jint)state, addr);
		sCallbackEnv->DeleteLocalRef(addr);
		}

		static btav_callbacks_t sBluetoothA2dpCallbacks = {
		sizeof(sBluetoothA2dpCallbacks),
		bta2dp_connection_state_callback,
		bta2dp_audio_state_callback,
		NULL, /* audio_config_cb */
		sizeof(sBluetoothA2dpCallbacks), bta2dp_connection_state_callback,
		bta2dp_audio_state_callback, NULL, /* audio_config_cb */
		};

		static void classInitNative(JNIEnv* env, jclass clazz) {
		@@ -84,7 +86,6 @@ static void classInitNative(JNIEnv* env, jclass clazz) {
		}

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

		const bt_interface_t* btInf = getBluetoothInterface();
		if (btInf == NULL) {
		ALOGE("Bluetooth module is not loaded");
		@@ -108,8 +109,8 @@ static void initNative(JNIEnv *env, jobject object) {
		return;
		}

		sBluetoothA2dpInterface = (btav_interface_t *)
		btInf->get_profile_interface(BT_PROFILE_ADVANCED_AUDIO_ID);
		sBluetoothA2dpInterface = (btav_interface_t*)btInf->get_profile_interface(
		BT_PROFILE_ADVANCED_AUDIO_ID);
		if (sBluetoothA2dpInterface == NULL) {
		ALOGE("Failed to get Bluetooth A2DP Interface");
		return;
		@@ -141,7 +142,8 @@ static void cleanupNative(JNIEnv *env, jobject object) {
		}
		}

		static jboolean connectA2dpNative(JNIEnv *env, jobject object, jbyteArray address) {
		static jboolean connectA2dpNative(JNIEnv* env, jobject object,
		jbyteArray address) {
		ALOGI("%s: sBluetoothA2dpInterface: %p", __func__, sBluetoothA2dpInterface);
		if (!sBluetoothA2dpInterface) return JNI_FALSE;

		@@ -159,7 +161,8 @@ static jboolean connectA2dpNative(JNIEnv *env, jobject object, jbyteArray addres
		return (status == BT_STATUS_SUCCESS) ? JNI_TRUE : JNI_FALSE;
		}

		static jboolean disconnectA2dpNative(JNIEnv *env, jobject object, jbyteArray address) {
		static jboolean disconnectA2dpNative(JNIEnv* env, jobject object,
		jbyteArray address) {
		if (!sBluetoothA2dpInterface) return JNI_FALSE;

		jbyte* addr = env->GetByteArrayElements(address, NULL);
		@@ -184,10 +187,9 @@ static JNINativeMethod sMethods[] = {
		{"disconnectA2dpNative", "([B)Z", (void*)disconnectA2dpNative},
		};

		int register_com_android_bluetooth_a2dp(JNIEnv* env)
		{
		return jniRegisterNativeMethods(env, "com/android/bluetooth/a2dp/A2dpStateMachine",
		int register_com_android_bluetooth_a2dp(JNIEnv* env) {
		return jniRegisterNativeMethods(env,
		"com/android/bluetooth/a2dp/A2dpStateMachine",
		sMethods, NELEM(sMethods));
		}

		}

jni/com_android_bluetooth_a2dp_sink.cpp

+163 −155

Original line number	Diff line number	Diff line
		@@ -18,10 +18,10 @@

		#define LOG_NDEBUG 0

		#include "android_runtime/AndroidRuntime.h"
		#include "com_android_bluetooth.h"
		#include "hardware/bt_av.h"
		#include "utils/Log.h"
		#include "android_runtime/AndroidRuntime.h"

		#include <string.h>

		@@ -33,7 +33,8 @@ static jmethodID method_onAudioConfigChanged;
		static const btav_interface_t* sBluetoothA2dpInterface = NULL;
		static jobject mCallbacksObj = NULL;

		static void bta2dp_connection_state_callback(btav_connection_state_t state, bt_bdaddr_t* bd_addr) {
		static void bta2dp_connection_state_callback(btav_connection_state_t state,
		bt_bdaddr_t* bd_addr) {
		ALOGI("%s", __func__);
		CallbackEnv sCallbackEnv(__func__);
		if (!sCallbackEnv.valid()) return;
		@@ -44,13 +45,15 @@ static void bta2dp_connection_state_callback(btav_connection_state_t state, bt_b
		return;
		}

		sCallbackEnv->SetByteArrayRegion(addr, 0, sizeof(bt_bdaddr_t), (jbyte*) bd_addr);
		sCallbackEnv->CallVoidMethod(mCallbacksObj, method_onConnectionStateChanged, (jint) state,
		addr);
		sCallbackEnv->SetByteArrayRegion(addr, 0, sizeof(bt_bdaddr_t),
		(jbyte*)bd_addr);
		sCallbackEnv->CallVoidMethod(mCallbacksObj, method_onConnectionStateChanged,
		(jint)state, addr);
		sCallbackEnv->DeleteLocalRef(addr);
		}

		static void bta2dp_audio_state_callback(btav_audio_state_t state, bt_bdaddr_t* bd_addr) {
		static void bta2dp_audio_state_callback(btav_audio_state_t state,
		bt_bdaddr_t* bd_addr) {
		ALOGI("%s", __func__);
		CallbackEnv sCallbackEnv(__func__);
		if (!sCallbackEnv.valid()) return;
		@@ -61,13 +64,16 @@ static void bta2dp_audio_state_callback(btav_audio_state_t state, bt_bdaddr_t* b
		return;
		}

		sCallbackEnv->SetByteArrayRegion(addr, 0, sizeof(bt_bdaddr_t), (jbyte*) bd_addr);
		sCallbackEnv->CallVoidMethod(mCallbacksObj, method_onAudioStateChanged, (jint) state,
		addr);
		sCallbackEnv->SetByteArrayRegion(addr, 0, sizeof(bt_bdaddr_t),
		(jbyte*)bd_addr);
		sCallbackEnv->CallVoidMethod(mCallbacksObj, method_onAudioStateChanged,
		(jint)state, addr);
		sCallbackEnv->DeleteLocalRef(addr);
		}

		static void bta2dp_audio_config_callback(bt_bdaddr_t *bd_addr, uint32_t sample_rate, uint8_t channel_count) {
		static void bta2dp_audio_config_callback(bt_bdaddr_t* bd_addr,
		uint32_t sample_rate,
		uint8_t channel_count) {
		ALOGI("%s", __func__);
		CallbackEnv sCallbackEnv(__func__);
		if (!sCallbackEnv.valid()) return;
		@@ -78,16 +84,16 @@ static void bta2dp_audio_config_callback(bt_bdaddr_t *bd_addr, uint32_t sample_r
		return;
		}

		sCallbackEnv->SetByteArrayRegion(addr, 0, sizeof(bt_bdaddr_t), (jbyte*) bd_addr);
		sCallbackEnv->CallVoidMethod(mCallbacksObj, method_onAudioConfigChanged, addr, (jint)sample_rate, (jint)channel_count);
		sCallbackEnv->SetByteArrayRegion(addr, 0, sizeof(bt_bdaddr_t),
		(jbyte*)bd_addr);
		sCallbackEnv->CallVoidMethod(mCallbacksObj, method_onAudioConfigChanged, addr,
		(jint)sample_rate, (jint)channel_count);
		sCallbackEnv->DeleteLocalRef(addr);
		}

		static btav_callbacks_t sBluetoothA2dpCallbacks = {
		sizeof(sBluetoothA2dpCallbacks),
		bta2dp_connection_state_callback,
		bta2dp_audio_state_callback,
		bta2dp_audio_config_callback,
		sizeof(sBluetoothA2dpCallbacks), bta2dp_connection_state_callback,
		bta2dp_audio_state_callback, bta2dp_audio_config_callback,
		};

		static void classInitNative(JNIEnv* env, jclass clazz) {
		@@ -122,8 +128,8 @@ static void initNative(JNIEnv *env, jobject object) {
		mCallbacksObj = NULL;
		}

		sBluetoothA2dpInterface = (btav_interface_t *)
		btInf->get_profile_interface(BT_PROFILE_ADVANCED_AUDIO_SINK_ID);
		sBluetoothA2dpInterface = (btav_interface_t*)btInf->get_profile_interface(
		BT_PROFILE_ADVANCED_AUDIO_SINK_ID);
		if (sBluetoothA2dpInterface == NULL) {
		ALOGE("Failed to get Bluetooth A2DP Sink Interface");
		return;
		@@ -158,7 +164,8 @@ static void cleanupNative(JNIEnv *env, jobject object) {
		}
		}

		static jboolean connectA2dpNative(JNIEnv *env, jobject object, jbyteArray address) {
		static jboolean connectA2dpNative(JNIEnv* env, jobject object,
		jbyteArray address) {
		ALOGI("%s: sBluetoothA2dpInterface: %p", __func__, sBluetoothA2dpInterface);
		if (!sBluetoothA2dpInterface) return JNI_FALSE;

		@@ -176,8 +183,8 @@ static jboolean connectA2dpNative(JNIEnv *env, jobject object, jbyteArray addres
		return (status == BT_STATUS_SUCCESS) ? JNI_TRUE : JNI_FALSE;
		}

		static jboolean disconnectA2dpNative(JNIEnv *env, jobject object, jbyteArray address) {

		static jboolean disconnectA2dpNative(JNIEnv* env, jobject object,
		jbyteArray address) {
		if (!sBluetoothA2dpInterface) return JNI_FALSE;

		jbyte* addr = env->GetByteArrayElements(address, NULL);
		@@ -194,12 +201,14 @@ static jboolean disconnectA2dpNative(JNIEnv *env, jobject object, jbyteArray add
		return (status == BT_STATUS_SUCCESS) ? JNI_TRUE : JNI_FALSE;
		}

		static void informAudioFocusStateNative(JNIEnv *env, jobject object, jint focus_state) {
		static void informAudioFocusStateNative(JNIEnv* env, jobject object,
		jint focus_state) {
		if (!sBluetoothA2dpInterface) return;
		sBluetoothA2dpInterface->set_audio_focus_state((uint8_t)focus_state);
		}

		static void informAudioTrackGainNative(JNIEnv *env, jobject object, jfloat gain) {
		static void informAudioTrackGainNative(JNIEnv* env, jobject object,
		jfloat gain) {
		if (!sBluetoothA2dpInterface) return;
		sBluetoothA2dpInterface->set_audio_track_gain((float)gain);
		}
		@@ -214,10 +223,9 @@ static JNINativeMethod sMethods[] = {
		{"informAudioTrackGainNative", "(F)V", (void*)informAudioTrackGainNative},
		};

		int register_com_android_bluetooth_a2dp_sink(JNIEnv* env)
		{
		return jniRegisterNativeMethods(env, "com/android/bluetooth/a2dpsink/A2dpSinkStateMachine",
		sMethods, NELEM(sMethods));
		int register_com_android_bluetooth_a2dp_sink(JNIEnv* env) {
		return jniRegisterNativeMethods(
		env, "com/android/bluetooth/a2dpsink/A2dpSinkStateMachine", sMethods,
		NELEM(sMethods));
		}

		}