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

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

Merge "AudioDeviceInventory: add cache for preferred device roles" into... 

Merge "AudioDeviceInventory: add cache for preferred device roles" into udc-dev am: 6a9342d7 am: 17d9e5a7 am: a56a3a09

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



Change-Id: If8c076922cf77ca2798ff8d65ab25b25f7a7a688
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 196c3593 a56a3a09

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

+12 −12
Original line number Original line Diff line number Diff line
@@ -1092,21 +1092,21 @@ import java.util.concurrent.atomic.AtomicBoolean; 




    /*package*/ int setPreferredDevicesForStrategySync(int strategy,

    /*package*/ int setPreferredDevicesForStrategySync(int strategy,

            @NonNull List<AudioDeviceAttributes> devices) {

            @NonNull List<AudioDeviceAttributes> devices) {

        return mDeviceInventory.setPreferredDevicesForStrategySync(strategy, devices);

        return mDeviceInventory.setPreferredDevicesForStrategyAndSave(strategy, devices);

    }

    }





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

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

        return mDeviceInventory.removePreferredDevicesForStrategySync(strategy);

        return mDeviceInventory.removePreferredDevicesForStrategyAndSave(strategy);

    }

    }





    /*package*/ int setDeviceAsNonDefaultForStrategySync(int strategy,

    /*package*/ int setDeviceAsNonDefaultForStrategySync(int strategy,

            @NonNull AudioDeviceAttributes device) {

            @NonNull AudioDeviceAttributes device) {

        return mDeviceInventory.setDeviceAsNonDefaultForStrategySync(strategy, device);

        return mDeviceInventory.setDeviceAsNonDefaultForStrategyAndSave(strategy, device);

    }

    }





    /*package*/ int removeDeviceAsNonDefaultForStrategySync(int strategy,

    /*package*/ int removeDeviceAsNonDefaultForStrategySync(int strategy,

            @NonNull AudioDeviceAttributes device) {

            @NonNull AudioDeviceAttributes device) {

        return mDeviceInventory.removeDeviceAsNonDefaultForStrategySync(strategy, device);

        return mDeviceInventory.removeDeviceAsNonDefaultForStrategyAndSave(strategy, device);

    }

    }





    /*package*/ void registerStrategyPreferredDevicesDispatcher(

    /*package*/ void registerStrategyPreferredDevicesDispatcher(
@@ -1131,11 +1131,11 @@ import java.util.concurrent.atomic.AtomicBoolean; 




    /*package*/ int setPreferredDevicesForCapturePresetSync(int capturePreset,

    /*package*/ int setPreferredDevicesForCapturePresetSync(int capturePreset,

            @NonNull List<AudioDeviceAttributes> devices) {

            @NonNull List<AudioDeviceAttributes> devices) {

        return mDeviceInventory.setPreferredDevicesForCapturePresetSync(capturePreset, devices);

        return mDeviceInventory.setPreferredDevicesForCapturePresetAndSave(capturePreset, devices);

    }

    }





    /*package*/ int clearPreferredDevicesForCapturePresetSync(int capturePreset) {

    /*package*/ int clearPreferredDevicesForCapturePresetSync(int capturePreset) {

        return mDeviceInventory.clearPreferredDevicesForCapturePresetSync(capturePreset);

        return mDeviceInventory.clearPreferredDevicesForCapturePresetAndSave(capturePreset);

    }

    }





    /*package*/ void registerCapturePresetDevicesRoleDispatcher(

    /*package*/ void registerCapturePresetDevicesRoleDispatcher(
@@ -2165,18 +2165,18 @@ import java.util.concurrent.atomic.AtomicBoolean; 
        if (preferredCommunicationDevice == null) {

        if (preferredCommunicationDevice == null) {

            AudioDeviceAttributes defaultDevice = getDefaultCommunicationDevice();

            AudioDeviceAttributes defaultDevice = getDefaultCommunicationDevice();

            if (defaultDevice != null) {

            if (defaultDevice != null) {

                setPreferredDevicesForStrategySync(

                mDeviceInventory.setPreferredDevicesForStrategy(

                        mCommunicationStrategyId, Arrays.asList(defaultDevice));

                        mCommunicationStrategyId, Arrays.asList(defaultDevice));

                setPreferredDevicesForStrategySync(

                mDeviceInventory.setPreferredDevicesForStrategy(

                        mAccessibilityStrategyId, Arrays.asList(defaultDevice));

                        mAccessibilityStrategyId, Arrays.asList(defaultDevice));

            } else {

            } else {

                removePreferredDevicesForStrategySync(mCommunicationStrategyId);

                mDeviceInventory.removePreferredDevicesForStrategy(mCommunicationStrategyId);

                removePreferredDevicesForStrategySync(mAccessibilityStrategyId);

                mDeviceInventory.removePreferredDevicesForStrategy(mAccessibilityStrategyId);

            }

            }

        } else {

        } else {

            setPreferredDevicesForStrategySync(

            mDeviceInventory.setPreferredDevicesForStrategy(

                    mCommunicationStrategyId, Arrays.asList(preferredCommunicationDevice));

                    mCommunicationStrategyId, Arrays.asList(preferredCommunicationDevice));

            setPreferredDevicesForStrategySync(

            mDeviceInventory.setPreferredDevicesForStrategy(

                    mAccessibilityStrategyId, Arrays.asList(preferredCommunicationDevice));

                    mAccessibilityStrategyId, Arrays.asList(preferredCommunicationDevice));

        }

        }

        onUpdatePhoneStrategyDevice(preferredCommunicationDevice);

        onUpdatePhoneStrategyDevice(preferredCommunicationDevice);

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

+301 −35

File changed.

Preview size limit exceeded, changes collapsed.

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

+14 −1

File changed.

Preview size limit exceeded, changes collapsed.