Snap for 5652667 from a37b65950330ac92f7a4957b682f476cd87577ec to qt-qpr1-release (c2b220f6) · Commits · e / os / android_packages_modules_Bluetooth

system/bta/gatt/bta_gattc_act.cc

+15 −14

Original line number	Original line	Diff line number	Diff line
	@@ -1240,12 +1240,22 @@ void bta_gattc_process_indicate(uint16_t conn_id, tGATTC_OPTYPE op,
	}		}

	tBTA_GATTC_CLCB* p_clcb = bta_gattc_find_clcb_by_conn_id(conn_id);		tBTA_GATTC_CLCB* p_clcb = bta_gattc_find_clcb_by_conn_id(conn_id);

			notify.handle = handle;

			/* if service change indication/notification, don't forward to application */
			if (bta_gattc_process_srvc_chg_ind(conn_id, p_clrcb, p_srcb, p_clcb, &notify,
			&p_data->att_value))
			return;

			/* if app registered for the notification */
			if (bta_gattc_check_notif_registry(p_clrcb, p_srcb, &notify)) {
	/* connection not open yet */		/* connection not open yet */
	if (p_clcb == NULL) {		if (p_clcb == NULL) {
	p_clcb = bta_gattc_clcb_alloc(gatt_if, remote_bda, transport);		p_clcb = bta_gattc_clcb_alloc(gatt_if, remote_bda, transport);

	if (p_clcb == NULL) {		if (p_clcb == NULL) {
	LOG(ERROR) << __func__ << ": No resources";		LOG(ERROR) << "No resources";
	return;		return;
	}		}

	@@ -1255,15 +1265,6 @@ void bta_gattc_process_indicate(uint16_t conn_id, tGATTC_OPTYPE op,
	bta_gattc_sm_execute(p_clcb, BTA_GATTC_INT_CONN_EVT, NULL);		bta_gattc_sm_execute(p_clcb, BTA_GATTC_INT_CONN_EVT, NULL);
	}		}

	notify.handle = handle;

	/* if service change indication/notification, don't forward to application */
	if (bta_gattc_process_srvc_chg_ind(conn_id, p_clrcb, p_srcb, p_clcb, &notify,
	&p_data->att_value))
	return;

	/* if app registered for the notification */
	if (bta_gattc_check_notif_registry(p_clrcb, p_srcb, &notify)) {
	if (p_clcb != NULL)		if (p_clcb != NULL)
	bta_gattc_proc_other_indication(p_clcb, op, p_data, &notify);		bta_gattc_proc_other_indication(p_clcb, op, p_data, &notify);
	}		}