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

Commit fd704114 authored by Chen Chen's avatar Chen Chen Committed by Automerger Merge Worker
Browse files

Merge "HeadsetPhoneState: Synchronize constructor with phone state listening... 

Merge "HeadsetPhoneState: Synchronize constructor with phone state listening functions." am: 2292d9d2

Original change: https://android-review.googlesource.com/c/platform/packages/modules/Bluetooth/+/2181075



Change-Id: Ib6c002a9e0816ddeb35eb7d5e5f2df0fa68b255c
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 95f8071e 2292d9d2

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

+19 −17
Original line number Diff line number Diff line
@@ -76,6 +76,7 @@ public class HeadsetPhoneState { 
    private final Object mPhoneStateListenerLock = new Object();



    HeadsetPhoneState(HeadsetService headsetService) {

        synchronized (mPhoneStateListenerLock) {

            Objects.requireNonNull(headsetService, "headsetService is null");

            mHeadsetService = headsetService;

            mTelephonyManager = mHeadsetService.getSystemService(TelephonyManager.class);
@@ -87,13 +88,14 @@ public class HeadsetPhoneState { 
            // Initialize subscription on the handler thread

            mHandler = new Handler(headsetService.getStateMachinesThreadLooper());

            mOnSubscriptionsChangedListener = new HeadsetPhoneStateOnSubscriptionChangedListener();

        mSubscriptionManager.addOnSubscriptionsChangedListener(command -> mHandler.post(command),

                mOnSubscriptionsChangedListener);

            mSubscriptionManager.addOnSubscriptionsChangedListener(

                    command -> mHandler.post(command), mOnSubscriptionsChangedListener);

            mSignalStrengthUpdateRequest = new SignalStrengthUpdateRequest.Builder()

                    .setSignalThresholdInfos(Collections.EMPTY_LIST)

                    .setSystemThresholdReportingRequestedWhileIdle(true)

                    .build();

        }

    }



    /**

     * Cleanup this instance. Instance can no longer be used after calling this method.