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

Commit 0f07f454 authored by Xiangyu/Malcolm Chen's avatar Xiangyu/Malcolm Chen Committed by Android (Google) Code Review
Browse files

Merge "Fix bug of phoneListener always listens to default subId in WFC."

parents 01911cf9 c68e6b3d

src/com/android/settings/wifi/calling/WifiCallingSettingsForSub.java

+5 −3
Original line number Diff line number Diff line
@@ -89,6 +89,7 @@ public class WifiCallingSettingsForSub extends SettingsPreferenceFragment 


    private int mSubId = SubscriptionManager.INVALID_SUBSCRIPTION_ID;

    private ImsManager mImsManager;

    private TelephonyManager mTelephonyManager;



    private final PhoneStateListener mPhoneStateListener = new PhoneStateListener() {

        /*
@@ -238,6 +239,9 @@ public class WifiCallingSettingsForSub extends SettingsPreferenceFragment 
        mImsManager = ImsManager.getInstance(

                getActivity(), SubscriptionManager.getPhoneId(mSubId));



        mTelephonyManager = ((TelephonyManager) getSystemService(Context.TELEPHONY_SERVICE))

                .createForSubscriptionId(mSubId);



        mButtonWfcMode = (ListPreference) findPreference(BUTTON_WFC_MODE);

        mButtonWfcMode.setOnPreferenceChangeListener(this);
@@ -319,9 +323,7 @@ public class WifiCallingSettingsForSub extends SettingsPreferenceFragment 
        updateBody();



        if (mImsManager.isWfcEnabledByPlatform()) {

            TelephonyManager tm =

                    (TelephonyManager) getSystemService(Context.TELEPHONY_SERVICE);

            tm.listen(mPhoneStateListener, PhoneStateListener.LISTEN_CALL_STATE);

            mTelephonyManager.listen(mPhoneStateListener, PhoneStateListener.LISTEN_CALL_STATE);



            mSwitchBar.addOnSwitchChangeListener(this);