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

Commit 99162f2a authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Add null check to precent crash in monkey test" into qt-dev

parents 1c83c082 be70aaa6

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

+4 −0
Original line number Diff line number Diff line
@@ -25,6 +25,10 @@ public class PanelFeatureProviderImpl implements PanelFeatureProvider { 


    @Override

    public PanelContent getPanel(Context context, String panelType, String mediaPackageName) {

        if (context == null) {

            return null;

        }



        switch (panelType) {

            case Settings.Panel.ACTION_INTERNET_CONNECTIVITY:

                return InternetConnectivityPanel.create(context);

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

+4 −0
Original line number Diff line number Diff line
@@ -170,6 +170,10 @@ public class PanelFragment extends Fragment { 
                .getPanelFeatureProvider()

                .getPanel(activity, panelType, mediaPackageName);



        if (mPanel == null) {

            activity.finish();

        }



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



        mPanelSlices.setLayoutManager(new LinearLayoutManager((activity)));