From 99eb12048c66efd3ae5371ceda741c17f5f7c7f7 Mon Sep 17 00:00:00 2001
From: Weng Su <wengsu@google.com>
Date: Mon, 18 Jan 2021 07:32:29 +0000
Subject: [PATCH] Workaround Wi-Fi Settings NullPointerException

- Add null pointer checking to avoid unexpected crash.

Bug: 177782266
Test: manual test
Change-Id: I2d9ce1777adbc80bb6c40b7bb830de12bb0a9748
---
 src/com/android/settings/SettingsPreferenceFragment.java | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/src/com/android/settings/SettingsPreferenceFragment.java b/src/com/android/settings/SettingsPreferenceFragment.java
index 2c628f6f375..ce1c2c9ad8b 100644
--- a/src/com/android/settings/SettingsPreferenceFragment.java
+++ b/src/com/android/settings/SettingsPreferenceFragment.java
@@ -177,11 +177,19 @@ public abstract class SettingsPreferenceFragment extends InstrumentedPreferenceF
     }
 
     public void setPinnedHeaderView(View pinnedHeader) {
+        if (mPinnedHeaderFrameLayout == null) {
+            Log.e(TAG, "setPinnedHeaderView: null layout");
+            return;
+        }
         mPinnedHeaderFrameLayout.addView(pinnedHeader);
         mPinnedHeaderFrameLayout.setVisibility(View.VISIBLE);
     }
 
     public void showPinnedHeader(boolean show) {
+        if (mPinnedHeaderFrameLayout == null) {
+            Log.e(TAG, "showPinnedHeader: null layout");
+            return;
+        }
         mPinnedHeaderFrameLayout.setVisibility(show ? View.VISIBLE : View.INVISIBLE);
     }