Merge "Remove unused logging" into tm-qpr-dev (a41e293a) · Commits · e / os / android_packages_modules_Bluetooth

android/app/jni/com_android_bluetooth_gatt.cpp

+0 −1

Original line number	Diff line number	Diff line
		@@ -2024,7 +2024,6 @@ static void gattServerSendResponseNative(JNIEnv* env, jobject object,
		if (env->GetArrayLength(val) < BTGATT_MAX_ATTR_LEN) {
		response.attr_value.len = (uint16_t)env->GetArrayLength(val);
		} else {
		android_errorWriteLog(0x534e4554, "78787521");
		response.attr_value.len = BTGATT_MAX_ATTR_LEN;
		}

android/app/jni/com_android_bluetooth_hfp.cpp

+0 −3

Original line number	Diff line number	Diff line
		@@ -181,7 +181,6 @@ class JniHeadsetCallbacks : bluetooth::headset::Callbacks {

		char null_str[] = "";
		if (!sCallbackEnv.isValidUtf(number)) {
		android_errorWriteLog(0x534e4554, "109838537");
		ALOGE("%s: number is not a valid UTF string.", __func__);
		number = null_str;
		}
		@@ -325,7 +324,6 @@ class JniHeadsetCallbacks : bluetooth::headset::Callbacks {

		char null_str[] = "";
		if (!sCallbackEnv.isValidUtf(at_string)) {
		android_errorWriteLog(0x534e4554, "109838537");
		ALOGE("%s: at_string is not a valid UTF string.", __func__);
		at_string = null_str;
		}
		@@ -361,7 +359,6 @@ class JniHeadsetCallbacks : bluetooth::headset::Callbacks {

		char null_str[] = "";
		if (!sCallbackEnv.isValidUtf(at_string)) {
		android_errorWriteLog(0x534e4554, "109838537");
		ALOGE("%s: at_string is not a valid UTF string.", __func__);
		at_string = null_str;
		}

android/app/jni/com_android_bluetooth_hfpclient.cpp

+0 −6

Original line number	Diff line number	Diff line
		@@ -170,7 +170,6 @@ static void current_operator_cb(const RawAddress* bd_addr, const char* name) {

		const char null_str[] = "";
		if (!sCallbackEnv.isValidUtf(name)) {
		android_errorWriteLog(0x534e4554, "109838537");
		ALOGE("%s: name is not a valid UTF string.", __func__);
		name = null_str;
		}
		@@ -246,7 +245,6 @@ static void clip_cb(const RawAddress* bd_addr, const char* number) {

		const char null_str[] = "";
		if (!sCallbackEnv.isValidUtf(number)) {
		android_errorWriteLog(0x534e4554, "109838537");
		ALOGE("%s: number is not a valid UTF string.", __func__);
		number = null_str;
		}
		@@ -267,7 +265,6 @@ static void call_waiting_cb(const RawAddress* bd_addr, const char* number) {

		const char null_str[] = "";
		if (!sCallbackEnv.isValidUtf(number)) {
		android_errorWriteLog(0x534e4554, "109838537");
		ALOGE("%s: number is not a valid UTF string.", __func__);
		number = null_str;
		}
		@@ -292,7 +289,6 @@ static void current_calls_cb(const RawAddress* bd_addr, int index,

		const char null_str[] = "";
		if (!sCallbackEnv.isValidUtf(number)) {
		android_errorWriteLog(0x534e4554, "109838537");
		ALOGE("%s: number is not a valid UTF string.", __func__);
		number = null_str;
		}
		@@ -338,7 +334,6 @@ static void subscriber_info_cb(const RawAddress* bd_addr, const char* name,

		const char null_str[] = "";
		if (!sCallbackEnv.isValidUtf(name)) {
		android_errorWriteLog(0x534e4554, "109838537");
		ALOGE("%s: name is not a valid UTF string.", __func__);
		name = null_str;
		}
		@@ -372,7 +367,6 @@ static void last_voice_tag_number_cb(const RawAddress* bd_addr,

		const char null_str[] = "";
		if (!sCallbackEnv.isValidUtf(number)) {
		android_errorWriteLog(0x534e4554, "109838537");
		ALOGE("%s: number is not a valid UTF string.", __func__);
		number = null_str;
		}

system/bta/ag/bta_ag_at.cc

+0 −1

Original line number	Diff line number	Diff line
		@@ -99,7 +99,6 @@ void bta_ag_process_at(tBTA_AG_AT_CB* p_cb, char* p_end) {
		p_arg = p_cb->p_cmd_buf + strlen(p_cb->p_at_tbl[idx].p_cmd);
		if (p_arg > p_end) {
		(p_cb->p_err_cback)((tBTA_AG_SCB)p_cb->p_user, false, nullptr);
		android_errorWriteLog(0x534e4554, "112860487");
		return;
		}

system/bta/ag/bta_ag_cmd.cc

+0 −4

Original line number	Diff line number	Diff line
		@@ -379,7 +379,6 @@ static bool bta_ag_parse_cmer(char* p_s, char* p_end, bool* p_enabled) {

		/* get integer value */
		if (p > p_end) {
		android_errorWriteLog(0x534e4554, "112860487");
		return false;
		}
		*p = 0;
		@@ -453,7 +452,6 @@ static tBTA_AG_PEER_CODEC bta_ag_parse_bac(tBTA_AG_SCB* p_scb, char* p_s,

		/* get integer value */
		if (p > p_end) {
		android_errorWriteLog(0x534e4554, "112860487");
		break;
		}
		bool cont = false; // Continue processing
		@@ -595,7 +593,6 @@ void bta_ag_at_hsp_cback(tBTA_AG_SCB* p_scb, uint16_t command_id,
		if ((p_end - p_arg + 1) >= (long)sizeof(val.str)) {
		APPL_TRACE_ERROR("%s: p_arg is too long, send error and return", __func__);
		bta_ag_send_error(p_scb, BTA_AG_ERR_TEXT_TOO_LONG);
		android_errorWriteLog(0x534e4554, "112860487");
		return;
		}
		strlcpy(val.str, p_arg, sizeof(val.str));
		@@ -872,7 +869,6 @@ void bta_ag_at_hfp_cback(tBTA_AG_SCB* p_scb, uint16_t cmd, uint8_t arg_type,
		if ((p_end - p_arg + 1) >= (long)sizeof(val.str)) {
		LOG_ERROR("p_arg is too long for cmd 0x%x, send error and return", cmd);
		bta_ag_send_error(p_scb, BTA_AG_ERR_TEXT_TOO_LONG);
		android_errorWriteLog(0x534e4554, "112860487");
		return;
		}
		strlcpy(val.str, p_arg, sizeof(val.str));