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

This commit is contained in:
Fabrice Di Meglio
2014-05-20 00:32:37 +00:00
committed by Android (Google) Code Review

View File

@@ -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