diff options
| -rw-r--r-- | IMPORTANT_LICENSE | 50 | ||||
| -rwxr-xr-x[-rw-r--r--] | btif/src/btif_av.c | 6 | ||||
| -rw-r--r-- | btif/src/btif_rc.c | 4 | ||||
| -rw-r--r-- | include/bt_target.h | 2 |
4 files changed, 56 insertions, 6 deletions
diff --git a/IMPORTANT_LICENSE b/IMPORTANT_LICENSE new file mode 100644 index 0000000..0978a09 --- /dev/null +++ b/IMPORTANT_LICENSE @@ -0,0 +1,50 @@ + +Copyright (C) 1999-2012 Broadcom Corporation + +This license applies to all underlying Broadcom proprietary code and all +changes thereto committed to the AOSP on or before the +commit f80d3d045eab5f002be4b5e8a3d2d376fdf7581a ("Proprietary Files"). + +In addition, this license applies to all Broadcom proprietary code that is NOT +governed by the Apache License, Version 2.0, unless you originally licensed +such Broadcom proprietary code under a license from Broadcom ("Broadcom SLA"). +If you have a Broadcom SLA, the terms and conditions of such SLA will continue +to govern your use of the Broadcom proprietary code, including without +limitation, the Proprietary Files. + +These Proprietary Files are the proprietary software of Broadcom Corporation +and/or its licensors, and may only be duplicated or distributed (through +multiple tiers) for internal evaluation purposes ("Authorized License"). Any +commercial redistribution of the Proprietary Files is strictly prohibited. + +Except as set forth in this Authorized License, Broadcom grants no license +(express or implied), right to use, or waiver of any kind with respect to the +Authorized Files, and Broadcom expressly reserves all rights in and to the +Authorized Files and all intellectual property rights therein. + +Except as expressly set forth in the Authorized License, + +1. These Proprietary Files, including its structure, sequence and organization, + constitutes the valuable trade secrets of Broadcom, and you shall use all + reasonable efforts to protect the confidentiality thereof, and to use this + information only for internal evaluation purposes. + +2. TO THE MAXIMUM EXTENT PERMITTED BY LAW, THESE PROPRIETARY FILES ARE PROVIDED + "AS IS" AND WITH ALL FAULTS AND BROADCOM MAKES NO PROMISES, REPRESENTATIONS + OR WARRANTIES, EITHER EXPRESS, IMPLIED, STATUTORY, OR OTHERWISE, WITH + RESPECT TO THE PROPRIETARY FILES. BROADCOM SPECIFICALLY DISCLAIMS ANY AND + ALL IMPLIED WARRANTIES OF TITLE, MERCHANTABILITY, NONINFRINGEMENT, FITNESS + FOR A PARTICULAR PURPOSE, LACK OF VIRUSES, ACCURACY OR COMPLETENESS, QUIET + ENJOYMENT, QUIET POSSESSION OR CORRESPONDENCE TO DESCRIPTION. YOU ASSUME THE + ENTIRE RISK ARISING OUT OF YOUR USE OF THE PROPRIETARY FILES UNDER THE + AUTHORIZED LICENSE. IF YOU VIOLATE THE AUTHORIZED LICENSE, THIS LICENSE WILL + BE IMMEDIATELY RESCINDED AND TERMINATED. + +3. TO THE MAXIMUM EXTENT PERMITTED BY LAW, IN NO EVENT SHALL BROADCOM OR ITS + LICENSORS BE LIABLE FOR (i) CONSEQUENTIAL, INCIDENTAL, SPECIAL, INDIRECT, OR + EXEMPLARY DAMAGES WHATSOEVER ARISING OUT OF OR IN ANY WAY RELATING TO YOUR + USE OF OR INABILITY TO USE THE PROPRIETARY FILES EVEN IF BROADCOM HAS BEEN + ADVISED OF THE POSSIBILITY OF SUCH DAMAGES; OR (ii) ANY AMOUNT IN EXCESS OF + THE AMOUNT ACTUALLY PAID FOR THE PROPRIETARY FILES ITSELF OR U.S. $1, + WHICHEVER IS GREATER. THESE LIMITATIONS SHALL APPLY NOTWITHSTANDING ANY + FAILURE OF ESSENTIAL PURPOSE OF ANY LIMITED REMEDY. diff --git a/btif/src/btif_av.c b/btif/src/btif_av.c index a2de03e..d25fb61 100644..100755 --- a/btif/src/btif_av.c +++ b/btif/src/btif_av.c @@ -399,7 +399,6 @@ static BOOLEAN btif_av_state_closing_handler(btif_sm_event_t event, void *p_data /* immediately stop transmission of frames */ btif_a2dp_set_tx_flush(TRUE); - /* wait for audioflinger to stop a2dp */ break; @@ -963,7 +962,8 @@ const btav_interface_t *btif_av_get_interface(void) ** Returns boolean ** *******************************************************************************/ -BOOLEAN btif_av_is_rc_open_without_a2dp(void) +BOOLEAN btif_av_is_connected(void) { - return (tle_av_open_on_rc.in_use); + btif_sm_state_t state = btif_sm_get_state(btif_av_cb.sm_handle); + return ((state == BTIF_AV_STATE_OPENED) || (state == BTIF_AV_STATE_STARTED)); } diff --git a/btif/src/btif_rc.c b/btif/src/btif_rc.c index 530c7f1..68ddf5b 100644 --- a/btif/src/btif_rc.c +++ b/btif/src/btif_rc.c @@ -100,7 +100,7 @@ static btif_rc_cb_t btif_rc_cb; ******************************************************************************/ extern BOOLEAN btif_hf_call_terminated_recently(); extern BOOLEAN check_cod(const bt_bdaddr_t *remote_bdaddr, uint32_t cod); -BOOLEAN btif_av_is_rc_open_without_a2dp(void); +extern BOOLEAN btif_av_is_connected(void); /***************************************************************************** ** Functions @@ -299,7 +299,7 @@ void handle_rc_passthrough_cmd ( tBTA_AV_REMOTE_CMD *p_remote_cmd) if (p_remote_cmd) { /* queue AVRC PLAY if GAVDTP Open notification to app is pending (2 second timer) */ - if ((p_remote_cmd->rc_id == BTA_AV_RC_PLAY) && btif_av_is_rc_open_without_a2dp()) + if ((p_remote_cmd->rc_id == BTA_AV_RC_PLAY) && (!btif_av_is_connected())) { if (p_remote_cmd->key_state == AVRC_STATE_PRESS) { diff --git a/include/bt_target.h b/include/bt_target.h index b9b88e3..9b48e17 100644 --- a/include/bt_target.h +++ b/include/bt_target.h @@ -71,7 +71,7 @@ #endif #ifndef BTUI_OPS_FORMATS -#define BTUI_OPS_FORMATS (BTA_OP_VCARD21_MASK | BTA_OP_VCAL_MASK | BTA_OP_VNOTE_MASK | BTA_OP_ANY_MASK) +#define BTUI_OPS_FORMATS (BTA_OP_VCARD21_MASK | BTA_OP_ANY_MASK) #endif #ifndef BTA_RFC_MTU_SIZE |