4242import android .support .v7 .preference .Preference ;
4343import android .support .v7 .preference .PreferenceViewHolder ;
4444import android .text .Spannable ;
45+ import android .text .TextUtils ;
4546import android .text .style .TextAppearanceSpan ;
4647import android .util .Log ;
4748import android .view .ContextMenu ;
5455import android .widget .TextView ;
5556import android .widget .TextView .BufferType ;
5657import android .widget .Toast ;
58+
5759import com .android .internal .logging .MetricsLogger ;
5860import com .android .internal .logging .MetricsProto .MetricsEvent ;
5961import com .android .settings .LinkifyUtils ;
@@ -612,7 +614,6 @@ public void onAccessPointsChanged() {
612614 // AccessPoints are automatically sorted with TreeSet.
613615 final Collection <AccessPoint > accessPoints =
614616 mWifiTracker .getAccessPoints ();
615- getPreferenceScreen ().removeAll ();
616617
617618 boolean hasAvailableAccessPoints = false ;
618619 int index = 0 ;
@@ -621,6 +622,9 @@ public void onAccessPointsChanged() {
621622 // Ignore access points that are out of range.
622623 if (accessPoint .getLevel () != -1 ) {
623624 String key = accessPoint .getBssid ();
625+ if (TextUtils .isEmpty (key )) {
626+ key = accessPoint .getSsidStr ();
627+ }
624628 hasAvailableAccessPoints = true ;
625629 LongPressAccessPointPreference pref = (LongPressAccessPointPreference )
626630 getCachedPreference (key );
0 commit comments