Merge "Revert "Workaround Wi-Fi Settings NullPointerException""

This commit is contained in:
TreeHugger Robot
2021-01-21 02:44:15 +00:00
committed by Android (Google) Code Review

View File

@@ -177,19 +177,11 @@ public abstract class SettingsPreferenceFragment extends InstrumentedPreferenceF
} }
public void setPinnedHeaderView(View pinnedHeader) { public void setPinnedHeaderView(View pinnedHeader) {
if (mPinnedHeaderFrameLayout == null) {
Log.e(TAG, "setPinnedHeaderView: null layout");
return;
}
mPinnedHeaderFrameLayout.addView(pinnedHeader); mPinnedHeaderFrameLayout.addView(pinnedHeader);
mPinnedHeaderFrameLayout.setVisibility(View.VISIBLE); mPinnedHeaderFrameLayout.setVisibility(View.VISIBLE);
} }
public void showPinnedHeader(boolean show) { public void showPinnedHeader(boolean show) {
if (mPinnedHeaderFrameLayout == null) {
Log.e(TAG, "showPinnedHeader: null layout");
return;
}
mPinnedHeaderFrameLayout.setVisibility(show ? View.VISIBLE : View.INVISIBLE); mPinnedHeaderFrameLayout.setVisibility(show ? View.VISIBLE : View.INVISIBLE);
} }