OSDN Git Service

Fix absolute volume reporting if AVRC_ADV_CTRL_INCLUDED is false
authorSharvil Nanavati <sharvil@google.com>
Thu, 17 Dec 2015 14:23:19 +0000 (06:23 -0800)
committerSharvil Nanavati <sharvil@google.com>
Tue, 5 Jan 2016 01:40:22 +0000 (17:40 -0800)
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

index b4dc207..7462561 100644 (file)
@@ -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)
     {