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

am 8cf54264: Merge "Ensure that listener is removed only if it was added" into mnc-dev

Browse Source 
* commit '8cf54264995aea65d77c25b5050cb3aac0196c59':
  Ensure that listener is removed only if it was added
This commit is contained in:
Pavel Zhamaitsiak
2015-08-10 17:35:16 +00:00
committed by Android Git Automerger
parent 41abf66362 8cf5426499
commit f48424e17c
1 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -57,6 +57,8 @@ public class WifiCallingSettings extends SettingsPreferenceFragment
private ListPreference mButtonWfcMode; private ListPreference mButtonWfcMode;
private TextView mEmptyView; private TextView mEmptyView;
private boolean mValidListener = false;
private final PhoneStateListener mPhoneStateListener = new PhoneStateListener() { private final PhoneStateListener mPhoneStateListener = new PhoneStateListener() {
/* /*
* Enable/disable controls when in/out of a call and depending on * Enable/disable controls when in/out of a call and depending on
@@ -172,6 +174,8 @@ public class WifiCallingSettings extends SettingsPreferenceFragment
tm.listen(mPhoneStateListener, PhoneStateListener.LISTEN_CALL_STATE); tm.listen(mPhoneStateListener, PhoneStateListener.LISTEN_CALL_STATE);
mSwitchBar.addOnSwitchChangeListener(this); mSwitchBar.addOnSwitchChangeListener(this);
mValidListener = true;
} }
// NOTE: Buttons will be enabled/disabled in mPhoneStateListener // NOTE: Buttons will be enabled/disabled in mPhoneStateListener
@@ -196,7 +200,9 @@ public class WifiCallingSettings extends SettingsPreferenceFragment
final Context context = getActivity(); final Context context = getActivity();
if (ImsManager.isWfcEnabledByPlatform(getActivity())) { if (mValidListener) {
mValidListener = false;
TelephonyManager tm = (TelephonyManager) getSystemService(Context.TELEPHONY_SERVICE); TelephonyManager tm = (TelephonyManager) getSystemService(Context.TELEPHONY_SERVICE);
tm.listen(mPhoneStateListener, PhoneStateListener.LISTEN_NONE); tm.listen(mPhoneStateListener, PhoneStateListener.LISTEN_NONE);