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

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

Merge "AudioDeviceInventory: fix typo." into udc-dev am: 14338db1 

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



Change-Id: I3a4569dd9280203e884a42e960e44cd2fd428f80
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents df5b191d 14338db1

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

+2 −2
Original line number Diff line number Diff line
@@ -2210,8 +2210,8 @@ import java.util.concurrent.atomic.AtomicBoolean; 
                mDeviceInventory.setPreferredDevicesForStrategyInt(

                        mAccessibilityStrategyId, Arrays.asList(defaultDevice));

            } else {

                mDeviceInventory.removePreferredDevicesForStrategInt(mCommunicationStrategyId);

                mDeviceInventory.removePreferredDevicesForStrategInt(mAccessibilityStrategyId);

                mDeviceInventory.removePreferredDevicesForStrategyInt(mCommunicationStrategyId);

                mDeviceInventory.removePreferredDevicesForStrategyInt(mAccessibilityStrategyId);

            }

            mDeviceInventory.applyConnectedDevicesRoles();

        } else {

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

+1 −1
Original line number Diff line number Diff line
@@ -823,7 +823,7 @@ public class AudioDeviceInventory { 
        return status;

    }

    // Only used for internal requests

    /*package*/ int removePreferredDevicesForStrategInt(int strategy) {

    /*package*/ int removePreferredDevicesForStrategyInt(int strategy) {

        return clearDevicesRoleForStrategy(

                    strategy, AudioSystem.DEVICE_ROLE_PREFERRED, true /*internal */);

    }