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

Change-Id: Iba4ae723e6bc535bd707365341f7db88421ed5aa
This commit is contained in:
Arc Wang
2020-04-02 11:00:39 +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);