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

Commit e21cbcb6 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

Change-Id: I1e212c2486e896ad9945d7881f01895fedb27615
parents 019c8f38 05c88316

src/com/android/settings/WifiCallingSettings.java

+9 −9
Original line number Diff line number Diff line
@@ -253,15 +253,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);
@@ -272,6 +263,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();