Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9e0f65d2 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Fix NPE crash in PermissionController" into sc-dev am: ff50eb43 

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

Change-Id: I822c547657a6e7b51566ee5468654717989774ea
parents c86385aa ff50eb43

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

+3 −1
Original line number Diff line number Diff line
@@ -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);

        if (mAppBarLayout != null) {

            mAppBarLayout.addOnOffsetChangedListener(this);

        }

        if (savedInstanceState != null) {

            mIsToolbarCollapsed = savedInstanceState.getBoolean(KEY_IS_TOOLBAR_COLLAPSED);

        }