commit 316383af25e592c779a2d4987c71cdae360f20eb
author CNSS_WLAN Service <cnssbldsw@qualcomm.com> Tue Mar 26 06:32:31 2019 -0700
committer Gerrit - the friendly Code Review server <code-review@localhost> Tue Mar 26 06:32:31 2019 -0700
tree 699f558bf533b2422ffa37b95ef86cf902ba0334
parent dc65aa414fc569f526bbde82dfb87774e4356973
parent dfb05845074c9396237fd3577f99b102913a0c35

Merge "TWS_AVRCP: Check volume level before sending to both TWS+ pair" 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 a4cf61a..a57da3f 100644
--- a/packages_apps_bluetooth_ext/src/avrcp/Avrcp_ext.java
+++ b/packages_apps_bluetooth_ext/src/avrcp/Avrcp_ext.java
@@ -809,7 +809,8 @@
                     vol = convertToAvrcpVolume(vol);
                     Log.d(TAG,"vol = " + vol + "rem vol = " + deviceFeatures[deviceIndex].mRemoteVolume);
                     if(vol != deviceFeatures[deviceIndex].mRemoteVolume &&
-                       deviceFeatures[deviceIndex].isAbsoluteVolumeSupportingDevice)
+                       deviceFeatures[deviceIndex].isAbsoluteVolumeSupportingDevice &&
+                       deviceFeatures[deviceIndex].mCurrentDevice != null) {
                        setVolumeNative(vol , getByteAddress(deviceFeatures[deviceIndex].mCurrentDevice));
                        if (deviceFeatures[deviceIndex].mCurrentDevice.isTwsPlusDevice()) {
                            AdapterService adapterService = AdapterService.getAdapterService();
@@ -822,6 +823,7 @@
                                setVolumeNative(vol, getByteAddress(peer_device));
                            }
                        }
+                    }
                 }
                 //mLastLocalVolume = -1;
                 break;