diff --git a/packages/apps/Settings/src/com/android/settings/ethernet/EthernetSettings.java b/packages/apps/Settings/src/com/android/s index 8a8769e..8f6fd9c 100644 --- a/packages/apps/Settings/src/com/android/settings/ethernet/EthernetSettings.java +++ b/packages/apps/Settings/src/com/android/settings/ethernet/EthernetSettings.java @@ -43,6 +43,8 @@ import java.util.regex.Matcher; import java.util.regex.Pattern; import android.net.ethernet.EthernetManager; +import android.net.wifi.WifiManager; + import com.android.settings.SettingsPreferenceFragment; import com.android.settings.R; import android.net.EthernetDataTracker; @@ -143,6 +145,10 @@ public class EthernetSettings extends SettingsPreferenceFragment { return false; }else { Log.e(TAG, ">>>> onPreferenceTreeClick mEthManager != null"); + if(newState){ + WifiManager wifiManager = (WifiManager) getSystemService(Context.WIFI_SERVICE); + wifiManager.setWifiEnabled(false); + } } if (newState) { diff --git a/packages/apps/Settings/src/com/android/settings/wifi/WifiEnabler.java b/packages/apps/Settings/src/com/android/settings/w index 102778e..46ffd5c 100644 --- a/packages/apps/Settings/src/com/android/settings/wifi/WifiEnabler.java +++ b/packages/apps/Settings/src/com/android/settings/wifi/WifiEnabler.java @@ -206,6 +206,10 @@ public class WifiEnabler implements CompoundButton.OnCheckedChangeListener { Log.i("WifiState_xinw",String.valueOf(isChecked)); SharedPreferences prefs = mContext.getSharedPreferences("default_mac", Context.MODE_PRIVATE); String isfirst = prefs.getString("isfirst","0"); + + if(isChecked){ + Settings.System.putInt(mContext.getContentResolver(), Settings.Secure.ETHERNET_ON, 0); + } if(isChecked) {