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

Commit fbaf6519 authored by Shuo Qian's avatar Shuo Qian Committed by Gerrit Code Review
Browse files

Merge "Clean up LISTEN_SIGNAL_STRENGTHS if using ... 

Merge "Clean up LISTEN_SIGNAL_STRENGTHS if using  LISTEN_ALWAYS_REPORTED_SIGNAL_STRENGTH after integrating  LISTEN_ALWAYS_REPORTED_SIGNAL_STRENGTH callback in TelephonyRegistry"
parents 69421b91 f660b6ae

android/app/src/com/android/bluetooth/hfp/HeadsetStateMachine.java

+0 −1
Original line number Diff line number Diff line
@@ -2022,7 +2022,6 @@ public class HeadsetStateMachine extends StateMachine { 
            events |= PhoneStateListener.LISTEN_SERVICE_STATE;

        }

        if (mAgIndicatorEnableState != null && mAgIndicatorEnableState.signal) {

            events |= PhoneStateListener.LISTEN_SIGNAL_STRENGTHS;

            events |= PhoneStateListener.LISTEN_ALWAYS_REPORTED_SIGNAL_STRENGTH;

        }

        mSystemInterface.getHeadsetPhoneState().listenForPhoneState(mDevice, events);

android/app/tests/unit/src/com/android/bluetooth/hfp/HeadsetPhoneStateTest.java

