commit 26650e773b3f8b4b4f0f890b8cdca9cd851be8be
author Raff Tsai <rafftsai@google.com> Sat Mar 09 01:53:35 2019 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Sat Mar 09 01:53:35 2019 +0000
tree 0943eae15ce40c5d6f62f7f8678ed7066f2e9c73
parent aa4748d0a1943fa72c4c861934661cbdccf682db
parent bf1fa0c2a6295d55b8a131658258ce5f9f1d5e12

Merge "Fix Settings crash"

src/com/android/settings/print/PrintServiceSettingsFragment.java

diff --git a/src/com/android/settings/print/PrintServiceSettingsFragment.java b/src/com/android/settings/print/PrintServiceSettingsFragment.java
index d120062..8d40175 100644
--- a/src/com/android/settings/print/PrintServiceSettingsFragment.java
+++ b/src/com/android/settings/print/PrintServiceSettingsFragment.java
@@ -143,6 +143,8 @@
     @Override
     public void onStart() {
         super.onStart();
+        initComponents();
+        updateUiForArguments();
         updateEmptyView();
         updateUiForServiceState();
     }
@@ -158,20 +160,9 @@
     @Override
     public void onStop() {
         super.onStop();
-    }
-
-    @Override
-    public void onViewCreated(View view, Bundle savedInstanceState) {
-        super.onViewCreated(view, savedInstanceState);
-        initComponents();
-        updateUiForArguments();
-    }
-
-    @Override
-    public void onDestroyView() {
-        super.onDestroyView();
         mSwitchBar.removeOnSwitchChangeListener(this);
         mSwitchBar.hide();
+        mPrintersAdapter.unregisterAdapterDataObserver(mDataObserver);
     }
 
     private void onPreferenceToggled(String preferenceKey, boolean enabled) {