Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am 3272a9d6: Turn off/on wifi to correspond with hotspot

Browse Source 
* commit '3272a9d615782532468d582669351b024f4bf868':
  Turn off/on wifi to correspond with hotspot
This commit is contained in:
Jason Monk
2014-08-06 13:07:16 +00:00
committed by Android Git Automerger
parent ce9d13757b 256a22663d
commit bdae529e77
1 changed files with 23 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
packages/SystemUI/src/com/android/systemui/statusbar/policy/HotspotControllerImpl.java
View File

@@ -16,18 +16,20 @@
package com.android.systemui.statusbar.policy;
import java.util.ArrayList;
import android.app.ActivityManager;
import android.content.BroadcastReceiver;
import android.content.ContentResolver;
import android.content.Context;
import android.content.Intent;
import android.content.IntentFilter;
import android.net.ConnectivityManager;
import android.net.wifi.WifiManager;
import android.os.UserHandle;
import android.provider.Settings;
import android.util.Log;
import java.util.ArrayList;
public class HotspotControllerImpl implements HotspotController {
private static final String TAG = "HotspotController";
@@ -73,7 +75,26 @@ public class HotspotControllerImpl implements HotspotController {
@Override
public void setHotspotEnabled(boolean enabled) {
final ContentResolver cr = mContext.getContentResolver();
// This needs to be kept up to date with Settings (WifiApEnabler.setSoftapEnabled)
// in case it is turned on in settings and off in qs (or vice versa).
// Disable Wifi if enabling tethering.
int wifiState = mWifiManager.getWifiState();
if (enabled && ((wifiState == WifiManager.WIFI_STATE_ENABLING) ||
(wifiState == WifiManager.WIFI_STATE_ENABLED))) {
mWifiManager.setWifiEnabled(false);
Settings.Global.putInt(cr, Settings.Global.WIFI_SAVED_STATE, 1);
}
mWifiManager.setWifiApEnabled(null, enabled);
// If needed, restore Wifi on tether disable.
if (!enabled) {
if (Settings.Global.getInt(cr, Settings.Global.WIFI_SAVED_STATE, 0) == 1) {
mWifiManager.setWifiEnabled(true);
Settings.Global.putInt(cr, Settings.Global.WIFI_SAVED_STATE, 0);
}
}
}
private void fireCallback(boolean isEnabled) {