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

Fix bug #16660405 Stability: ISE in Settings: Observer ...

Browse Source 
com.android.settings.SettingsPreferenceFragment$1@3c1d9ecb was not registered

- use a monitor to control registering / unregistering

Change-Id: Id66dd698abf92643c97938e2091c3be38e6b78bd
This commit is contained in:
Fabrice Di Meglio
2014-07-29 16:02:22 -07:00
parent d5ec63ad51
commit 7c435f6b44
1 changed files with 11 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
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,16 +154,20 @@ public class SettingsPreferenceFragment extends PreferenceFragment implements Di
} }
public void registerObserverIfNeeded() { public void registerObserverIfNeeded() {
if (!mIsDataSetObserverRegistered) { synchronized (mRegisterLock) {
getPreferenceScreen().getRootAdapter().registerDataSetObserver(mDataSetObserver); if (!mIsDataSetObserverRegistered) {
mIsDataSetObserverRegistered = true; getPreferenceScreen().getRootAdapter().registerDataSetObserver(mDataSetObserver);
mIsDataSetObserverRegistered = true;
}
} }
} }
public void unregisterObserverIfNeeded() { public void unregisterObserverIfNeeded() {
if (mIsDataSetObserverRegistered) { synchronized (mRegisterLock) {
getPreferenceScreen().getRootAdapter().unregisterDataSetObserver(mDataSetObserver); if (mIsDataSetObserverRegistered) {
mIsDataSetObserverRegistered = false; getPreferenceScreen().getRootAdapter().unregisterDataSetObserver(mDataSetObserver);
mIsDataSetObserverRegistered = false;
}
} }
} }