+14 −24
Original line number Diff line number Diff line
@@ -125,10 +125,8 @@ public class HeadsetPhoneStateTest { 
    public void testListenForPhoneState_ServiceAndSignalStrength() {

        BluetoothDevice device1 = TestUtils.getTestDevice(mAdapter, 1);

        mHeadsetPhoneState.listenForPhoneState(device1, PhoneStateListener.LISTEN_SERVICE_STATE

                | PhoneStateListener.LISTEN_SIGNAL_STRENGTHS

                | PhoneStateListener.LISTEN_ALWAYS_REPORTED_SIGNAL_STRENGTH);

        verify(mTelephonyManager).listen(any(), eq(PhoneStateListener.LISTEN_SERVICE_STATE

                | PhoneStateListener.LISTEN_SIGNAL_STRENGTHS

                | PhoneStateListener.LISTEN_ALWAYS_REPORTED_SIGNAL_STRENGTH));

    }
@@ -140,10 +138,8 @@ public class HeadsetPhoneStateTest { 
    public void testListenForPhoneState_ServiceAndSignalStrengthUpdateTurnOffSignalStrengh() {

        BluetoothDevice device1 = TestUtils.getTestDevice(mAdapter, 1);

        mHeadsetPhoneState.listenForPhoneState(device1, PhoneStateListener.LISTEN_SERVICE_STATE

                | PhoneStateListener.LISTEN_SIGNAL_STRENGTHS

                | PhoneStateListener.LISTEN_ALWAYS_REPORTED_SIGNAL_STRENGTH);

        verify(mTelephonyManager).listen(any(), eq(PhoneStateListener.LISTEN_SERVICE_STATE

                | PhoneStateListener.LISTEN_SIGNAL_STRENGTHS

                | PhoneStateListener.LISTEN_ALWAYS_REPORTED_SIGNAL_STRENGTH));

        mHeadsetPhoneState.listenForPhoneState(device1, PhoneStateListener.LISTEN_SERVICE_STATE);

        verify(mTelephonyManager).listen(any(), eq(PhoneStateListener.LISTEN_NONE));
@@ -157,10 +153,8 @@ public class HeadsetPhoneStateTest { 
    public void testListenForPhoneState_ServiceAndSignalStrengthUpdateTurnOffAll() {

        BluetoothDevice device1 = TestUtils.getTestDevice(mAdapter, 1);

        mHeadsetPhoneState.listenForPhoneState(device1, PhoneStateListener.LISTEN_SERVICE_STATE

                | PhoneStateListener.LISTEN_SIGNAL_STRENGTHS

                | PhoneStateListener.LISTEN_ALWAYS_REPORTED_SIGNAL_STRENGTH);

        verify(mTelephonyManager).listen(any(), eq(PhoneStateListener.LISTEN_SERVICE_STATE

                | PhoneStateListener.LISTEN_SIGNAL_STRENGTHS

                | PhoneStateListener.LISTEN_ALWAYS_REPORTED_SIGNAL_STRENGTH));

        mHeadsetPhoneState.listenForPhoneState(device1, PhoneStateListener.LISTEN_NONE);

        verify(mTelephonyManager).listen(any(), eq(PhoneStateListener.LISTEN_NONE));
@@ -177,14 +171,11 @@ public class HeadsetPhoneStateTest { 
        BluetoothDevice device2 = TestUtils.getTestDevice(mAdapter, 2);

        // Enabling updates from first device should trigger subscription

        mHeadsetPhoneState.listenForPhoneState(device1, PhoneStateListener.LISTEN_SERVICE_STATE

                | PhoneStateListener.LISTEN_SIGNAL_STRENGTHS

                | PhoneStateListener.LISTEN_ALWAYS_REPORTED_SIGNAL_STRENGTH);

        verify(mTelephonyManager).listen(any(), eq(PhoneStateListener.LISTEN_SERVICE_STATE

                | PhoneStateListener.LISTEN_SIGNAL_STRENGTHS

                | PhoneStateListener.LISTEN_ALWAYS_REPORTED_SIGNAL_STRENGTH));

        // Enabling updates from second device should not trigger the same subscription

        mHeadsetPhoneState.listenForPhoneState(device2, PhoneStateListener.LISTEN_SERVICE_STATE

                | PhoneStateListener.LISTEN_SIGNAL_STRENGTHS

                | PhoneStateListener.LISTEN_ALWAYS_REPORTED_SIGNAL_STRENGTH);

        // Disabling updates from first device should not cancel subscription

        mHeadsetPhoneState.listenForPhoneState(device1, PhoneStateListener.LISTEN_NONE);
@@ -207,17 +198,16 @@ public class HeadsetPhoneStateTest { 
        verify(mTelephonyManager).listen(any(), eq(PhoneStateListener.LISTEN_SERVICE_STATE));

        verifyNoMoreInteractions(mTelephonyManager);

        // Partially enabling updates from second device should trigger partial subscription

        mHeadsetPhoneState.listenForPhoneState(device2, PhoneStateListener.LISTEN_SIGNAL_STRENGTHS

                | PhoneStateListener.LISTEN_ALWAYS_REPORTED_SIGNAL_STRENGTH);

        mHeadsetPhoneState.listenForPhoneState(device2,

                PhoneStateListener.LISTEN_ALWAYS_REPORTED_SIGNAL_STRENGTH);

        verify(mTelephonyManager).listen(any(), eq(PhoneStateListener.LISTEN_NONE));

        verify(mTelephonyManager).listen(any(), eq(PhoneStateListener.LISTEN_SERVICE_STATE

                | PhoneStateListener.LISTEN_SIGNAL_STRENGTHS

                | PhoneStateListener.LISTEN_ALWAYS_REPORTED_SIGNAL_STRENGTH));

        // Partially disabling updates from first device should not cancel all subscription

        mHeadsetPhoneState.listenForPhoneState(device1, PhoneStateListener.LISTEN_NONE);

        verify(mTelephonyManager, times(2)).listen(any(), eq(PhoneStateListener.LISTEN_NONE));

        verify(mTelephonyManager).listen(any(), eq(PhoneStateListener.LISTEN_SIGNAL_STRENGTHS

                | PhoneStateListener.LISTEN_ALWAYS_REPORTED_SIGNAL_STRENGTH));

        verify(mTelephonyManager).listen(

                any(), eq(PhoneStateListener.LISTEN_ALWAYS_REPORTED_SIGNAL_STRENGTH));

        // Partially disabling updates from second device should cancel subscription

        mHeadsetPhoneState.listenForPhoneState(device2, PhoneStateListener.LISTEN_NONE);

        verify(mTelephonyManager, times(3)).listen(any(), eq(PhoneStateListener.LISTEN_NONE));

android/app/tests/unit/src/com/android/bluetooth/hfp/HeadsetStateMachineTest.java

+1 −3
Original line number Diff line number Diff line
@@ -832,7 +832,6 @@ public class HeadsetStateMachineTest { 
    public void testAtBiaEvent_initialSubscriptionWithUpdates() {

        setUpConnectedState();

        verify(mPhoneState).listenForPhoneState(mTestDevice, PhoneStateListener.LISTEN_SERVICE_STATE

                | PhoneStateListener.LISTEN_SIGNAL_STRENGTHS

                | PhoneStateListener.LISTEN_ALWAYS_REPORTED_SIGNAL_STRENGTH);

        mHeadsetStateMachine.sendMessage(HeadsetStateMachine.STACK_EVENT,

                new HeadsetStackEvent(HeadsetStackEvent.EVENT_TYPE_BIA,
@@ -843,8 +842,7 @@ public class HeadsetStateMachineTest { 
                new HeadsetStackEvent(HeadsetStackEvent.EVENT_TYPE_BIA,

                        new HeadsetAgIndicatorEnableState(false, true, true, false), mTestDevice));

        verify(mPhoneState, timeout(ASYNC_CALL_TIMEOUT_MILLIS)).listenForPhoneState(mTestDevice,

                PhoneStateListener.LISTEN_SIGNAL_STRENGTHS

                | PhoneStateListener.LISTEN_ALWAYS_REPORTED_SIGNAL_STRENGTH);

                PhoneStateListener.LISTEN_ALWAYS_REPORTED_SIGNAL_STRENGTH);

        mHeadsetStateMachine.sendMessage(HeadsetStateMachine.STACK_EVENT,

                new HeadsetStackEvent(HeadsetStackEvent.EVENT_TYPE_BIA,

                        new HeadsetAgIndicatorEnableState(false, true, false, false), mTestDevice));