Bug 1062697 - Initialize avrcp play status using the proper value, disable AvRCP 1.5. r=btian, a=bajaj
authorShawn Huang <shuang@mozilla.com>
Wed, 24 Sep 2014 04:28:00 -0400
changeset 225120 74c1fbb05d618369554a6c76061bae0186ce84ed
parent 225119 85d7d86b2b021bba738f70f2b1febf14a6bcba03
child 225121 4bf04a424ec5f33d1a97c261d70763af87738cdb
push id3979
push userraliiev@mozilla.com
push dateMon, 13 Oct 2014 16:35:44 +0000
treeherdermozilla-beta@30f2cc610691 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersbtian, bajaj
bugs1062697
milestone34.0a2
Bug 1062697 - Initialize avrcp play status using the proper value, disable AvRCP 1.5. r=btian, a=bajaj
dom/bluetooth/bluedroid/BluetoothA2dpManager.cpp
dom/bluetooth/bluedroid/b2g_bdroid_buildcfg.h
--- a/dom/bluetooth/bluedroid/BluetoothA2dpManager.cpp
+++ b/dom/bluetooth/bluedroid/BluetoothA2dpManager.cpp
@@ -227,17 +227,17 @@ BluetoothA2dpManager::ResetA2dp()
 void
 BluetoothA2dpManager::ResetAvrcp()
 {
   mAvrcpConnected = false;
   mDuration = 0;
   mMediaNumber = 0;
   mTotalMediaCount = 0;
   mPosition = 0;
-  mPlayStatus = ControlPlayStatus::PLAYSTATUS_UNKNOWN;
+  mPlayStatus = ControlPlayStatus::PLAYSTATUS_STOPPED;
 }
 
 /*
  * Static functions
  */
 
 static BluetoothA2dpManager::SinkState
 StatusStringToSinkState(const nsAString& aStatus)
--- a/dom/bluetooth/bluedroid/b2g_bdroid_buildcfg.h
+++ b/dom/bluetooth/bluedroid/b2g_bdroid_buildcfg.h
@@ -33,10 +33,12 @@
 /* AG feature masks */
 #define BTIF_HF_FEATURES   ( BTA_AG_FEAT_3WAY | \
                              BTA_AG_FEAT_REJECT | \
                              BTA_AG_FEAT_ECS    | \
                              BTA_AG_FEAT_EXTERR)
 
 /* CHLD values */
 #define BTA_AG_CHLD_VAL    "(0,1,2,3)"
+/* SDP AVRCP 1.5 feature */
+#define SDP_AVRCP_1_5              FALSE
 
 #endif /* B2G_BDROID_BUILDCFG_H */