From 5165374be0f64489d4a009a88b5092d0608eb500 Mon Sep 17 00:00:00 2001
From: Mill Chen <millchen@google.com>
Date: Sat, 26 Jun 2021 05:57:33 +0800
Subject: Fix NPE crash in PermissionController

Fix: 192101825
Test: manual test
Change-Id: I18dec61f41bedb121863f78898e105b1e3f82bf9
---
 .../settingslib/collapsingtoolbar/CollapsingToolbarBaseFragment.java  | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/packages/SettingsLib/CollapsingToolbarBaseActivity/src/com/android/settingslib/collapsingtoolbar/CollapsingToolbarBaseFragment.java b/packages/SettingsLib/CollapsingToolbarBaseActivity/src/com/android/settingslib/collapsingtoolbar/CollapsingToolbarBaseFragment.java
index faa73ff52d56..345392814c8f 100644
--- a/packages/SettingsLib/CollapsingToolbarBaseActivity/src/com/android/settingslib/collapsingtoolbar/CollapsingToolbarBaseFragment.java
+++ b/packages/SettingsLib/CollapsingToolbarBaseActivity/src/com/android/settingslib/collapsingtoolbar/CollapsingToolbarBaseFragment.java
@@ -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);
         }
-- 
cgit v1.2.3-59-g8ed1b