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

Commit f7aa87de authored by Eric Laurent's avatar Eric Laurent
Browse files

AudioDeviceBroker: fix dispatchCommunicationDevice() 

Add null check on the device returned by getCommunicationDevice().
This can happen for instance if the native audio policy could not be intialized
properly.

Bug: 182844679
Test: make.
Change-Id: Ie2b79aad9caea958af2071a0c4133121d311506e
parent 82c923af

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

+6 −3
Original line number Diff line number Diff line
@@ -395,6 +395,9 @@ import java.util.concurrent.atomic.AtomicBoolean; 
                                AudioSystem.STREAM_VOICE_CALL);

                List<AudioDeviceAttributes> devices = AudioSystem.getDevicesForAttributes(attr);

                if (devices.isEmpty()) {

                    if (mAudioService.isPlatformVoice()) {

                        Log.w(TAG, "getCommunicationDevice(): no device for phone strategy");

                    }

                    return null;

                }

                device = devices.get(0);
@@ -746,7 +749,7 @@ import java.util.concurrent.atomic.AtomicBoolean; 
    @GuardedBy("mDeviceStateLock")

    private void dispatchCommunicationDevice() {

        AudioDeviceInfo device = getCommunicationDevice();

        int portId = (getCommunicationDevice() == null) ? 0 : device.getId();

        int portId = (device == null) ? 0 : device.getId();

        if (portId == mCurCommunicationPortId) {

            return;

        }
@@ -1022,9 +1025,9 @@ import java.util.concurrent.atomic.AtomicBoolean; 
        pw.println("\n" + prefix + "mPreferredCommunicationDevice: "

                +  mPreferredCommunicationDevice);



        AudioDeviceInfo device = getCommunicationDevice();

        pw.println(prefix + "Selected Communication Device: "

                +  ((getCommunicationDevice() == null) ? "None"

                        : new AudioDeviceAttributes(getCommunicationDevice())));

                +  ((device == null) ? "None" : new AudioDeviceAttributes(device)));



        pw.println(prefix + "mCommunicationStrategyId: "

                +  mCommunicationStrategyId);

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

+1 −1
Original line number Diff line number Diff line
@@ -248,7 +248,7 @@ public class AudioService extends IAudioService.Stub 
    // indicates whether the system maps all streams to a single stream.

    private final boolean mIsSingleVolume;



    private boolean isPlatformVoice() {

    /*package*/ boolean isPlatformVoice() {

        return mPlatformType == AudioSystem.PLATFORM_VOICE;

    }