diff options
| author | Fabrice Di Meglio <fdimeglio@google.com> | 2014-05-20 00:32:37 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-05-20 00:32:37 +0000 |
| commit | b654a07263e3b163fc1a58f7df717f2d2fb5c7f1 (patch) | |
| tree | 556c36772d8396f47b5dd45692d406881ad5fbcd | |
| parent | 29d8e8bc0d8aea8ea2e8208b6745cb0f1c802de5 (diff) | |
| parent | 28ffbd3ba7b47cf38ff33d45b35906ea73171ad8 (diff) | |
| download | packages_apps_Settings-b654a07263e3b163fc1a58f7df717f2d2fb5c7f1.zip packages_apps_Settings-b654a07263e3b163fc1a58f7df717f2d2fb5c7f1.tar.gz packages_apps_Settings-b654a07263e3b163fc1a58f7df717f2d2fb5c7f1.tar.bz2 | |
Merge "Fix bug #15086008 NPE observed after user setup device daydream followed by device orientation"
| -rw-r--r-- | src/com/android/settings/DreamSettings.java | 12 |
1 files changed, 5 insertions, 7 deletions
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 @@ 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 |