commit 9b0aa81a6467979d16020b7073f92988cb6d3e30
author Sharvil Nanavati <sharvil@google.com> Thu Dec 17 06:23:19 2015 -0800
committer Sharvil Nanavati <sharvil@google.com> Thu Dec 17 06:23:19 2015 -0800
tree a1f119869251582b660ea09f05dcdcdb287b2d61
parent 198abcd7048fc98d78a7b264dcaa1923fe968614

Fix absolute volume reporting if AVRC_ADV_CTRL_INCLUDED is false

Without this change, setting AVRC_ADV_CTRL_INCLUDED to false would
result in the native code reporting the remote device supports
absolute volume even though we don't.

Bug: 26070064
Change-Id: I5b88fa0adb89983de28a216898a1d8957fa454a1

btif/src/btif_rc.c

diff --git a/btif/src/btif_rc.c b/btif/src/btif_rc.c
index 6667ddb..c495fdc4 100644
--- a/btif/src/btif_rc.c
+++ b/btif/src/btif_rc.c
@@ -335,11 +335,13 @@
         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)
     {