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

Commit 1debb270 authored by Chen Xu's avatar Chen Xu Committed by Gerrit Code Review
Browse files

Merge "Create TM for each subId to register phonestatelistner"

parents 07b5be0a 4181b1e4

src/com/android/bluetooth/hfp/HeadsetPhoneState.java

+3 −3
Original line number Diff line number Diff line
@@ -160,7 +160,7 @@ public class HeadsetPhoneState { 
            return;

        }

        Log.i(TAG, "startListenForPhoneState(), subId=" + subId + ", enabled_events=" + events);

        mPhoneStateListener = new HeadsetPhoneStateListener(subId,

        mPhoneStateListener = new HeadsetPhoneStateListener(

                mHeadsetService.getStateMachinesThreadLooper());

        mTelephonyManager.listen(mPhoneStateListener, events);

        if ((events & PhoneStateListener.LISTEN_SIGNAL_STRENGTHS) != 0) {
@@ -274,8 +274,8 @@ public class HeadsetPhoneState { 
    }



    private class HeadsetPhoneStateListener extends PhoneStateListener {

        HeadsetPhoneStateListener(Integer subId, Looper looper) {

            super(subId, looper);

        HeadsetPhoneStateListener(Looper looper) {

            super(looper);

        }



        @Override

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

+1 −0
Original line number Diff line number Diff line
@@ -72,6 +72,7 @@ public class HeadsetPhoneStateTest { 
        // Stub other methods

        when(mHeadsetService.getSystemService(Context.TELEPHONY_SERVICE)).thenReturn(

                mTelephonyManager);

        when(mTelephonyManager.createForSubscriptionId(anyInt())).thenReturn(mTelephonyManager);

        when(mHeadsetService.getSystemService(Context.TELEPHONY_SUBSCRIPTION_SERVICE)).thenReturn(

                mSubscriptionManager);

        mHandlerThread = new HandlerThread("HeadsetStateMachineTestHandlerThread");