commit c3f10d5259d0fdd311925d6cc56834784e716730
author CNSS_WLAN Service <cnssbldsw@qualcomm.com> Wed Jul 03 07:35:13 2019 -0700
committer Gerrit - the friendly Code Review server <code-review@localhost> Wed Jul 03 07:35:13 2019 -0700
tree 32f7294f2d3f35591da8accc5fce02d281530234
parent a0f9e7a1a090baf73c8d68e76b3872a3f982207f
parent 1377e8123bad6a77d687d6d51bd99c7e7bb73f1b

Merge "TWS_A2DP: Add TWS+ state support in BT config hal" into bt.lnx.5.0

packages_apps_bluetooth_ext/src/avrcp/Avrcp_ext.java

diff --git a/packages_apps_bluetooth_ext/src/avrcp/Avrcp_ext.java b/packages_apps_bluetooth_ext/src/avrcp/Avrcp_ext.java
index 25cf2a4..c3aa19f 100644
--- a/packages_apps_bluetooth_ext/src/avrcp/Avrcp_ext.java
+++ b/packages_apps_bluetooth_ext/src/avrcp/Avrcp_ext.java
@@ -1122,15 +1122,18 @@
                     Log.e(TAG,"invalid index for device");
                     break;
                 }
+                byte absVol = (byte) ((byte) msg.arg1 & 0x7f); // discard MSB as it is RFD
                 if (DEBUG) Log.v(TAG, "MSG_NATIVE_REQ_VOLUME_CHANGE addr: " + address);
 
                 if (((!(deviceFeatures[deviceIndex].isActiveDevice)) &&
                     (deviceFeatures[deviceIndex].mInitialRemoteVolume != -1)) ||
                     (!deviceFeatures[deviceIndex].isAbsoluteVolumeSupportingDevice)) {
+                        if (deviceFeatures[deviceIndex].isAbsoluteVolumeSupportingDevice) {
+                           deviceFeatures[deviceIndex].mRemoteVolume = absVol;
+                        }
                         if (DEBUG) Log.v(TAG, "MSG_NATIVE_REQ_VOLUME_CHANGE ignored");
                         break;
                 }
-                byte absVol = (byte) ((byte) msg.arg1 & 0x7f); // discard MSB as it is RFD
                 int absolutevol = absVol;
                 if (DEBUG)
                     Log.v(TAG, "MSG_NATIVE_REQ_VOLUME_CHANGE: volume=" + absVol + " ctype="

system_bt_ext/bta/tws_plus/ag/bta_ag_twsp_dev.cc

diff --git a/system_bt_ext/bta/tws_plus/ag/bta_ag_twsp_dev.cc b/system_bt_ext/bta/tws_plus/ag/bta_ag_twsp_dev.cc
index d2c25c4..7068c15 100644
--- a/system_bt_ext/bta/tws_plus/ag/bta_ag_twsp_dev.cc
+++ b/system_bt_ext/bta/tws_plus/ag/bta_ag_twsp_dev.cc
@@ -596,6 +596,11 @@
     int i;
     char* p;
 
+    if (p_s == NULL) {
+        APPL_TRACE_ERROR("%s: Invalid Argument", __func__);
+        return false;
+    }
+
     for (i = 0; i < 2; i++) {
         /* skip to comma delimiter */
         for (p = p_s; *p != ',' && *p != 0; p++)