From 46398430fa801e9fad51d9d7134bb74fb67cf5ec Mon Sep 17 00:00:00 2001
From: Joseph Pirozzo <pirozzoj@google.com>
Date: Tue, 7 Aug 2018 12:28:40 -0700
Subject: [PATCH] AVRCP Controller metadata feature
Process the METADATA feature flag separately from the VENDOR feature
flag to ensure it doesn't get overwritten.
Bug: 110039732
Test: connect avrcp from phone verify getCapabilities events supported
is sent.
Change-Id: Ib5d54c13d6c912904f20e8760f1632fa5737b98f
---
system/btif/src/btif_rc.cc | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/system/btif/src/btif_rc.cc b/system/btif/src/btif_rc.cc
index b7216b3f6d8..1799bd9cf7c 100644
--- a/system/btif/src/btif_rc.cc
+++ b/system/btif/src/btif_rc.cc
@@ -466,11 +466,12 @@ void handle_rc_ctrl_features(btif_rc_device_cb_t* p_dev) {
rc_features |= BTRC_FEAT_ABSOLUTE_VOLUME;
}
- if ((p_dev->rc_features & BTA_AV_FEAT_METADATA) &&
- (p_dev->rc_features & BTA_AV_FEAT_VENDOR) &&
- (p_dev->rc_features_processed != true)) {
+ if (p_dev->rc_features & BTA_AV_FEAT_METADATA) {
rc_features |= BTRC_FEAT_METADATA;
+ }
+ if ((p_dev->rc_features & BTA_AV_FEAT_VENDOR) &&
+ (p_dev->rc_features_processed != true)) {
/* Mark rc features processed to avoid repeating
* the AVRCP procedure every time on receiving this
* update.
--
GitLab