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

am 4c32885c: Merge "Don\'t put up wifi-available note when disabled" into jb-mr2-dev

Browse Source 
* commit '4c32885c4249be9b0a9e674b96ebacc78152b47e':
  Don't put up wifi-available note when disabled
This commit is contained in:
Robert Greenwalt
2013-05-21 12:56:04 -07:00
committed by Android Git Automerger
parent cf4339a809 4c32885c42
commit 657eb614ef
1 changed files with 5 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
services/java/com/android/server/wifi/WifiNotificationController.java
View File

@@ -91,10 +91,12 @@ final class WifiNotificationController {
private final Context mContext; private final Context mContext;
private final WifiStateMachine mWifiStateMachine; private final WifiStateMachine mWifiStateMachine;
private NetworkInfo mNetworkInfo; private NetworkInfo mNetworkInfo;
private volatile int mWifiState;
WifiNotificationController(Context context, WifiStateMachine wsm) { WifiNotificationController(Context context, WifiStateMachine wsm) {
mContext = context; mContext = context;
mWifiStateMachine = wsm; mWifiStateMachine = wsm;
mWifiState = WifiManager.WIFI_STATE_UNKNOWN;
IntentFilter filter = new IntentFilter(); IntentFilter filter = new IntentFilter();
filter.addAction(WifiManager.WIFI_STATE_CHANGED_ACTION); filter.addAction(WifiManager.WIFI_STATE_CHANGED_ACTION);
@@ -106,6 +108,8 @@ final class WifiNotificationController {
@Override @Override
public void onReceive(Context context, Intent intent) { public void onReceive(Context context, Intent intent) {
if (intent.getAction().equals(WifiManager.WIFI_STATE_CHANGED_ACTION)) { if (intent.getAction().equals(WifiManager.WIFI_STATE_CHANGED_ACTION)) {
mWifiState = intent.getIntExtra(WifiManager.EXTRA_WIFI_STATE,
WifiManager.WIFI_STATE_UNKNOWN);
resetNotification(); resetNotification();
} else if (intent.getAction().equals( } else if (intent.getAction().equals(
WifiManager.NETWORK_STATE_CHANGED_ACTION)) { WifiManager.NETWORK_STATE_CHANGED_ACTION)) {
@@ -141,6 +145,7 @@ final class WifiNotificationController {
// don't bother doing any of the following // don't bother doing any of the following
if (!mNotificationEnabled) return; if (!mNotificationEnabled) return;
if (networkInfo == null) return; if (networkInfo == null) return;
if (mWifiState != WifiManager.WIFI_STATE_ENABLED) return;
NetworkInfo.State state = networkInfo.getState(); NetworkInfo.State state = networkInfo.getState();
if ((state == NetworkInfo.State.DISCONNECTED) if ((state == NetworkInfo.State.DISCONNECTED)