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

Commit f28bd654 authored by PauloftheWest's avatar PauloftheWest Committed by Android Git Automerger
Browse files

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

* commit 'fc6a8bf2':
  Fixed a Wi-Fi dialog crash
parents 21316f1d fc6a8bf2

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

+2 −1
Original line number Diff line number Diff line
@@ -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));