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

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

Merge "Fix crash when clicking on 'surrounding' collapse button in Hearing device dialog" into main

parents 7de022ef e930dadb

packages/SettingsLib/src/com/android/settingslib/bluetooth/AmbientVolumeUiController.java

+1 −0
Original line number Diff line number Diff line
@@ -80,6 +80,7 @@ public class AmbientVolumeUiController implements 
        mLocalDataManager = new HearingDeviceLocalDataManager(context);

        mLocalDataManager.setOnDeviceLocalDataChangeListener(this,

                ThreadUtils.getBackgroundExecutor());

        mLocalDataManager.start();

    }



    @VisibleForTesting

packages/SystemUI/multivalentTests/src/com/android/systemui/accessibility/hearingaid/HearingDevicesDialogDelegateTest.java

+2 −0
Original line number Diff line number Diff line
@@ -176,6 +176,8 @@ public class HearingDevicesDialogDelegateTest extends SysuiTestCase { 
                .thenReturn(SETTINGS_PACKAGE_NAME);

        when(mDevice.getBondState()).thenReturn(BOND_BONDED);

        when(mDevice.isConnected()).thenReturn(true);

        when(mDevice.getAddress()).thenReturn(DEVICE_ADDRESS);

        when(mDevice.getAnonymizedAddress()).thenReturn(DEVICE_ADDRESS);

        when(mCachedDevice.getDevice()).thenReturn(mDevice);

        when(mCachedDevice.getAddress()).thenReturn(DEVICE_ADDRESS);

        when(mCachedDevice.getName()).thenReturn(DEVICE_NAME);