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

Merge "Fixed a Wi-Fi dialog crash" into lmp-mr1-dev

Browse Source
This commit is contained in:
PauloftheWest
2014-12-02 17:58:23 +00:00
committed by Android (Google) Code Review
parent 41c2962552 ae680e3c67
commit fc6a8bf2d7
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -307,7 +307,8 @@ public class WifiConfigController implements TextWatcher,
}
}
if (mEdit || (mAccessPoint.getState() == null && mAccessPoint.getLevel() != -1)){
if ((mEdit) || (mAccessPoint != null
&& mAccessPoint.getState() == null && mAccessPoint.getLevel() != -1)){
mConfigUi.setCancelButton(res.getString(R.string.wifi_cancel));
}else{
mConfigUi.setCancelButton(res.getString(R.string.wifi_display_options_done));