summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Eric Laurent <elaurent@google.com> 2023-06-16 15:06:43 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 2023-06-16 15:06:43 +0000
commita8fcc09d3a625d24ab17f9ff727ad00d6724866a (patch)
tree3614a02bc75af690a75ec60dfc4d27746fd6e38f
parentbe4b86214006d25c0d5296e8d5db867dbba130d3 (diff)
parent868e7250b0469d9a29fdeb7e8016f572943ac369 (diff)
Merge "Early return when mA2dp is null (disconnected) to avoid null object reference" into udc-dev
-rw-r--r--services/core/java/com/android/server/audio/BtHelper.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/services/core/java/com/android/server/audio/BtHelper.java b/services/core/java/com/android/server/audio/BtHelper.java
index c8a17e5eea5a..3560797ce2cf 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(