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

Merge "Fix bug #14288652 Settings crash on hitting back key from Tap and Pay screen"

Browse Source
This commit is contained in:
Fabrice Di Meglio
2014-04-24 17:36:53 +00:00
committed by Android (Google) Code Review
parent 04f7e47458 405febf56a
commit b9968ff679
1 changed files with 12 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -113,16 +113,24 @@ public class SettingsPreferenceFragment extends PreferenceFragment implements Di
@Override
protected void onBindPreferences() {
registerObserverIfNeeded();
}
@Override
public void onStop() {
super.onStop();
unregisterObserverIfNeeded();
}
public void registerObserverIfNeeded() {
if (!mIsDataSetObserverRegistered) {
getPreferenceScreen().getRootAdapter().registerDataSetObserver(mDataSetObserver);
mIsDataSetObserverRegistered = true;
}
}
@Override
public void onDestroy() {
super.onDestroy();
public void unregisterObserverIfNeeded() {
if (mIsDataSetObserverRegistered) {
getPreferenceScreen().getRootAdapter().unregisterDataSetObserver(mDataSetObserver);
mIsDataSetObserverRegistered = false;