commit bcd80700dffd4b10edd320a7c25d799db8482ff6
author Pranav Madapurmath <pmadapurmath@google.com> Fri Jan 24 11:25:20 2025 -0800
committer Android (Google) Code Review <android-gerrit@google.com> Fri Jan 24 11:25:20 2025 -0800
tree fe6f8f2b3a3da5f7302ea8da4823376c790906ca
parent 780199d1744544baf970f7c2a617ebefbb244733
parent 61c90b1587e1c20e60b3a811134335099d47b18a

Merge "AudioDeviceCallback: Resolve null type from map reference." into main

src/com/android/server/telecom/CallAudioRouteController.java

diff --git a/src/com/android/server/telecom/CallAudioRouteController.java b/src/com/android/server/telecom/CallAudioRouteController.java
index 57e64bb..4451a94 100644
--- a/src/com/android/server/telecom/CallAudioRouteController.java
+++ b/src/com/android/server/telecom/CallAudioRouteController.java
@@ -230,10 +230,12 @@
             @Override
             public void onCommunicationDeviceChanged(AudioDeviceInfo device) {
                 @AudioRoute.AudioRouteType int audioType = device != null
-                        ? DEVICE_INFO_TYPE_TO_AUDIO_ROUTE_TYPE.get(device.getType())
+                        ? DEVICE_INFO_TYPE_TO_AUDIO_ROUTE_TYPE.getOrDefault(
+                                device.getType(), TYPE_INVALID)
                         : TYPE_INVALID;
-                Log.i(this, "onCommunicationDeviceChanged: %d", audioType);
-                if (device != null && device.getType() == AudioDeviceInfo.TYPE_BUILTIN_SPEAKER) {
+                Log.i(this, "onCommunicationDeviceChanged: device (%s), audioType (%d)",
+                        device, audioType);
+                if (audioType == TYPE_SPEAKER) {
                     if (mCurrentRoute.getType() != TYPE_SPEAKER) {
                         sendMessageWithSessionInfo(SPEAKER_ON);
                     }