From 5b58e6d2ae2840e7f6b324dc83d1934bd0ec8380 Mon Sep 17 00:00:00 2001
From: Mill Chen <millchen@google.com>
Date: Thu, 1 Jul 2021 11:29:26 +0800
Subject: [PATCH] Add null checker to AppBarLayout

Fix: 191746368
Test: run atest CellBroadcastReceiverOemUnitTests on R
Change-Id: Id8130466fd282b68137ee8d848041f8607bf80a4
---
 .../collapsingtoolbar/CollapsingToolbarBaseActivity.java      | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/packages/SettingsLib/CollapsingToolbarBaseActivity/src/com/android/settingslib/collapsingtoolbar/CollapsingToolbarBaseActivity.java b/packages/SettingsLib/CollapsingToolbarBaseActivity/src/com/android/settingslib/collapsingtoolbar/CollapsingToolbarBaseActivity.java
index 395a9a716a9bc..8b1e397c2199c 100644
--- a/packages/SettingsLib/CollapsingToolbarBaseActivity/src/com/android/settingslib/collapsingtoolbar/CollapsingToolbarBaseActivity.java
+++ b/packages/SettingsLib/CollapsingToolbarBaseActivity/src/com/android/settingslib/collapsingtoolbar/CollapsingToolbarBaseActivity.java
@@ -58,7 +58,9 @@ public class CollapsingToolbarBaseActivity extends FragmentActivity implements
         super.setContentView(R.layout.collapsing_toolbar_base_layout);
         mCollapsingToolbarLayout = findViewById(R.id.collapsing_toolbar);
         mAppBarLayout = findViewById(R.id.app_bar);
-        mAppBarLayout.addOnOffsetChangedListener(this);
+        if (mAppBarLayout != null) {
+            mAppBarLayout.addOnOffsetChangedListener(this);
+        }
         if (savedInstanceState != null) {
             mIsToolbarCollapsed = savedInstanceState.getBoolean(KEY_IS_TOOLBAR_COLLAPSED);
         }