Merge "[WifiSetup] Suppress crash during Wi-Fi setup"

This commit is contained in:
Maurice Lam
2015-09-10 01:03:54 +00:00
committed by Android (Google) Code Review

View File

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