From 38f2b27c0dc49c423b29e4c0cb241c03bfd0b637 Mon Sep 17 00:00:00 2001
From: Fabrice Di Meglio <fdimeglio@google.com>
Date: Tue, 20 May 2014 12:26:16 -0700
Subject: [PATCH] Fix bug #15109661 Settings crash after tap on back key from
 print settings

- use onResume() / onPause() for adding / removing the SwitchChangeListener

Change-Id: Ia3a4ff57075d2668e446df4f4f09e4593cc34761
---
 .../print/PrintServiceSettingsFragment.java         | 13 ++++---------
 1 file changed, 4 insertions(+), 9 deletions(-)

diff --git a/src/com/android/settings/print/PrintServiceSettingsFragment.java b/src/com/android/settings/print/PrintServiceSettingsFragment.java
index 3e1dd0f5dcb..f104a06d8f9 100644
--- a/src/com/android/settings/print/PrintServiceSettingsFragment.java
+++ b/src/com/android/settings/print/PrintServiceSettingsFragment.java
@@ -143,12 +143,16 @@ public class PrintServiceSettingsFragment extends SettingsPreferenceFragment
         mSettingsContentObserver.register(getContentResolver());
         updateEmptyView();
         updateUiForServiceState();
+        mSwitchBar.addOnSwitchChangeListener(this);
+        mSwitchBar.show();
     }
 
     @Override
     public void onPause() {
         mSettingsContentObserver.unregister(getContentResolver());
         super.onPause();
+        mSwitchBar.removeOnSwitchChangeListener(this);
+        mSwitchBar.hide();
     }
 
     @Override
@@ -158,20 +162,11 @@ public class PrintServiceSettingsFragment extends SettingsPreferenceFragment
         updateUiForArguments();
     }
 
-    @Override
-    public void onStart() {
-        super.onStart();
-        mSwitchBar.addOnSwitchChangeListener(this);
-        mSwitchBar.show();
-    }
-
     @Override
     public void onDestroyView() {
         if (mOldActivityTitle != null) {
             getActivity().getActionBar().setTitle(mOldActivityTitle);
         }
-        mSwitchBar.removeOnSwitchChangeListener(this);
-        mSwitchBar.hide();
         super.onDestroyView();
     }