diff options
4 files changed, 10 insertions, 34 deletions
diff --git a/packages/SystemUI/aconfig/accessibility.aconfig b/packages/SystemUI/aconfig/accessibility.aconfig index c6bc1c70ad18..3cb30258fcb1 100644 --- a/packages/SystemUI/aconfig/accessibility.aconfig +++ b/packages/SystemUI/aconfig/accessibility.aconfig @@ -155,13 +155,3 @@ flag { purpose: PURPOSE_BUGFIX } } - -flag { - name: "hearing_devices_input_routing_ui_improvement" - namespace: "accessibility" - description: "UI improvement for hearing device input routing feature" - bug: "397314200" - metadata { - purpose: PURPOSE_BUGFIX - } -} diff --git a/packages/SystemUI/src/com/android/systemui/accessibility/hearingaid/HearingDevicesDialogDelegate.java b/packages/SystemUI/src/com/android/systemui/accessibility/hearingaid/HearingDevicesDialogDelegate.java index 24b955152093..7f46613936ac 100644 --- a/packages/SystemUI/src/com/android/systemui/accessibility/hearingaid/HearingDevicesDialogDelegate.java +++ b/packages/SystemUI/src/com/android/systemui/accessibility/hearingaid/HearingDevicesDialogDelegate.java @@ -327,9 +327,7 @@ public class HearingDevicesDialogDelegate implements SystemUIDialog.Delegate, setupDeviceListView(dialog, hearingDeviceItemList); setupPairNewDeviceButton(dialog); setupPresetSpinner(dialog, activeHearingDevice); - if (com.android.settingslib.flags.Flags.hearingDevicesInputRoutingControl() - && com.android.systemui.Flags - .hearingDevicesInputRoutingUiImprovement()) { + if (com.android.settingslib.flags.Flags.hearingDevicesInputRoutingControl()) { setupInputRoutingSpinner(dialog, activeHearingDevice); } if (com.android.settingslib.flags.Flags.hearingDevicesAmbientVolumeControl()) { 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); } } } diff --git a/services/tests/servicestests/src/com/android/server/accessibility/HearingDevicePhoneCallNotificationControllerTest.java b/services/tests/servicestests/src/com/android/server/accessibility/HearingDevicePhoneCallNotificationControllerTest.java index 33529c3f4375..44870eb5dd49 100644 --- a/services/tests/servicestests/src/com/android/server/accessibility/HearingDevicePhoneCallNotificationControllerTest.java +++ b/services/tests/servicestests/src/com/android/server/accessibility/HearingDevicePhoneCallNotificationControllerTest.java @@ -37,7 +37,6 @@ import android.content.Context; import android.media.AudioDeviceInfo; import android.media.AudioDevicePort; import android.media.AudioManager; -import android.platform.test.annotations.EnableFlags; import android.platform.test.flag.junit.SetFlagsRule; import android.telephony.TelephonyCallback; import android.telephony.TelephonyManager; @@ -164,7 +163,6 @@ public class HearingDevicePhoneCallNotificationControllerTest { } @Test - @EnableFlags(Flags.FLAG_HEARING_INPUT_CHANGE_WHEN_COMM_DEVICE) public void onCallStateChanged_nonHearingDevice_offHookThenIdle_callAddAndRemoveListener() { final ArgumentCaptor<AudioManager.OnCommunicationDeviceChangedListener> listenerCaptor = ArgumentCaptor.forClass(AudioManager.OnCommunicationDeviceChangedListener.class); @@ -185,7 +183,6 @@ public class HearingDevicePhoneCallNotificationControllerTest { @Test - @EnableFlags(Flags.FLAG_HEARING_INPUT_CHANGE_WHEN_COMM_DEVICE) public void onCallStateChanged_hearingDeviceFromCommunicationDeviceChanged_showNotification() { final ArgumentCaptor<AudioManager.OnCommunicationDeviceChangedListener> listenerCaptor = ArgumentCaptor.forClass(AudioManager.OnCommunicationDeviceChangedListener.class); @@ -209,7 +206,6 @@ public class HearingDevicePhoneCallNotificationControllerTest { } @Test - @EnableFlags(Flags.FLAG_HEARING_INPUT_CHANGE_WHEN_COMM_DEVICE) public void onCallStateChanged_offHookMultiple_addListenerOnlyOneTime() { AudioDeviceInfo a2dpDeviceInfo = createAudioDeviceInfo(TEST_ADDRESS, AudioManager.DEVICE_OUT_BLUETOOTH_A2DP); |