Avoid removing switch even listener multiple times (42fa9734) · Commits · e / os / android_packages_apps_Settings

src/com/android/settings/location/LocationSettings.java

+12 −15

Original line number	Diff line number	Diff line
		@@ -54,17 +54,13 @@ public class LocationSettings extends LocationSettingsBase

		private SwitchBar mSwitchBar;
		private Switch mSwitch;
		private boolean mValidListener;
		private boolean mValidListener = false;
		private Preference mLocationMode;
		private PreferenceCategory mCategoryRecentLocationRequests;
		/** Receives UPDATE_INTENT */
		private BroadcastReceiver mReceiver;
		private SettingsInjector injector;

		public LocationSettings() {
		mValidListener = false;
		}

		@Override
		public void onActivityCreated(Bundle savedInstanceState) {
		super.onActivityCreated(savedInstanceState);
		@@ -79,22 +75,18 @@ public class LocationSettings extends LocationSettingsBase
		@Override
		public void onDestroyView() {
		super.onDestroyView();

		mSwitchBar.hide();
		}

		@Override
		public void onStop() {
		super.onStop();
		}

		@Override
		public void onResume() {
		super.onResume();
		createPreferenceHierarchy();
		if (!mValidListener) {
		mSwitchBar.addOnSwitchChangeListener(this);
		mValidListener = true;
		}
		}

		@Override
		public void onPause() {
		@@ -102,11 +94,16 @@ public class LocationSettings extends LocationSettingsBase
		getActivity().unregisterReceiver(mReceiver);
		} catch (RuntimeException e) {
		// Ignore exceptions caused by race condition
		if (Log.isLoggable(TAG, Log.VERBOSE)) {
		Log.v(TAG, "Swallowing " + e);
		}
		super.onPause();
		}
		if (mValidListener) {
		mSwitchBar.removeOnSwitchChangeListener(this);
		mValidListener = false;
		}
		super.onPause();
		}

		private void addPreferencesSorted(List<Preference> prefs, PreferenceGroup container) {
		// If there's some items to display, sort the items and add them to the container.