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

Commit d2d9e16b authored by Chen Xu's avatar Chen Xu Committed by android-build-merger
Browse files

Merge "Create TM for each subId to register phonestatelistner"

am: 1debb270

Change-Id: If674ae42ff449ac593549a4ae6258a26c190ae28
parents 59353bd6 1debb270
Loading
Loading
Loading
Loading
+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
+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");