commit aee34e29f2d0c91f33b00aa9f4259de9fd89fd5a
author ot_linyl.yang <ot_linyl.yang@mediatek.com> Mon Dec 09 11:25:02 2024 +0800
committer chuanghua.zhao <chuanghua.zhao@mediatek.com> Tue Dec 10 11:17:05 2024 +0800
tree b36a89f723eb22f864c7b0530ef5b0148a8d8168
parent 97364210bd7704ceb994c57f35fd945b743ed478

Fix AudioDeviceAttributes null crash

Binder calls AudioService.getMutingExpectedDevice return null,add
null check for fix.

Bug: 383051609
Test: run MTBF test pass

Change-Id: Ie2cc6453cc28fabeb760b9124f6fe6211d6318ff

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);