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

Commit 4e305cf9 authored by Meng Wang's avatar Meng Wang Committed by android-build-merger
Browse files

Merge "WiFiCallingSettings: don't start carrier app in onResume" am: 05c88316 am: e21cbcb6 

am: 556e3bb3

Change-Id: I1a189c49f1ca8c0a8c12f1c834d90f61d25fc470
parents 0497ee97 556e3bb3

src/com/android/settings/WifiCallingSettings.java

+9 −9
Original line number Diff line number Diff line
@@ -252,15 +252,6 @@ public class WifiCallingSettings extends SettingsPreferenceFragment 


        final Context context = getActivity();



        if (ImsManager.isWfcEnabledByPlatform(context)) {

            TelephonyManager tm = (TelephonyManager) getSystemService(Context.TELEPHONY_SERVICE);

            tm.listen(mPhoneStateListener, PhoneStateListener.LISTEN_CALL_STATE);



            mSwitchBar.addOnSwitchChangeListener(this);



            mValidListener = true;

        }



        // NOTE: Buttons will be enabled/disabled in mPhoneStateListener

        boolean wfcEnabled = ImsManager.isWfcEnabledByUser(context)

                && ImsManager.isNonTtyOrTtyOnVolteEnabled(context);
@@ -271,6 +262,15 @@ public class WifiCallingSettings extends SettingsPreferenceFragment 
        mButtonWfcRoamingMode.setValue(Integer.toString(wfcRoamingMode));

        updateButtonWfcMode(context, wfcEnabled, wfcMode, wfcRoamingMode);



        if (ImsManager.isWfcEnabledByPlatform(context)) {

            TelephonyManager tm = (TelephonyManager) getSystemService(Context.TELEPHONY_SERVICE);

            tm.listen(mPhoneStateListener, PhoneStateListener.LISTEN_CALL_STATE);



            mSwitchBar.addOnSwitchChangeListener(this);



            mValidListener = true;

        }



        context.registerReceiver(mIntentReceiver, mIntentFilter);



        Intent intent = getActivity().getIntent();