Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fix NPE crash in PermissionController" into sc-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2021-06-28 03:36:09 +00:00
committed by Android (Google) Code Review
parent c62d247cd5 5165374be0
commit ff50eb43a3
1 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
packages/SettingsLib/CollapsingToolbarBaseActivity/src/com/android/settingslib/collapsingtoolbar/CollapsingToolbarBaseFragment.java
View File

@@ -59,7 +59,9 @@ public abstract class CollapsingToolbarBaseFragment extends Fragment implements
false); false);
mCollapsingToolbarLayout = view.findViewById(R.id.collapsing_toolbar); mCollapsingToolbarLayout = view.findViewById(R.id.collapsing_toolbar);
mAppBarLayout = view.findViewById(R.id.app_bar); mAppBarLayout = view.findViewById(R.id.app_bar);
if (mAppBarLayout != null) {
mAppBarLayout.addOnOffsetChangedListener(this); mAppBarLayout.addOnOffsetChangedListener(this);
}
if (savedInstanceState != null) { if (savedInstanceState != null) {
mIsToolbarCollapsed = savedInstanceState.getBoolean(KEY_IS_TOOLBAR_COLLAPSED); mIsToolbarCollapsed = savedInstanceState.getBoolean(KEY_IS_TOOLBAR_COLLAPSED);
} }