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

am c33b2ee3: am f28bd654: am fc6a8bf2: Merge "Fixed a Wi-Fi dialog crash" into lmp-mr1-dev

Browse Source 
* commit 'c33b2ee31acffd9a729351452f5f0d3bbec87dba':
  Fixed a Wi-Fi dialog crash
This commit is contained in:
PauloftheWest
2014-12-02 18:19:47 +00:00
committed by Android Git Automerger
parent 53a1e8ce6d c33b2ee31a
commit 3969b6b7b2
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

@@ -305,7 +305,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));