Merge "Fix bug #15086008 NPE observed after user setup device daydream followed by device orientation"

src/com/android/settings/DreamSettings.java

@@ -82,17 +82,11 @@ public class DreamSettings extends SettingsPreferenceFragment implements
         logd("onCreate(%s)", icicle);
         super.onCreate(icicle);
 
-        final SettingsActivity activity = (SettingsActivity) getActivity();
+        mBackend = new DreamBackend(getActivity());
-
-        mBackend = new DreamBackend(activity);
-
-        mSwitchBar = activity.getSwitchBar();
-        mSwitch = mSwitchBar.getSwitch();
 
         setHasOptionsMenu(true);
     }
 
-
     @Override
     public void onSwitchChanged(Switch switchView, boolean isChecked) {
         if (!mRefreshing) {
@@ -127,6 +121,10 @@ public class DreamSettings extends SettingsPreferenceFragment implements
 
         mAdapter = new DreamInfoAdapter(mContext);
         listView.setAdapter(mAdapter);
+
+        final SettingsActivity sa = (SettingsActivity) getActivity();
+        mSwitchBar = sa.getSwitchBar();
+        mSwitch = mSwitchBar.getSwitch();
     }
 
     @Override