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

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

Merge "AudioManager: relax exceptions for setCommunicationDevice" into tm-qpr-dev am: 04e08686 

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



Change-Id: I89fba58f196025bfcc1f17da418893829cc521e5
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents c7b0789e 04e08686

media/java/android/media/AudioManager.java

+2 −1
Original line number Diff line number Diff line
@@ -7688,7 +7688,8 @@ public class AudioManager { 
        Objects.requireNonNull(device);

        try {

            if (device.getId() == 0) {

                throw new IllegalArgumentException("In valid device: " + device);

                Log.w(TAG, "setCommunicationDevice: device not found: " + device);

                return false;

            }

            return getService().setCommunicationDevice(mICallBack, device.getId());

        } catch (RemoteException e) {

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

+2 −1
Original line number Diff line number Diff line
@@ -5897,7 +5897,8 @@ public class AudioService extends IAudioService.Stub 
        if (portId != 0) {

            device = AudioManager.getDeviceForPortId(portId, AudioManager.GET_DEVICES_OUTPUTS);

            if (device == null) {

                throw new IllegalArgumentException("invalid portID " + portId);

                Log.w(TAG, "setCommunicationDevice: invalid portID " + portId);

                return false;

            }

            if (!isValidCommunicationDevice(device)) {

                throw new IllegalArgumentException("invalid device type " + device.getType());