From 28ffbd3ba7b47cf38ff33d45b35906ea73171ad8 Mon Sep 17 00:00:00 2001
From: Fabrice Di Meglio <fdimeglio@google.com>
Date: Mon, 19 May 2014 17:30:23 -0700
Subject: [PATCH] Fix bug #15086008 NPE observed after user setup device
 daydream followed by device orientation

- get the Switch reference when the fragment activity has been created
and thus into onActivityCreated(Bundle)

Change-Id: I16c8e42ff225db029d017c392f4273a1fe277a21
---
 src/com/android/settings/DreamSettings.java | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

diff --git a/src/com/android/settings/DreamSettings.java b/src/com/android/settings/DreamSettings.java
index 580c1fc312f..1175639deeb 100644
--- a/src/com/android/settings/DreamSettings.java
+++ b/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(activity);
-
-        mSwitchBar = activity.getSwitchBar();
-        mSwitch = mSwitchBar.getSwitch();
+        mBackend = new DreamBackend(getActivity());
 
         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