PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add null check to precent crash in monkey test

Browse Source 
Fixes: 133259172
Test: manual
Change-Id: Ib4dd24965fda40a7a917397bf558309e0424bf16
This commit is contained in:
lindatseng
2019-05-22 10:36:50 -07:00
parent b6012f8d62
commit be70aaa6c4
2 changed files with 8 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/com/android/settings/panel/PanelFeatureProviderImpl.java
View File

@@ -25,6 +25,10 @@ public class PanelFeatureProviderImpl implements PanelFeatureProvider {
@Override @Override
public PanelContent getPanel(Context context, String panelType, String mediaPackageName) { public PanelContent getPanel(Context context, String panelType, String mediaPackageName) {
if (context == null) {
return null;
}
switch (panelType) { switch (panelType) {
case Settings.Panel.ACTION_INTERNET_CONNECTIVITY: case Settings.Panel.ACTION_INTERNET_CONNECTIVITY:
return InternetConnectivityPanel.create(context); return InternetConnectivityPanel.create(context);

4
src/com/android/settings/panel/PanelFragment.java
View File

@@ -170,6 +170,10 @@ public class PanelFragment extends Fragment {
.getPanelFeatureProvider() .getPanelFeatureProvider()
.getPanel(activity, panelType, mediaPackageName); .getPanel(activity, panelType, mediaPackageName);
if (mPanel == null) {
activity.finish();
}
mMetricsProvider = FeatureFactory.getFactory(activity).getMetricsFeatureProvider(); mMetricsProvider = FeatureFactory.getFactory(activity).getMetricsFeatureProvider();
mPanelSlices.setLayoutManager(new LinearLayoutManager((activity))); mPanelSlices.setLayoutManager(new LinearLayoutManager((activity)));