Merge "Add null check to precent crash in monkey test" into qt-dev am: 99162f2a35

am: b84816d05b

Change-Id: I999d335a653e461ec140f87bbfa4c936ca7e5a59

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

@@ -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

@@ -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)));