PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "WiFiCallingSettings: don't start carrier app in onResume" am: 05c88316ec am: e21cbcb6b4

Browse Source 
am: 556e3bb3e8

Change-Id: I1a189c49f1ca8c0a8c12f1c834d90f61d25fc470
This commit is contained in:
Meng Wang
2017-02-27 18:34:34 +00:00
committed by android-build-merger
parent 0497ee9731 556e3bb3e8
commit 4e305cf9c7
1 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/com/android/settings/WifiCallingSettings.java
View File

@@ -252,15 +252,6 @@ public class WifiCallingSettings extends SettingsPreferenceFragment
final Context context = getActivity(); 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 // NOTE: Buttons will be enabled/disabled in mPhoneStateListener
boolean wfcEnabled = ImsManager.isWfcEnabledByUser(context) boolean wfcEnabled = ImsManager.isWfcEnabledByUser(context)
&& ImsManager.isNonTtyOrTtyOnVolteEnabled(context); && ImsManager.isNonTtyOrTtyOnVolteEnabled(context);
@@ -271,6 +262,15 @@ public class WifiCallingSettings extends SettingsPreferenceFragment
mButtonWfcRoamingMode.setValue(Integer.toString(wfcRoamingMode)); mButtonWfcRoamingMode.setValue(Integer.toString(wfcRoamingMode));
updateButtonWfcMode(context, wfcEnabled, wfcMode, 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); context.registerReceiver(mIntentReceiver, mIntentFilter);
Intent intent = getActivity().getIntent(); Intent intent = getActivity().getIntent();