From 868e7250b0469d9a29fdeb7e8016f572943ac369 Mon Sep 17 00:00:00 2001
From: Shunkai Yao <yaoshunkai@google.com>
Date: Thu, 15 Jun 2023 17:22:15 +0000
Subject: [PATCH] Early return when mA2dp is null (disconnected) to avoid null
 object reference

Bug: 287135970
Test: m
Change-Id: Id9e05f94b9fc7c76f6d3bad482246eb4f72aa054
---
 services/core/java/com/android/server/audio/BtHelper.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/services/core/java/com/android/server/audio/BtHelper.java b/services/core/java/com/android/server/audio/BtHelper.java
index c8a17e5eea5a4..3560797ce2cff 100644
--- a/services/core/java/com/android/server/audio/BtHelper.java
+++ b/services/core/java/com/android/server/audio/BtHelper.java
@@ -218,8 +218,8 @@ public class BtHelper {
             if (AudioService.DEBUG_VOL) {
                 AudioService.sVolumeLogger.enqueue(new EventLogger.StringEvent(
                         "setAvrcpAbsoluteVolumeIndex: bailing due to null mA2dp").printLog(TAG));
-                return;
             }
+            return;
         }
         if (!mAvrcpAbsVolSupported) {
             AudioService.sVolumeLogger.enqueue(new EventLogger.StringEvent(