Merge "Add tests for HearingDevicePhoneCallNotificationController when OnCommunicationDeviceChanged" into main

1 files changed, 3 insertions, 0 deletions

diff --git a/services/accessibility/java/com/android/server/accessibility/HearingDevicePhoneCallNotificationController.java b/services/accessibility/java/com/android/server/accessibility/HearingDevicePhoneCallNotificationController.java
index 805d7f820c8d..94cef418b6c8 100644
--- a/services/accessibility/java/com/android/server/accessibility/HearingDevicePhoneCallNotificationController.java
+++ b/services/accessibility/java/com/android/server/accessibility/HearingDevicePhoneCallNotificationController.java
@@ -165,6 +165,9 @@ public class HearingDevicePhoneCallNotificationController {
             if (state == TelephonyManager.CALL_STATE_OFFHOOK) {
                 if (com.android.server.accessibility.Flags.hearingInputChangeWhenCommDevice()) {
                     AudioDeviceInfo commDevice = mAudioManager.getCommunicationDevice();
+                    if (commDevice == null) {
+                        return;
+                    }
                     mHearingDevice = getSupportedInputHearingDeviceInfo(List.of(commDevice));
                     if (mHearingDevice != null) {
                         showNotificationIfNeeded();