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

Commit 06cafcd7 authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

Merge "Fix NPE in PanelFragment"

parents c6603dfd 26aaf07e

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

+6 −0
Original line number Diff line number Diff line
@@ -144,8 +144,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);
@@ -172,6 +177,7 @@ public class PanelFragment extends Fragment { 


        if (mPanel == null) {

            activity.finish();

            return;

        }



        mMetricsProvider = FeatureFactory.getFactory(activity).getMetricsFeatureProvider();