am 2bcd9c6e: am eb5e633a: am 608a200d: Merge "Stability fixes for... (0daf40ca) · Commits · e / os / android_frameworks_base

core/java/android/preference/PreferenceFragment.java

+7 −2

Original line number	Diff line number	Diff line
		@@ -146,7 +146,6 @@ public abstract class PreferenceFragment extends Fragment implements
		super.onCreate(savedInstanceState);
		mPreferenceManager = new PreferenceManager(getActivity(), FIRST_REQUEST_CODE);
		mPreferenceManager.setFragment(this);
		mPreferenceManager.setOnPreferenceTreeClickListener(this);
		}

		@Override
		@@ -178,10 +177,17 @@ public abstract class PreferenceFragment extends Fragment implements
		}
		}

		@Override
		public void onStart() {
		super.onStart();
		mPreferenceManager.setOnPreferenceTreeClickListener(this);
		}

		@Override
		public void onStop() {
		super.onStop();
		mPreferenceManager.dispatchActivityStop();
		mPreferenceManager.setOnPreferenceTreeClickListener(null);
		}

		@Override
		@@ -196,7 +202,6 @@ public abstract class PreferenceFragment extends Fragment implements
		public void onDestroy() {
		super.onDestroy();
		mPreferenceManager.dispatchActivityDestroy();
		mPreferenceManager.setOnPreferenceTreeClickListener(null);
		}

		@Override