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

Merge "Fix NPE java.lang.IllegalStateException: Observer com.android.settings.SettingsPreferenceFragment$1@373ee1aa is already registered."

Browse Source
This commit is contained in:
Fabrice Di Meglio
2014-04-21 18:49:43 +00:00
committed by Android (Google) Code Review
parent 842cff926c 829c8fb2bc
commit 3e000df132
1 changed files with 9 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/com/android/settings/SettingsPreferenceFragment.java
View File

@@ -62,6 +62,7 @@ public class SettingsPreferenceFragment extends PreferenceFragment implements Di
private String mPreferenceKey; private String mPreferenceKey;
private boolean mPreferenceHighlighted = false; private boolean mPreferenceHighlighted = false;
private boolean mIsDataSetObserverRegistered = false;
private DataSetObserver mDataSetObserver = new DataSetObserver() { private DataSetObserver mDataSetObserver = new DataSetObserver() {
@Override @Override
public void onChanged() { public void onChanged() {
@@ -112,14 +113,20 @@ public class SettingsPreferenceFragment extends PreferenceFragment implements Di
@Override @Override
protected void onBindPreferences() { protected void onBindPreferences() {
getPreferenceScreen().getRootAdapter().registerDataSetObserver(mDataSetObserver); if (!mIsDataSetObserverRegistered) {
getPreferenceScreen().getRootAdapter().registerDataSetObserver(mDataSetObserver);
mIsDataSetObserverRegistered = true;
}
} }
@Override @Override
public void onDestroy() { public void onDestroy() {
super.onDestroy(); super.onDestroy();
getPreferenceScreen().getRootAdapter().unregisterDataSetObserver(mDataSetObserver); if (mIsDataSetObserverRegistered) {
getPreferenceScreen().getRootAdapter().unregisterDataSetObserver(mDataSetObserver);
mIsDataSetObserverRegistered = false;
}
} }
public void highlightPreferenceIfNeeded() { public void highlightPreferenceIfNeeded() {