Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b654a072 authored by Fabrice Di Meglio's avatar Fabrice Di Meglio Committed by Android (Google) Code Review
Browse files

Merge "Fix bug #15086008 NPE observed after user setup device daydream... 

Merge "Fix bug #15086008 NPE observed after user setup device daydream followed by device orientation"
parents 29d8e8bc 28ffbd3b

src/com/android/settings/DreamSettings.java

+5 −7
Original line number Diff line number Diff line
@@ -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