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

Commit 3cb31ed0 authored by Yuhao Zheng's avatar Yuhao Zheng Committed by Android Git Automerger
Browse files

am 69ea6665: am af672998: Merge "Fix Settings app crash while enabling tethering" into klp-dev 

* commit '69ea6665':
  Fix Settings app crash while enabling tethering
parents 998c7007 69ea6665

services/java/com/android/server/wifi/WifiService.java

+2 −1
Original line number Diff line number Diff line
@@ -588,7 +588,8 @@ public final class WifiService extends IWifiManager.Stub { 
     */

    public void setWifiApEnabled(WifiConfiguration wifiConfig, boolean enabled) {

        enforceChangePermission();

        if (wifiConfig.isValid()) {

        // null wifiConfig is a meaningful input for CMD_SET_AP

        if (wifiConfig == null || wifiConfig.isValid()) {

            mWifiController.obtainMessage(CMD_SET_AP, enabled ? 1 : 0, 0, wifiConfig).sendToTarget();

        } else {

            Slog.e(TAG, "Invalid WifiConfiguration");