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
diff --git a/src/com/android/settings/DreamSettings.java b/src/com/android/settings/DreamSettings.java
index 580c1fc..1175639 100644
--- a/src/com/android/settings/DreamSettings.java
+++ b/src/com/android/settings/DreamSettings.java
@@ -82,17 +82,11 @@
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 @@
mAdapter = new DreamInfoAdapter(mContext);
listView.setAdapter(mAdapter);
+
+ final SettingsActivity sa = (SettingsActivity) getActivity();
+ mSwitchBar = sa.getSwitchBar();
+ mSwitch = mSwitchBar.getSwitch();
}
@Override