From: Sharvil Nanavati <sharvil@google.com>
Date: Thu, 17 Dec 2015 14:23:19 +0000 (-0800)
Subject: Fix absolute volume reporting if AVRC_ADV_CTRL_INCLUDED is false
X-Git-Tag: android-x86-7.1-r1~394^2~74^2
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=5bcbaa498c0d12806a4d57a3b09a05dff5aa5a9e;p=android-x86%2Fsystem-bt.git

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
---

diff --git a/btif/src/btif_rc.c b/btif/src/btif_rc.c
index b4dc2071f..746256164 100644
--- a/btif/src/btif_rc.c
+++ b/btif/src/btif_rc.c
@@ -338,11 +338,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)
     {