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 am: fecc24cc53

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14124307

Change-Id: I5698f80013db895172cef98cef8550f2875e4951
This commit is contained in:
Jason Chiu
2021-04-09 14:56:35 +00:00
committed by Automerger Merge Worker
parent 52a0f72c87 fecc24cc53
commit 90b565dd22
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) {