Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5775a7ee authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Fix AudioDeviceAttributes null crash" into main am: 97fbad2d 

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/3400939



Change-Id: I639b949ae27e7e233db9c52a7df92d0312cee0d5
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 77f497fb 97fbad2d

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

+1 −1
Original line number Diff line number Diff line
@@ -11398,7 +11398,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);