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

Merge "Fix bug #16660405 Stability: ISE in Settings: Observer ... com.android.settings.SettingsPreferenceFragment$1@3c1d9ecb was not registered" into lmp-dev

Browse Source
This commit is contained in:
Fabrice Di Meglio
2014-07-29 23:07:27 +00:00
committed by Android (Google) Code Review
parent 01daaca547 7c435f6b44
commit 76307f52d0
1 changed files with 11 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -66,6 +66,7 @@ public class SettingsPreferenceFragment extends PreferenceFragment implements Di
private boolean mPreferenceHighlighted = false; private boolean mPreferenceHighlighted = false;
private Drawable mHighlightDrawable; private Drawable mHighlightDrawable;
private Object mRegisterLock = new Object();
private boolean mIsDataSetObserverRegistered = false; private boolean mIsDataSetObserverRegistered = false;
private DataSetObserver mDataSetObserver = new DataSetObserver() { private DataSetObserver mDataSetObserver = new DataSetObserver() {
@Override @Override
@@ -153,18 +154,22 @@ public class SettingsPreferenceFragment extends PreferenceFragment implements Di
} }
public void registerObserverIfNeeded() { public void registerObserverIfNeeded() {
synchronized (mRegisterLock) {
if (!mIsDataSetObserverRegistered) { if (!mIsDataSetObserverRegistered) {
getPreferenceScreen().getRootAdapter().registerDataSetObserver(mDataSetObserver); getPreferenceScreen().getRootAdapter().registerDataSetObserver(mDataSetObserver);
mIsDataSetObserverRegistered = true; mIsDataSetObserverRegistered = true;
} }
} }
}
public void unregisterObserverIfNeeded() { public void unregisterObserverIfNeeded() {
synchronized (mRegisterLock) {
if (mIsDataSetObserverRegistered) { if (mIsDataSetObserverRegistered) {
getPreferenceScreen().getRootAdapter().unregisterDataSetObserver(mDataSetObserver); getPreferenceScreen().getRootAdapter().unregisterDataSetObserver(mDataSetObserver);
mIsDataSetObserverRegistered = false; mIsDataSetObserverRegistered = false;
} }
} }
}
public void highlightPreferenceIfNeeded() { public void highlightPreferenceIfNeeded() {
if (isAdded() && !mPreferenceHighlighted &&!TextUtils.isEmpty(mPreferenceKey)) { if (isAdded() && !mPreferenceHighlighted &&!TextUtils.isEmpty(mPreferenceKey)) {