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

Commit d0f31157 authored by Eric Laurent's avatar Eric Laurent Committed by Automerger Merge Worker
Browse files

Merge "AudioDeviceInventory: fix purge of device role cache." into udc-dev am:... 

Merge "AudioDeviceInventory: fix purge of device role cache." into udc-dev am: cd5243dc am: a6b0a33b

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



Change-Id: Ie76fe917cb3b0b99243ab5ed98fd09aafade4793
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 89368a13 a6b0a33b

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

+6 −1
Original line number Diff line number Diff line
@@ -1199,11 +1199,16 @@ public class AudioDeviceInventory { 
                    AudioDeviceInfo device = Stream.of(connectedDevices)

                            .filter(d -> d.getInternalType() == ada.getInternalType())

                            .filter(d -> (!AudioSystem.isBluetoothDevice(d.getInternalType())

                                            || (d.getAddress() == ada.getAddress())))

                                            || (d.getAddress().equals(ada.getAddress()))))

                            .findFirst()

                            .orElse(null);



                    if (device == null) {

                        if (AudioService.DEBUG_DEVICES) {

                            Slog.i(TAG, "purgeRoles() removing device: " + ada.toString()

                                    + ", for strategy: " + keyRole.first

                                    + " and role: " + keyRole.second);

                        }

                        asi.deviceRoleAction(keyRole.first, keyRole.second, Arrays.asList(ada));

                        itDev.remove();

                    }