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

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15100488

Change-Id: I1744c57acb1533742f76be65306f7b77ed5b0f62
This commit is contained in:
TreeHugger Robot
2021-06-28 03:39:41 +00:00
committed by Automerger Merge Worker
parent 336712f18c ff50eb43a3
commit 0938fc250d
1 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

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