diff options
| -rw-r--r-- | services/core/java/com/android/server/audio/AudioDeviceBroker.java | 9 | ||||
| -rw-r--r-- | services/core/java/com/android/server/audio/AudioService.java | 2 |
2 files changed, 7 insertions, 4 deletions
diff --git a/services/core/java/com/android/server/audio/AudioDeviceBroker.java b/services/core/java/com/android/server/audio/AudioDeviceBroker.java index e4fc89540b98..88dca0cd8673 100644 --- a/services/core/java/com/android/server/audio/AudioDeviceBroker.java +++ b/services/core/java/com/android/server/audio/AudioDeviceBroker.java @@ -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); diff --git a/services/core/java/com/android/server/audio/AudioService.java b/services/core/java/com/android/server/audio/AudioService.java index 0a6847515137..2e6cfdcf141f 100644 --- a/services/core/java/com/android/server/audio/AudioService.java +++ b/services/core/java/com/android/server/audio/AudioService.java @@ -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; } |