diff options
Diffstat (limited to 'wifi')
-rw-r--r-- | wifi/java/android/net/wifi/WifiManager.java | 7 | ||||
-rw-r--r-- | wifi/java/android/net/wifi/WifiMonitor.java | 11 | ||||
-rw-r--r-- | wifi/java/android/net/wifi/WifiNative.java | 4 | ||||
-rw-r--r-- | wifi/java/android/net/wifi/WifiStateMachine.java | 86 |
4 files changed, 69 insertions, 39 deletions
diff --git a/wifi/java/android/net/wifi/WifiManager.java b/wifi/java/android/net/wifi/WifiManager.java index 2e49a77..d40f146 100644 --- a/wifi/java/android/net/wifi/WifiManager.java +++ b/wifi/java/android/net/wifi/WifiManager.java @@ -1193,16 +1193,19 @@ public class WifiManager { * Acquiring a WifiLock will keep the radio on until the lock is released. Multiple * applications may hold WifiLocks, and the radio will only be allowed to turn off when no * WifiLocks are held in any application. - * + * <p> * Before using a WifiLock, consider carefully if your application requires Wi-Fi access, or * could function over a mobile network, if available. A program that needs to download large * files should hold a WifiLock to ensure that the download will complete, but a program whose * network usage is occasional or low-bandwidth should not hold a WifiLock to avoid adversely * affecting battery life. - * + * <p> * Note that WifiLocks cannot override the user-level "Wi-Fi Enabled" setting, nor Airplane * Mode. They simply keep the radio from turning off when Wi-Fi is already on but the device * is idle. + * <p> + * Any application using a WifiLock must request the {@code android.permission.WAKE_LOCK} + * permission in an {@code <uses-permission>} element of the application's manifest. */ public class WifiLock { private String mTag; diff --git a/wifi/java/android/net/wifi/WifiMonitor.java b/wifi/java/android/net/wifi/WifiMonitor.java index ce38261..4a45825 100644 --- a/wifi/java/android/net/wifi/WifiMonitor.java +++ b/wifi/java/android/net/wifi/WifiMonitor.java @@ -17,7 +17,6 @@ package android.net.wifi; import android.util.Log; -import android.util.Config; import android.net.NetworkInfo; import java.util.regex.Pattern; @@ -182,7 +181,7 @@ public class WifiMonitor { String eventStr = WifiNative.waitForEvent(); // Skip logging the common but mostly uninteresting scan-results event - if (Config.LOGD && eventStr.indexOf(scanResultsEvent) == -1) { + if (false && eventStr.indexOf(scanResultsEvent) == -1) { Log.v(TAG, "Event [" + eventStr + "]"); } if (!eventStr.startsWith(eventPrefix)) { @@ -200,7 +199,7 @@ public class WifiMonitor { if (nameEnd != -1) eventName = eventName.substring(0, nameEnd); if (eventName.length() == 0) { - if (Config.LOGD) Log.i(TAG, "Received wpa_supplicant event with empty event name"); + if (false) Log.i(TAG, "Received wpa_supplicant event with empty event name"); continue; } /* @@ -251,7 +250,7 @@ public class WifiMonitor { * stopped the supplicant, simply exit the monitor thread */ if (eventData.startsWith(monitorSocketClosed)) { - if (Config.LOGD) { + if (false) { Log.d(TAG, "Monitor socket is closed, exiting thread"); } break; @@ -263,7 +262,7 @@ public class WifiMonitor { */ if (eventData.startsWith(wpaRecvError)) { if (++mRecvErrors > MAX_RECV_ERRORS) { - if (Config.LOGD) { + if (false) { Log.d(TAG, "too many recv errors, closing connection"); } } else { @@ -398,7 +397,7 @@ public class WifiMonitor { if (newState == NetworkInfo.DetailedState.CONNECTED) { Matcher match = mConnectedEventPattern.matcher(data); if (!match.find()) { - if (Config.LOGD) Log.d(TAG, "Could not find BSSID in CONNECTED event string"); + if (false) Log.d(TAG, "Could not find BSSID in CONNECTED event string"); } else { BSSID = match.group(1); try { diff --git a/wifi/java/android/net/wifi/WifiNative.java b/wifi/java/android/net/wifi/WifiNative.java index 909605dc..6e13d0f 100644 --- a/wifi/java/android/net/wifi/WifiNative.java +++ b/wifi/java/android/net/wifi/WifiNative.java @@ -171,5 +171,7 @@ public class WifiNative { */ public native static String waitForEvent(); - public native static void enableBackgroundScan(boolean enable); + public native static void enableBackgroundScanCommand(boolean enable); + + public native static void setScanIntervalCommand(int scanInterval); } diff --git a/wifi/java/android/net/wifi/WifiStateMachine.java b/wifi/java/android/net/wifi/WifiStateMachine.java index a6b1a2c..9125037 100644 --- a/wifi/java/android/net/wifi/WifiStateMachine.java +++ b/wifi/java/android/net/wifi/WifiStateMachine.java @@ -347,10 +347,20 @@ public class WifiStateMachine extends StateMachine { private int mPowerMode = POWER_MODE_AUTO; /** - * See {@link Settings.Secure#WIFI_SCAN_INTERVAL_MS}. This is the default value if a - * Settings.Secure value is not present. + * Default framework scan interval in milliseconds. This is used in the scenario in which + * wifi chipset does not support background scanning to set up a + * periodic wake up scan so that the device can connect to a new access + * point on the move. {@link Settings.Secure#WIFI_FRAMEWORK_SCAN_INTERVAL_MS} can + * override this. */ - private static final long DEFAULT_SCAN_INTERVAL_MS = 60 * 1000; /* 1 minute */ + private final int mDefaultFrameworkScanIntervalMs; + + /** + * Default supplicant scan interval in milliseconds. + * {@link Settings.Secure#WIFI_SUPPLICANT_SCAN_INTERVAL_MS} can override this. + */ + private final int mDefaultSupplicantScanIntervalMs; + private static final int MIN_RSSI = -200; private static final int MAX_RSSI = 256; @@ -480,6 +490,12 @@ public class WifiStateMachine extends StateMachine { Intent scanIntent = new Intent(ACTION_START_SCAN, null); mScanIntent = PendingIntent.getBroadcast(mContext, SCAN_REQUEST, scanIntent, 0); + mDefaultFrameworkScanIntervalMs = mContext.getResources().getInteger( + com.android.internal.R.integer.config_wifi_framework_scan_interval); + + mDefaultSupplicantScanIntervalMs = mContext.getResources().getInteger( + com.android.internal.R.integer.config_wifi_supplicant_scan_interval); + mContext.registerReceiver( new BroadcastReceiver() { @Override @@ -827,7 +843,7 @@ public class WifiStateMachine extends StateMachine { sendMessage(obtainMessage(CMD_ENABLE_RSSI_POLL, enabled ? 1 : 0, 0)); } - public void enableBackgroundScan(boolean enabled) { + public void enableBackgroundScanCommand(boolean enabled) { sendMessage(obtainMessage(CMD_ENABLE_BACKGROUND_SCAN, enabled ? 1 : 0, 0)); } @@ -2055,6 +2071,11 @@ public class WifiStateMachine extends StateMachine { mIsScanMode = false; /* Wifi is available as long as we have a connection to supplicant */ mNetworkInfo.setIsAvailable(true); + /* Set scan interval */ + long supplicantScanIntervalMs = Settings.Secure.getLong(mContext.getContentResolver(), + Settings.Secure.WIFI_SUPPLICANT_SCAN_INTERVAL_MS, + mDefaultSupplicantScanIntervalMs); + WifiNative.setScanIntervalCommand((int)supplicantScanIntervalMs / 1000); } @Override public boolean processMessage(Message message) { @@ -2063,17 +2084,6 @@ public class WifiStateMachine extends StateMachine { boolean eventLoggingEnabled = true; switch(message.what) { case CMD_STOP_SUPPLICANT: /* Supplicant stopped by user */ - Log.d(TAG, "stopping supplicant"); - if (!WifiNative.stopSupplicant()) { - Log.e(TAG, "Failed to stop supplicant, issue kill"); - WifiNative.killSupplicant(); - } - mNetworkInfo.setIsAvailable(false); - handleNetworkDisconnect(); - setWifiState(WIFI_STATE_DISABLING); - sendSupplicantConnectionChangedBroadcast(false); - mSupplicantStateTracker.sendMessage(CMD_RESET_SUPPLICANT_STATE); - mWpsStateMachine.sendMessage(CMD_RESET_WPS_STATE); transitionTo(mSupplicantStoppingState); break; case SUP_DISCONNECTION_EVENT: /* Supplicant connection lost */ @@ -2174,6 +2184,17 @@ public class WifiStateMachine extends StateMachine { public void enter() { if (DBG) Log.d(TAG, getName() + "\n"); EventLog.writeEvent(EVENTLOG_WIFI_STATE_CHANGED, getName()); + Log.d(TAG, "stopping supplicant"); + if (!WifiNative.stopSupplicant()) { + Log.e(TAG, "Failed to stop supplicant, issue kill"); + WifiNative.killSupplicant(); + } + mNetworkInfo.setIsAvailable(false); + handleNetworkDisconnect(); + setWifiState(WIFI_STATE_DISABLING); + sendSupplicantConnectionChangedBroadcast(false); + mSupplicantStateTracker.sendMessage(CMD_RESET_SUPPLICANT_STATE); + mWpsStateMachine.sendMessage(CMD_RESET_WPS_STATE); } @Override public boolean processMessage(Message message) { @@ -2825,17 +2846,21 @@ public class WifiStateMachine extends StateMachine { class DisconnectedState extends State { private boolean mAlarmEnabled = false; - private long mScanIntervalMs; + /* This is set from the overlay config file or from a secure setting. + * A value of 0 disables scanning in the framework. + */ + private long mFrameworkScanIntervalMs; private void setScanAlarm(boolean enabled) { if (enabled == mAlarmEnabled) return; if (enabled) { - mAlarmManager.setRepeating(AlarmManager.RTC_WAKEUP, - System.currentTimeMillis() + mScanIntervalMs, - mScanIntervalMs, - mScanIntent); - - mAlarmEnabled = true; + if (mFrameworkScanIntervalMs > 0) { + mAlarmManager.setRepeating(AlarmManager.RTC_WAKEUP, + System.currentTimeMillis() + mFrameworkScanIntervalMs, + mFrameworkScanIntervalMs, + mScanIntent); + mAlarmEnabled = true; + } } else { mAlarmManager.cancel(mScanIntent); mAlarmEnabled = false; @@ -2847,8 +2872,9 @@ public class WifiStateMachine extends StateMachine { if (DBG) Log.d(TAG, getName() + "\n"); EventLog.writeEvent(EVENTLOG_WIFI_STATE_CHANGED, getName()); - mScanIntervalMs = Settings.Secure.getLong(mContext.getContentResolver(), - Settings.Secure.WIFI_SCAN_INTERVAL_MS, DEFAULT_SCAN_INTERVAL_MS); + mFrameworkScanIntervalMs = Settings.Secure.getLong(mContext.getContentResolver(), + Settings.Secure.WIFI_FRAMEWORK_SCAN_INTERVAL_MS, + mDefaultFrameworkScanIntervalMs); /* * We initiate background scanning if it is enabled, otherwise we * initiate an infrequent scan that wakes up the device to ensure @@ -2862,7 +2888,7 @@ public class WifiStateMachine extends StateMachine { * cleared */ if (!mScanResultIsPending) { - WifiNative.enableBackgroundScan(true); + WifiNative.enableBackgroundScanCommand(true); } } else { setScanAlarm(true); @@ -2884,10 +2910,10 @@ public class WifiStateMachine extends StateMachine { case CMD_ENABLE_BACKGROUND_SCAN: mEnableBackgroundScan = (message.arg1 == 1); if (mEnableBackgroundScan) { - WifiNative.enableBackgroundScan(true); + WifiNative.enableBackgroundScanCommand(true); setScanAlarm(false); } else { - WifiNative.enableBackgroundScan(false); + WifiNative.enableBackgroundScanCommand(false); setScanAlarm(true); } break; @@ -2902,14 +2928,14 @@ public class WifiStateMachine extends StateMachine { case CMD_START_SCAN: /* Disable background scan temporarily during a regular scan */ if (mEnableBackgroundScan) { - WifiNative.enableBackgroundScan(false); + WifiNative.enableBackgroundScanCommand(false); } /* Handled in parent state */ return NOT_HANDLED; case SCAN_RESULTS_EVENT: /* Re-enable background scan when a pending scan result is received */ if (mEnableBackgroundScan && mScanResultIsPending) { - WifiNative.enableBackgroundScan(true); + WifiNative.enableBackgroundScanCommand(true); } /* Handled in parent state */ return NOT_HANDLED; @@ -2924,7 +2950,7 @@ public class WifiStateMachine extends StateMachine { public void exit() { /* No need for a background scan upon exit from a disconnected state */ if (mEnableBackgroundScan) { - WifiNative.enableBackgroundScan(false); + WifiNative.enableBackgroundScanCommand(false); } setScanAlarm(false); } |