summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSharvil Nanavati <sharvil@google.com>2015-12-18 18:37:06 +0000
committerandroid-build-merger <android-build-merger@google.com>2015-12-18 18:37:06 +0000
commitb35d5c358e546657bfa2195a260a9ef4301318bc (patch)
treebc21c0f277f786ef4082e6a82dde5a636259cfad
parent919642a4cdcc2d6a112a5a6dfebc6f8e60f706ed (diff)
parent3c8de068964457fbc7625ca5d8d6fbe85e416c40 (diff)
downloadandroid_system_bt-b35d5c358e546657bfa2195a260a9ef4301318bc.tar.gz
android_system_bt-b35d5c358e546657bfa2195a260a9ef4301318bc.tar.bz2
android_system_bt-b35d5c358e546657bfa2195a260a9ef4301318bc.zip
Merge "Fix absolute volume reporting if AVRC_ADV_CTRL_INCLUDED is false" into cw-e-dev
am: 3c8de06896 * commit '3c8de068964457fbc7625ca5d8d6fbe85e416c40': Fix absolute volume reporting if AVRC_ADV_CTRL_INCLUDED is false
-rw-r--r--btif/src/btif_rc.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/btif/src/btif_rc.c b/btif/src/btif_rc.c
index 6667ddb95..c495fdc43 100644
--- a/btif/src/btif_rc.c
+++ b/btif/src/btif_rc.c
@@ -335,11 +335,13 @@ void handle_rc_features()
rc_features |= BTRC_FEAT_BROWSE;
}
+#if (AVRC_ADV_CTRL_INCLUDED == TRUE)
if ( (btif_rc_cb.rc_features & BTA_AV_FEAT_ADV_CTRL) &&
(btif_rc_cb.rc_features & BTA_AV_FEAT_RCTG))
{
rc_features |= BTRC_FEAT_ABSOLUTE_VOLUME;
}
+#endif
if (btif_rc_cb.rc_features & BTA_AV_FEAT_METADATA)
{