Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 857623fa authored by Jason Hsu's avatar Jason Hsu Committed by Android (Google) Code Review
Browse files

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
parents c9091359 b82016f3

packages/SystemUI/aconfig/accessibility.aconfig

+0 −10
Original line number Original line Diff line number Diff line
@@ -155,13 +155,3 @@ flag { 
      purpose: PURPOSE_BUGFIX

      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

    }

}

packages/SystemUI/src/com/android/systemui/accessibility/hearingaid/HearingDevicesDialogDelegate.java

+1 −3
Original line number Original line Diff line number Diff line
@@ -327,9 +327,7 @@ public class HearingDevicesDialogDelegate implements SystemUIDialog.Delegate, 
                setupDeviceListView(dialog, hearingDeviceItemList);

                setupDeviceListView(dialog, hearingDeviceItemList);

                setupPairNewDeviceButton(dialog);

                setupPairNewDeviceButton(dialog);

                setupPresetSpinner(dialog, activeHearingDevice);

                setupPresetSpinner(dialog, activeHearingDevice);

                if (com.android.settingslib.flags.Flags.hearingDevicesInputRoutingControl()

                if (com.android.settingslib.flags.Flags.hearingDevicesInputRoutingControl()) {

                        && com.android.systemui.Flags

                        .hearingDevicesInputRoutingUiImprovement()) {

                    setupInputRoutingSpinner(dialog, activeHearingDevice);

                    setupInputRoutingSpinner(dialog, activeHearingDevice);

                }

                }

                if (com.android.settingslib.flags.Flags.hearingDevicesAmbientVolumeControl()) {

                if (com.android.settingslib.flags.Flags.hearingDevicesAmbientVolumeControl()) {

services/accessibility/java/com/android/server/accessibility/HearingDevicePhoneCallNotificationController.java

+9 −17
Original line number Original line Diff line number Diff line
@@ -160,7 +160,6 @@ public class HearingDevicePhoneCallNotificationController { 
                mHearingDevice = null;

                mHearingDevice = null;

            }

            }

            if (state == TelephonyManager.CALL_STATE_OFFHOOK) {

            if (state == TelephonyManager.CALL_STATE_OFFHOOK) {

                if (com.android.server.accessibility.Flags.hearingInputChangeWhenCommDevice()) {

                AudioDeviceInfo commDevice = mAudioManager.getCommunicationDevice();

                AudioDeviceInfo commDevice = mAudioManager.getCommunicationDevice();

                if (commDevice == null) {

                if (commDevice == null) {

                    return;

                    return;
@@ -172,13 +171,6 @@ public class HearingDevicePhoneCallNotificationController { 
                    addOnCommunicationDeviceChangedListenerIfNeeded(mCommDeviceChangedExecutor,

                    addOnCommunicationDeviceChangedListenerIfNeeded(mCommDeviceChangedExecutor,

                            mCommDeviceChangedListener);

                            mCommDeviceChangedListener);

                }

                }

                } else {

                    mHearingDevice = getSupportedInputHearingDeviceInfo(

                            mAudioManager.getAvailableCommunicationDevices());

                    if (mHearingDevice != null) {

                        showNotificationIfNeeded();

                    }

                }

            }

            }

        }

        }

services/tests/servicestests/src/com/android/server/accessibility/HearingDevicePhoneCallNotificationControllerTest.java

+0 −4
Original line number Original line Diff line number Diff line
@@ -37,7 +37,6 @@ import android.content.Context; 
import android.media.AudioDeviceInfo;

import android.media.AudioDeviceInfo;

import android.media.AudioDevicePort;

import android.media.AudioDevicePort;

import android.media.AudioManager;

import android.media.AudioManager;

import android.platform.test.annotations.EnableFlags;

import android.platform.test.flag.junit.SetFlagsRule;

import android.platform.test.flag.junit.SetFlagsRule;

import android.telephony.TelephonyCallback;

import android.telephony.TelephonyCallback;

import android.telephony.TelephonyManager;

import android.telephony.TelephonyManager;
@@ -164,7 +163,6 @@ public class HearingDevicePhoneCallNotificationControllerTest { 
    }

    }





    @Test

    @Test

    @EnableFlags(Flags.FLAG_HEARING_INPUT_CHANGE_WHEN_COMM_DEVICE)

    public void onCallStateChanged_nonHearingDevice_offHookThenIdle_callAddAndRemoveListener() {

    public void onCallStateChanged_nonHearingDevice_offHookThenIdle_callAddAndRemoveListener() {

        final ArgumentCaptor<AudioManager.OnCommunicationDeviceChangedListener> listenerCaptor =

        final ArgumentCaptor<AudioManager.OnCommunicationDeviceChangedListener> listenerCaptor =

                ArgumentCaptor.forClass(AudioManager.OnCommunicationDeviceChangedListener.class);

                ArgumentCaptor.forClass(AudioManager.OnCommunicationDeviceChangedListener.class);
@@ -185,7 +183,6 @@ public class HearingDevicePhoneCallNotificationControllerTest { 








    @Test

    @Test

    @EnableFlags(Flags.FLAG_HEARING_INPUT_CHANGE_WHEN_COMM_DEVICE)

    public void onCallStateChanged_hearingDeviceFromCommunicationDeviceChanged_showNotification() {

    public void onCallStateChanged_hearingDeviceFromCommunicationDeviceChanged_showNotification() {

        final ArgumentCaptor<AudioManager.OnCommunicationDeviceChangedListener> listenerCaptor =

        final ArgumentCaptor<AudioManager.OnCommunicationDeviceChangedListener> listenerCaptor =

                ArgumentCaptor.forClass(AudioManager.OnCommunicationDeviceChangedListener.class);

                ArgumentCaptor.forClass(AudioManager.OnCommunicationDeviceChangedListener.class);
@@ -209,7 +206,6 @@ public class HearingDevicePhoneCallNotificationControllerTest { 
    }

    }





    @Test

    @Test

    @EnableFlags(Flags.FLAG_HEARING_INPUT_CHANGE_WHEN_COMM_DEVICE)

    public void onCallStateChanged_offHookMultiple_addListenerOnlyOneTime() {

    public void onCallStateChanged_offHookMultiple_addListenerOnlyOneTime() {

        AudioDeviceInfo a2dpDeviceInfo = createAudioDeviceInfo(TEST_ADDRESS,

        AudioDeviceInfo a2dpDeviceInfo = createAudioDeviceInfo(TEST_ADDRESS,

                AudioManager.DEVICE_OUT_BLUETOOTH_A2DP);

                AudioManager.DEVICE_OUT_BLUETOOTH_A2DP);