summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author ot_linyl.yang <ot_linyl.yang@mediatek.com> 2024-12-09 11:25:02 +0800
committer chuanghua.zhao <chuanghua.zhao@mediatek.com> 2024-12-10 11:17:05 +0800
commitaee34e29f2d0c91f33b00aa9f4259de9fd89fd5a (patch)
treeb36a89f723eb22f864c7b0530ef5b0148a8d8168
parent97364210bd7704ceb994c57f35fd945b743ed478 (diff)
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
-rw-r--r--services/core/java/com/android/server/audio/AudioService.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/services/core/java/com/android/server/audio/AudioService.java b/services/core/java/com/android/server/audio/AudioService.java
index 2d3b7f399fec..e600d45c2792 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 @@ public class AudioService extends IAudioService.Stub
private AudioDeviceAttributes anonymizeAudioDeviceAttributesUnchecked(
AudioDeviceAttributes ada) {
- if (!AudioSystem.isBluetoothDevice(ada.getInternalType())) {
+ if (ada == null || !AudioSystem.isBluetoothDevice(ada.getInternalType())) {
return ada;
}
AudioDeviceAttributes res = new AudioDeviceAttributes(ada);