Merge "Add null check for config when clicking on wifi picker entry" into rvc-dev am: e1839d2955 am: fffa6d3a54 am: 76d263bdfc

Change-Id: I03d1c4b41bfff5a75fe07a4ffb18e056981f0a50
This commit is contained in:
Arc Wang
2020-04-02 10:44:11 +00:00
committed by Automerger Merge Worker

View File

@@ -538,7 +538,7 @@ public class WifiSettings2 extends RestrictedSettingsFragment
final WifiEntry selectedEntry =
((LongPressWifiEntryPreference) preference).getWifiEntry();
if (selectedEntry.isSaved()) {
if (selectedEntry.getWifiConfiguration() != null) {
if (!selectedEntry.getWifiConfiguration().getNetworkSelectionStatus()
.hasEverConnected()) {
launchConfigNewNetworkFragment(selectedEntry);