diff options
| -rw-r--r-- | service/java/com/android/server/wifi/FrameworkFacade.java | 12 | ||||
| -rw-r--r-- | service/java/com/android/server/wifi/WifiController.java | 5 |
2 files changed, 16 insertions, 1 deletions
diff --git a/service/java/com/android/server/wifi/FrameworkFacade.java b/service/java/com/android/server/wifi/FrameworkFacade.java index 55741ffdf..7c1151cc2 100644 --- a/service/java/com/android/server/wifi/FrameworkFacade.java +++ b/service/java/com/android/server/wifi/FrameworkFacade.java @@ -34,6 +34,7 @@ import android.os.ServiceManager; import android.os.UserManager; import android.provider.Settings; import android.security.KeyStore; +import android.telephony.CarrierConfigManager; import java.util.ArrayList; @@ -85,6 +86,17 @@ public class FrameworkFacade { return new SupplicantStateTracker(context, configManager, handler); } + public boolean getConfigWiFiDisableInECBM(Context context) { + CarrierConfigManager configManager = (CarrierConfigManager) context + .getSystemService(Context.CARRIER_CONFIG_SERVICE); + if (configManager != null) { + return configManager.getConfig().getBoolean( + CarrierConfigManager.KEY_CONFIG_WIFI_DISABLE_IN_ECBM); + } + /* Default to TRUE */ + return true; + } + /** * Create a new instance of WifiApConfigStore. * @param context reference to a Context diff --git a/service/java/com/android/server/wifi/WifiController.java b/service/java/com/android/server/wifi/WifiController.java index d3f16bc9a..e3eeeedc3 100644 --- a/service/java/com/android/server/wifi/WifiController.java +++ b/service/java/com/android/server/wifi/WifiController.java @@ -542,7 +542,10 @@ class WifiController extends StateMachine { break; case CMD_EMERGENCY_CALL_STATE_CHANGED: case CMD_EMERGENCY_MODE_CHANGED: - if (msg.arg1 == 1) { + boolean getConfigWiFiDisableInECBM = mFacade.getConfigWiFiDisableInECBM(mContext); + log("WifiController msg " + msg + " getConfigWiFiDisableInECBM " + + getConfigWiFiDisableInECBM); + if ((msg.arg1 == 1) && getConfigWiFiDisableInECBM) { transitionTo(mEcmState); } break; |