commit 16d480346fa90436034f596e57c48f6a448e23ab
author Shunkai Yao <yaoshunkai@google.com> Thu Jun 15 17:22:15 2023 +0000
committer Shunkai Yao <yaoshunkai@google.com> Wed Jun 21 16:46:17 2023 +0000
tree 1ce41c587c232c5e4d97e8a1f814e9512f4bb76a
parent c25c1ca1a6e077924b864133cdd02b99383b20ec

Early return when mA2dp is null (disconnected) to avoid null object reference

Bug: 287135970
Test: m
Change-Id: Id9e05f94b9fc7c76f6d3bad482246eb4f72aa054
Merged-In: Id9e05f94b9fc7c76f6d3bad482246eb4f72aa054

services/core/java/com/android/server/audio/BtHelper.java

diff --git a/services/core/java/com/android/server/audio/BtHelper.java b/services/core/java/com/android/server/audio/BtHelper.java
index d3b7606..257d698 100644
--- a/services/core/java/com/android/server/audio/BtHelper.java
+++ b/services/core/java/com/android/server/audio/BtHelper.java
@@ -266,8 +266,8 @@
             if (AudioService.DEBUG_VOL) {
                 AudioService.sVolumeLogger.log(new AudioEventLogger.StringEvent(
                         "setAvrcpAbsoluteVolumeIndex: bailing due to null mA2dp").printLog(TAG));
-                return;
             }
+            return;
         }
         if (!mAvrcpAbsVolSupported) {
             AudioService.sVolumeLogger.log(new AudioEventLogger.StringEvent(