From 47e0556e982f3ac77030a763c987d07e753c2d7a Mon Sep 17 00:00:00 2001
From: Yanting Yang <yantingyang@google.com>
Date: Wed, 20 Jan 2021 16:40:10 +0000
Subject: [PATCH] Revert "Workaround Wi-Fi Settings NullPointerException"

This reverts commit 99eb12048c66efd3ae5371ceda741c17f5f7c7f7.

Reason for revert: Revert this workaround since the real solution has been submitted and released. More information please see b/177766209.

Change-Id: I566194ff71bb9e912407d6d4b3798adc6be71779
---
 src/com/android/settings/SettingsPreferenceFragment.java | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/src/com/android/settings/SettingsPreferenceFragment.java b/src/com/android/settings/SettingsPreferenceFragment.java
index ce1c2c9ad8b..2c628f6f375 100644
--- a/src/com/android/settings/SettingsPreferenceFragment.java
+++ b/src/com/android/settings/SettingsPreferenceFragment.java
@@ -177,19 +177,11 @@ 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);
     }