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

Merge "Guard against monkey crash."

Browse Source
This commit is contained in:
Jason Monk
2015-11-30 20:11:20 +00:00
committed by Android (Google) Code Review
parent 25a46dbd5c 73df1a9894
commit b7df4fa0d3
1 changed files with 3 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -523,6 +523,9 @@ public class WifiSettings extends RestrictedSettingsFragment
public boolean onPreferenceTreeClick(Preference preference) { public boolean onPreferenceTreeClick(Preference preference) {
if (preference instanceof AccessPointPreference) { if (preference instanceof AccessPointPreference) {
mSelectedAccessPoint = ((AccessPointPreference) preference).getAccessPoint(); mSelectedAccessPoint = ((AccessPointPreference) preference).getAccessPoint();
if (mSelectedAccessPoint == null) {
return false;
}
/** Bypass dialog for unsecured, unsaved, and inactive networks */ /** Bypass dialog for unsecured, unsaved, and inactive networks */
if (mSelectedAccessPoint.getSecurity() == AccessPoint.SECURITY_NONE && if (mSelectedAccessPoint.getSecurity() == AccessPoint.SECURITY_NONE &&
!mSelectedAccessPoint.isSaved() && !mSelectedAccessPoint.isActive()) { !mSelectedAccessPoint.isSaved() && !mSelectedAccessPoint.isActive()) {