commit 2f03bda6a65a68fa0517fcfcf5ef85919cb995ce
author Rubin Xu <rubinxu@google.com> Fri Apr 09 15:03:19 2021 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Fri Apr 09 15:03:19 2021 +0000
tree 2940a47d4fc3810027763570c0ea600fe631ef3f
parent fecc24cc5333c9c89c577845d421842296a905be
parent 1ac05237abf6f4a1f07aa1abcb4c4d24ace80024

Merge "Update titles & messages for password enrolment flows" into sc-dev

src/com/android/settings/panel/PanelFragment.java

diff --git a/src/com/android/settings/panel/PanelFragment.java b/src/com/android/settings/panel/PanelFragment.java
index e7c1bef..73d0976 100644
--- a/src/com/android/settings/panel/PanelFragment.java
+++ b/src/com/android/settings/panel/PanelFragment.java
@@ -394,7 +394,11 @@
                     .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) {