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

Change-Id: I710a54c16476313e83bf8ee9c12c0712a184c65c
2020-03-02 11:52:50 +00:00
parent 454dbfd402 98e3ed4e5d
commit 6ad23a342d
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
@@ -156,8 +156,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);
@@ -183,6 +188,7 @@ public class PanelFragment extends Fragment {

        if (mPanel == null) {
            activity.finish();
+            return;
        }

        mPanel.registerCallback(new LocalPanelCallback());