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

Commit 427c5a82 authored by Brian Beloshapka's avatar Brian Beloshapka Committed by Gerrit Code Review
Browse files

WIFI: Fix wimax teardown when wifi connected 

Due to patch:
https://github.com/CyanogenMod/android_frameworks_base/commit/f769f4cbc2aaac8d9d49f9ff79a6fe0affc4ff6e

Change-Id: I18e5ced62c8e4976f7a6835ba8c593930dac0586
parent 74d77ffe

wifi/java/android/net/wifi/WifiConfigStore.java

+7 −5
Original line number Diff line number Diff line
@@ -254,12 +254,14 @@ class WifiConfigStore { 
    }



    boolean isDataToWifiAutoConn() {

        // If the active network type is mobile, wifi connection type is auto

        // connect and GSM to WLAN connection type is auto connect,

        // auto connect to wifi.

        // If the active network type is mobile or wimax, wifi connection

        // type is auto connect and GSM to WLAN connection type is auto

        // connect, auto connect to wifi.

        return isWifiAuto()

                && ((existActiveNetwork()

                    == ConnectivityManager.TYPE_MOBILE) &&

                && (((existActiveNetwork()

                    == ConnectivityManager.TYPE_MOBILE) ||

                     (existActiveNetwork()

                    == ConnectivityManager.TYPE_WIMAX)) &&

                isDataToWifiAuto());



    }