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

src/com/android/settings/SettingsPreferenceFragment.java

@@ -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 unregisterObserverIfNeeded() {
-    public void onDestroy() {
-        super.onDestroy();
-
         if (mIsDataSetObserverRegistered) {
             getPreferenceScreen().getRootAdapter().unregisterDataSetObserver(mDataSetObserver);
             mIsDataSetObserverRegistered = false;