commit 97fbad2d1c95bc4793ef370a8e26065a06e26677
author Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> Thu Dec 12 18:22:13 2024 -0800
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Thu Dec 12 18:22:13 2024 -0800
tree efcb891ca8758d8fd75fdbe7be9ea02d9cf75751
parent 09bbb6e6fb6a57b68398842d1b2dc2983d6ba703
parent aee34e29f2d0c91f33b00aa9f4259de9fd89fd5a

Merge "Fix AudioDeviceAttributes null crash" into main

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

diff --git a/services/core/java/com/android/server/audio/AudioService.java b/services/core/java/com/android/server/audio/AudioService.java
index 2d3b7f3..e600d45 100644
--- a/services/core/java/com/android/server/audio/AudioService.java
+++ b/services/core/java/com/android/server/audio/AudioService.java
@@ -10917,7 +10917,7 @@
 
     private AudioDeviceAttributes anonymizeAudioDeviceAttributesUnchecked(
             AudioDeviceAttributes ada) {
-        if (!AudioSystem.isBluetoothDevice(ada.getInternalType())) {
+        if (ada == null || !AudioSystem.isBluetoothDevice(ada.getInternalType())) {
             return ada;
         }
         AudioDeviceAttributes res = new AudioDeviceAttributes(ada);