PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Add test and fix null keys in search providers."

Browse Source
This commit is contained in:
TreeHugger Robot
2017-11-16 23:21:51 +00:00
committed by Android (Google) Code Review
parent 12108840a0 7d5c9ace64
commit 268de492c8
15 changed files with 115 additions and 191 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/com/android/settings/wifi/WifiSettings.java
View File

@@ -68,7 +68,6 @@ import com.android.settingslib.RestrictedLockUtils;
import com.android.settingslib.wifi.AccessPoint;
import com.android.settingslib.wifi.AccessPoint.AccessPointListener;
import com.android.settingslib.wifi.AccessPointPreference;
import com.android.settingslib.wifi.WifiSavedConfigUtils;
import com.android.settingslib.wifi.WifiTracker;
import com.android.settingslib.wifi.WifiTrackerFactory;
@@ -1117,18 +1116,6 @@ public class WifiSettings extends RestrictedSettingsFragment
data.key = DATA_KEY_REFERENCE;
result.add(data);
// Add saved Wi-Fi access points
final List<AccessPoint> accessPoints =
WifiSavedConfigUtils.getAllConfigs(context,
context.getSystemService(WifiManager.class));
for (AccessPoint accessPoint : accessPoints) {
data = new SearchIndexableRaw(context);
data.title = accessPoint.getSsidStr();
data.screenTitle = res.getString(R.string.wifi_settings);
data.enabled = enabled;
result.add(data);
}
return result;
}
};