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

Commit 25252c10 authored by Jiabin Huang's avatar Jiabin Huang Committed by Automerger Merge Worker
Browse files

Merge "AS: only dispatch preferred mixer attributes change if the device is... 

Merge "AS: only dispatch preferred mixer attributes change if the device is found." into udc-dev am: ceabef76

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



Change-Id: Ic6949c4bbae089734d88ff52cdce9de7dbdd59d9
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 4e43be45 ceabef76

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

+7 −1
Original line number Diff line number Diff line
@@ -597,7 +597,13 @@ public class AudioDeviceInventory { 
            if (wdcs.mState == AudioService.CONNECTION_STATE_DISCONNECTED

                    && AudioSystem.DEVICE_OUT_ALL_USB_SET.contains(

                            wdcs.mAttributes.getInternalType())) {

                mDeviceBroker.dispatchPreferredMixerAttributesChangedCausedByDeviceRemoved(info);

                if (info != null) {

                    mDeviceBroker.dispatchPreferredMixerAttributesChangedCausedByDeviceRemoved(

                            info);

                } else {

                    Log.e(TAG, "Didn't find AudioDeviceInfo to notify preferred mixer "

                            + "attributes change for type=" + wdcs.mAttributes.getType());

                }

            }

            sendDeviceConnectionIntent(type, wdcs.mState,

                    wdcs.mAttributes.getAddress(), wdcs.mAttributes.getName());