Merge changes I7988ce38,I9b704ac6 into main

* changes:
  Remove bugfix flag hearing_input_change_when_comm_device
  Remove bugfix flag hearing_devices_input_routing_ui_improvement

1 files changed, 9 insertions, 17 deletions

diff --git a/services/accessibility/java/com/android/server/accessibility/HearingDevicePhoneCallNotificationController.java b/services/accessibility/java/com/android/server/accessibility/HearingDevicePhoneCallNotificationController.java
index edcf5748a8fc..8cf94b464a1a 100644
--- a/services/accessibility/java/com/android/server/accessibility/HearingDevicePhoneCallNotificationController.java
+++ b/services/accessibility/java/com/android/server/accessibility/HearingDevicePhoneCallNotificationController.java
@@ -160,24 +160,16 @@ public class HearingDevicePhoneCallNotificationController {
                 mHearingDevice = null;
             }
             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();
-                    } else {
-                        addOnCommunicationDeviceChangedListenerIfNeeded(mCommDeviceChangedExecutor,
-                                mCommDeviceChangedListener);
-                    }
+                AudioDeviceInfo commDevice = mAudioManager.getCommunicationDevice();
+                if (commDevice == null) {
+                    return;
+                }
+                mHearingDevice = getSupportedInputHearingDeviceInfo(List.of(commDevice));
+                if (mHearingDevice != null) {
+                    showNotificationIfNeeded();
                 } else {
-                    mHearingDevice = getSupportedInputHearingDeviceInfo(
-                            mAudioManager.getAvailableCommunicationDevices());
-                    if (mHearingDevice != null) {
-                        showNotificationIfNeeded();
-                    }
+                    addOnCommunicationDeviceChangedListenerIfNeeded(mCommDeviceChangedExecutor,
+                            mCommDeviceChangedListener);
                 }
             }
         }