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

Merge "Guard against NullPointerException when getActivity in PanelFragment" into sc-dev

Browse Source
This commit is contained in:
Jason Chiu
2021-04-09 14:25:31 +00:00
committed by Android (Google) Code Review
parent cdd73e7fec c4cead363c
commit fecc24cc53
1 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/com/android/settings/panel/PanelFragment.java
View File

@@ -394,7 +394,11 @@ public class PanelFragment extends Fragment {
.addOnGlobalLayoutListener(mOnGlobalLayoutListener); .addOnGlobalLayoutListener(mOnGlobalLayoutListener);
mPanelSlices.setVisibility(View.VISIBLE); 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 itemDecoration
.setDividerCondition(DividerItemDecoration.DIVIDER_CONDITION_BOTH); .setDividerCondition(DividerItemDecoration.DIVIDER_CONDITION_BOTH);
if (mPanelSlices.getItemDecorationCount() == 0) { if (mPanelSlices.getItemDecorationCount() == 0) {