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

Commit 9b798aa7 authored by Automerger Merge Worker's avatar Automerger Merge Worker
Browse files

Merge "Fix NPE in PanelFragment" am: 06cafcd7 am: 98e3ed4e am: 6ad23a34 

Change-Id: I9b7146a9409ead2395d9abee3aba3416158639a6
parents 1104b5e6 6ad23a34

src/com/android/settings/panel/PanelFragment.java

+6 −0
Original line number Diff line number Diff line
@@ -156,8 +156,13 @@ public class PanelFragment extends Fragment { 


    private void createPanelContent() {

        final FragmentActivity activity = getActivity();

        if (activity == null) {

            return;

        }



        if (mLayoutView == null) {

            activity.finish();

            return;

        }



        mPanelSlices = mLayoutView.findViewById(R.id.panel_parent_layout);
@@ -183,6 +188,7 @@ public class PanelFragment extends Fragment { 


        if (mPanel == null) {

            activity.finish();

            return;

        }



        mPanel.registerCallback(new LocalPanelCallback());