commit ccdd0f848fc5cf829404b6c34bb07ac400b2b5d3
author Łukasz Rymanowski <lukasz.rymanowski@codecoup.pl> Thu Sep 02 11:03:08 2021 +0000
committer Łukasz Rymanowski <lukasz.rymanowski@codecoup.pl> Tue Oct 19 11:56:51 2021 +0000
tree 170c80a39c64a46e4c4bf31048804b5119ddfa37
parent 647afa918215a59e4efb81d38407c7256f3cddc0

vc: Fix handling volume state change which can be without device

Bug: 150670922
Tag: #feature
Sponsor: jpawlowski@
Test: Manual

Change-Id: Ibced293965d46fe93406fcfd9844018b206dfbc9

src/com/android/bluetooth/vc/VolumeControlService.java

diff --git a/src/com/android/bluetooth/vc/VolumeControlService.java b/src/com/android/bluetooth/vc/VolumeControlService.java
index 8c55767..cb22e4d 100644
--- a/src/com/android/bluetooth/vc/VolumeControlService.java
+++ b/src/com/android/bluetooth/vc/VolumeControlService.java
@@ -426,14 +426,17 @@
     }
 
     void messageFromNative(VolumeControlStackEvent stackEvent) {
+
+        if (stackEvent.type == VolumeControlStackEvent.EVENT_TYPE_VOLUME_STATE_CHANGED) {
+            handleVolumeControlChanged(stackEvent.device, stackEvent.valueInt1,
+                                       stackEvent.valueInt2, stackEvent.valueBool1);
+          return;
+        }
+
         Objects.requireNonNull(stackEvent.device,
                 "Device should never be null, event: " + stackEvent);
 
         Intent intent = null;
-        if (stackEvent.type == VolumeControlStackEvent.EVENT_TYPE_VOLUME_STATE_CHANGED) {
-            handleVolumeControlChanged(stackEvent.device, stackEvent.valueInt1,
-                                       stackEvent.valueInt2, stackEvent.valueBool1);
-        }
 
         if (intent != null) {
             intent.addFlags(Intent.FLAG_RECEIVER_REGISTERED_ONLY_BEFORE_BOOT