Merge "Fix NPE in PanelFragment" am: 06cafcd733 am: 98e3ed4e5d

Change-Id: I61005104a53c8e79a045be4186ec9f46df4d15f5
2020-03-02 11:52:51 +00:00
parent 7444c5f649 98e3ed4e5d
commit 711b69b788
1 changed files with 6 additions and 0 deletions
--- a/src/com/android/settings/panel/PanelFragment.java
+++ b/src/com/android/settings/panel/PanelFragment.java
@@ -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();