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

am 117df282: Don\'t grab wakelock if Wifi feature not supported on device

Browse Source 
* commit '117df282017945f3b3f05dc43a6f436d19d3f071':
  Don't grab wakelock if Wifi feature not supported on device
This commit is contained in:
Nick Vaccaro
2014-05-22 22:44:44 +00:00
committed by Android Git Automerger
parent e5b73ae234 117df28201
commit 1af1371e1b
1 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
wifi/java/android/net/wifi/WifiStateMachine.java
View File

@@ -118,6 +118,7 @@ public class WifiStateMachine extends StateMachine {
private INetworkManagementService mNwService; private INetworkManagementService mNwService;
private ConnectivityManager mCm; private ConnectivityManager mCm;
private final boolean mWifiSupported;
private final boolean mP2pSupported; private final boolean mP2pSupported;
private final AtomicBoolean mP2pConnected = new AtomicBoolean(false); private final AtomicBoolean mP2pConnected = new AtomicBoolean(false);
private boolean mTemporarilyDisconnectWifi = false; private boolean mTemporarilyDisconnectWifi = false;
@@ -658,6 +659,9 @@ public class WifiStateMachine extends StateMachine {
mP2pSupported = mContext.getPackageManager().hasSystemFeature( mP2pSupported = mContext.getPackageManager().hasSystemFeature(
PackageManager.FEATURE_WIFI_DIRECT); PackageManager.FEATURE_WIFI_DIRECT);
mWifiSupported = mContext.getPackageManager().hasSystemFeature(
PackageManager.FEATURE_WIFI);
mWifiNative = new WifiNative(mInterfaceName); mWifiNative = new WifiNative(mInterfaceName);
mWifiConfigStore = new WifiConfigStore(context, mWifiNative); mWifiConfigStore = new WifiConfigStore(context, mWifiNative);
mWifiMonitor = new WifiMonitor(this, mWifiNative); mWifiMonitor = new WifiMonitor(this, mWifiNative);
@@ -1676,7 +1680,7 @@ public class WifiStateMachine extends StateMachine {
} }
if (screenOn) enableAllNetworks(); if (screenOn) enableAllNetworks();
if (mUserWantsSuspendOpt.get()) { if (mWifiSupported && mUserWantsSuspendOpt.get()) {
if (screenOn) { if (screenOn) {
sendMessage(CMD_SET_SUSPEND_OPT_ENABLED, 0, 0); sendMessage(CMD_SET_SUSPEND_OPT_ENABLED, 0, 0);
} else { } else {