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

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

Browse Source 
am: 99162f2a35

Change-Id: I0f97e3b46e081fca41190ba9ea10d839f268511a
This commit is contained in:
lindatseng
2019-05-22 13:22:01 -07:00
committed by android-build-merger
parent 4679c46a8a 99162f2a35
commit b84816d05b
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)));