From c4cead363c3def47749b142b137e501d7ced87d0 Mon Sep 17 00:00:00 2001
From: Jason Chiu <chiujason@google.com>
Date: Thu, 8 Apr 2021 16:39:27 +0800
Subject: [PATCH] Guard against NullPointerException when getActivity in
 PanelFragment

Fixes: 169729372
Test: build
Change-Id: I2f5bbb38015b71ecf82bc8ed7ab8e5815a2bd2f9
---
 src/com/android/settings/panel/PanelFragment.java | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/com/android/settings/panel/PanelFragment.java b/src/com/android/settings/panel/PanelFragment.java
index e7c1bef1e02..73d0976ceff 100644
--- a/src/com/android/settings/panel/PanelFragment.java
+++ b/src/com/android/settings/panel/PanelFragment.java
@@ -394,7 +394,11 @@ public class PanelFragment extends Fragment {
                     .addOnGlobalLayoutListener(mOnGlobalLayoutListener);
             mPanelSlices.setVisibility(View.VISIBLE);
 
-            final DividerItemDecoration itemDecoration = new DividerItemDecoration(getActivity());
+            final FragmentActivity activity = getActivity();
+            if (activity == null) {
+                return;
+            }
+            final DividerItemDecoration itemDecoration = new DividerItemDecoration(activity);
             itemDecoration
                     .setDividerCondition(DividerItemDecoration.DIVIDER_CONDITION_BOTH);
             if (mPanelSlices.getItemDecorationCount() == 0) {