From f402d8ffd71aa25aa42b1794db0e87ef66b550e1 Mon Sep 17 00:00:00 2001
From: Maurice Lam <yukl@google.com>
Date: Wed, 9 Sep 2015 16:03:00 -0700
Subject: [PATCH] [WifiSetup] Suppress crash during Wi-Fi setup

Bug: 23936498
Change-Id: I7d97995cfb3c904aee3fc1baa50ea3dafe7d72ea
---
 src/com/android/settings/wifi/WifiSettingsForSetupWizard.java | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/com/android/settings/wifi/WifiSettingsForSetupWizard.java b/src/com/android/settings/wifi/WifiSettingsForSetupWizard.java
index e78ee4ab016..7007fa3018b 100644
--- a/src/com/android/settings/wifi/WifiSettingsForSetupWizard.java
+++ b/src/com/android/settings/wifi/WifiSettingsForSetupWizard.java
@@ -19,6 +19,7 @@ package com.android.settings.wifi;
 import android.app.Dialog;
 import android.net.wifi.WifiConfiguration;
 import android.os.Bundle;
+import android.preference.PreferenceScreen;
 import android.text.TextUtils;
 import android.view.LayoutInflater;
 import android.view.Menu;
@@ -94,7 +95,8 @@ public class WifiSettingsForSetupWizard extends WifiSettings {
     @Override
     public void onAccessPointsChanged() {
         super.onAccessPointsChanged();
-        updateFooter(getPreferenceScreen().getPreferenceCount() == 0);
+        PreferenceScreen preferenceScreen = getPreferenceScreen();
+        updateFooter(preferenceScreen == null || preferenceScreen.getPreferenceCount() == 0);
     }
 
     @Override