Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b7df4fa0 authored by Jason Monk's avatar Jason Monk Committed by Android (Google) Code Review
Browse files

Merge "Guard against monkey crash."

parents 25a46dbd 73df1a98

src/com/android/settings/wifi/WifiSettings.java

+3 −0
Original line number Diff line number Diff line
@@ -523,6 +523,9 @@ public class WifiSettings extends RestrictedSettingsFragment 
    public boolean onPreferenceTreeClick(Preference preference) {

        if (preference instanceof AccessPointPreference) {

            mSelectedAccessPoint = ((AccessPointPreference) preference).getAccessPoint();

            if (mSelectedAccessPoint == null) {

                return false;

            }

            /** Bypass dialog for unsecured, unsaved, and inactive networks */

            if (mSelectedAccessPoint.getSecurity() == AccessPoint.SECURITY_NONE &&

                    !mSelectedAccessPoint.isSaved() && !mSelectedAccessPoint.isActive()) {