summaryrefslogtreecommitdiffstats
path: root/wifi
Commit message (Collapse)AuthorAgeFilesLines
* am 72566b98: am 1c6fdd6c: am cac2fd30: Merge "Revert "Use a build-specific ↵Robert Greenwalt2013-10-042-2/+18
|\ | | | | | | | | | | | | wifi country code"" into klp-dev * commit '72566b98dba80f21923cb6b299754d510951d611': Revert "Use a build-specific wifi country code"
| * Merge "Revert "Use a build-specific wifi country code"" into klp-devRobert Greenwalt2013-10-042-2/+18
| |\
| | * Revert "Use a build-specific wifi country code"Robert Greenwalt2013-10-032-2/+18
| | | | | | | | | | | | | | | | | | | | | This reverts commit c33cd23c17c24df33550a6662cedfe60b323604a. bug:11064682 Change-Id: I35825a7005e75f3abf02f23f31dee1cb7b101c31
* | | am 1db7024c: am 2e23484e: am f3f1a370: Merge "Un-deprecate getDhcpInfo" into ↵Robert Greenwalt2013-10-041-1/+0
|\ \ \ | |/ / | | | | | | | | | | | | | | | klp-dev * commit '1db7024c50abe49d8881d458b3317ccff3de1832': Un-deprecate getDhcpInfo
| * | Un-deprecate getDhcpInfoRobert Greenwalt2013-10-041-1/+0
| | | | | | | | | | | | | | | | | | | | | Replacement api isn't available. bug:10003785 Change-Id: Ibe981ae90e1c6c2f1b65fa225443ae4cc92c2a3a
* | | am 90a5192c: am e72aa641: am 3eb6e4b4: Merge "Fix EAP-TLS reconnect after ↵Vinit Deshapnde2013-10-043-4/+133
|\ \ \ | |/ / | | | | | | | | | | | | | | | reboot issue" into klp-dev * commit '90a5192cd4af89a1b363ca25be2a63d0e57010d4': Fix EAP-TLS reconnect after reboot issue
| * | Merge "Fix EAP-TLS reconnect after reboot issue" into klp-devVinit Deshapnde2013-10-033-4/+133
| |\ \ | | |/ | |/|
| | * Fix EAP-TLS reconnect after reboot issueVinit Deshapnde2013-10-023-4/+133
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | After a reboot, KeyStore is locked, and certificates encrypted with user PIN are not accessible. So statemachines are not able to connect to EAP-TLS networks. This change makes the problem less severe by 1. Not signing certificates with user PIN on devices with hardware backed KeyStore. 2. Issuing a reconnect upon first USER_PRESENT event. This means HH (which has a hardware backed keystore) can connect to EAP-TLS networks without requiring user intervention and other devices will automatically connect to those networks after user punches PIN. Bug: 10325089 Change-Id: I023d60e58d8214152f051bd9ec84b85b702d829a
* | | am 2b6b3d9c: am bad5d694: Merge "Use a build-specific wifi country code" ↵Robert Greenwalt2013-10-012-18/+2
|\ \ \ | |/ / | | | | | | | | | | | | | | | into klp-dev * commit '2b6b3d9c495d3c8332aad6515a1db06e8fde3848': Use a build-specific wifi country code
| * | Use a build-specific wifi country codeRobert Greenwalt2013-09-292-18/+2
| |/ | | | | | | | | | | | | | | | | | | This ignores any previous setting and instead uses a value set at build time. This does not preclude us from using some other signal to determine country for wifi channel limits. bug:10513734 Change-Id: Ib82c07285af70fbd82eb0466b7391979ebc8be10
* | am 3d837d23: am e7d6bbd6: Merge "Fix an incorrectly created race accessing ↵Vinit Deshapnde2013-09-251-19/+35
|\ \ | |/ | | | | | | | | | | Wifi Supplicant" into klp-dev * commit '3d837d23c5910123330fbe6d18256ecc56ac7fcb': Fix an incorrectly created race accessing Wifi Supplicant
| * Fix an incorrectly created race accessing Wifi SupplicantVinit Deshapnde2013-09-241-19/+35
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ScanModeState is trying to undo whatever it did in its enter(), in its exit() function. But doing that is incorrect because it is possible to transition to multiple states that require different conditions. In this bug, the state machine transitioned from ScanModeState to WaitForP2pDisabled state; in response to Stop Supplicant command. Well, when we are trying to stop supplicant, there is clearly no need to enable P2P or load all networks. But since this code exists in exit(), it is executed nonetheless, causing race conditions accessing the wpa_supplicant (WifiStateMachine is trying to shut it down, but P2pStateMachine is trying to bring up the p2p interfaces). We solve that problem by moving this code to the place where we transition to DisconnectedState - since that's the state that needs this as a precondition. Bug: 10761752 Change-Id: Iaf0ffd8056de8533b5d2bfdf8c440fbb7e406dac
* | am 10914a23: am 662c326e: Merge "Allow yet another combination of key ↵Vinit Deshapnde2013-09-241-1/+2
|\ \ | |/ | | | | | | | | | | management options" into klp-dev * commit '10914a23f71b42a2b9d08a0199689d84117d5e0c': Allow yet another combination of key management options
| * Merge "Allow yet another combination of key management options" into klp-devVinit Deshapnde2013-09-231-1/+2
| |\
| | * Allow yet another combination of key management optionsVinit Deshapnde2013-09-201-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Framework sets allowedKeyManagement to WPA_EAP + WPA_PSK, if WifiConfiguration didn't supply any value for it. It should probably change to NONE; but that is post K thing. I am allowing that combination for now. Bug: 10843500 Change-Id: Id0c28f4aaf32c6a7e7dca07114a2452ce194a798
* | | am 1e690b69: am 0983eadf: Merge "Fix BatchScan request coalesing" into klp-devRobert Greenwalt2013-09-221-0/+36
|\ \ \ | |/ / | | | | | | | | | * commit '1e690b693c2d4ee7ba04d5882f6b5889ada07e0a': Fix BatchScan request coalesing
| * | Merge "Fix BatchScan request coalesing" into klp-devRobert Greenwalt2013-09-221-0/+36
| |\ \
| | * | Fix BatchScan request coalesingRobert Greenwalt2013-09-201-0/+36
| | | | | | | | | | | | | | | | | | | | bug:10407896 Change-Id: Ic22c7d8b2a80d490d208570782a12e42d4690f5c
* | | | am 0e500803: am f31a7897: Merge "Clear names from externally supplied ↵David Christie2013-09-201-6/+9
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | WorkSources to WifiManager (b/10733757)" into klp-dev * commit '0e50080395d2ed9e3c703f769ea3fb84706f989a': Clear names from externally supplied WorkSources to WifiManager (b/10733757)
| * | | Merge "Clear names from externally supplied WorkSources to WifiManager ↵David Christie2013-09-201-6/+9
| |\ \ \ | | | | | | | | | | | | | | | (b/10733757)" into klp-dev
| | * | | Clear names from externally supplied WorkSources to WifiManager (b/10733757)David Christie2013-09-201-6/+9
| | | | | | | | | | | | | | | | | | | | Change-Id: I36102f13962df2093c1e35fb40081ead647eff32
* | | | | am 27271f67: am a5fb1204: Merge "Fix incorrect exception being thrown from ↵Vinit Deshapnde2013-09-201-2/+2
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | WifiConfiguration" into klp-dev * commit '27271f673546faa973d7a24c594da626ebdbd337': Fix incorrect exception being thrown from WifiConfiguration
| * | | | Merge "Fix incorrect exception being thrown from WifiConfiguration" into klp-devVinit Deshapnde2013-09-201-2/+2
| |\ \ \ \ | | |_|/ / | |/| | |
| | * | | Fix incorrect exception being thrown from WifiConfigurationVinit Deshapnde2013-09-201-2/+2
| | | |/ | | |/| | | | | | | | | | | | | | | | | Bug: 10817189 Change-Id: Ib2985f50080cb9d983a6de6ce668223e8782c3b6
* | | | am 032de6c6: am c237c204: Merge "Supsend/resume batched scans around dhcp." ↵Robert Greenwalt2013-09-201-3/+30
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | into klp-dev * commit '032de6c6294893045c0c17946b45800b5af47d60': Supsend/resume batched scans around dhcp.
| * | | Merge "Supsend/resume batched scans around dhcp." into klp-devRobert Greenwalt2013-09-201-3/+30
| |\ \ \
| | * | | Supsend/resume batched scans around dhcp.Robert Greenwalt2013-09-201-3/+30
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Scanning while dhcp is running breaks dhcp, so stop the batched scans when we need dhcp and start it up again after. bug:10691401 Change-Id: Ifdeb6f35cfe4509b90fed1e1e694d0c107f24a7e
* | | | | am eccc0905: am 540784f9: Merge "Cleanup the shutdown of BatchedScans." into ↵Robert Greenwalt2013-09-202-2/+2
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | klp-dev * commit 'eccc0905bd150a334a98efedfb08570bcdd1c31a': Cleanup the shutdown of BatchedScans.
| * | | | Merge "Cleanup the shutdown of BatchedScans." into klp-devRobert Greenwalt2013-09-202-2/+2
| |\ \ \ \
| | * | | | Cleanup the shutdown of BatchedScans.Robert Greenwalt2013-09-202-2/+2
| | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes binder-death as well as disambiguation when an app has multiple requests in. bug:10641931 Change-Id: Ib701d531fa51e7e2a027848cfdfcad3b47056923
* | | | | am 2e9a4265: am 2ce33623: Merge "Remove STOPSHIP in ↵Yuhao Zheng2013-09-201-6/+1
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | WifiWatchdogStateMachine" into klp-dev * commit '2e9a426529c54774b23609bee8d50118118ab895': Remove STOPSHIP in WifiWatchdogStateMachine
| * | | | Remove STOPSHIP in WifiWatchdogStateMachineYuhao Zheng2013-09-191-6/+1
| | |/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | There used to be some STOPSHIP code in WifiWatchdogStateMachine for debug purposes. We don't need them for the release. Bug: 10841961 Change-Id: I501d62e9891ace52317e6c1d399b877175099a3c
* | | | am 007c6c7d: am c06b1db2: Merge "Consider current EAP TLS configurations as ↵Vinit Deshapnde2013-09-161-1/+9
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | \'valid\'" into klp-dev * commit '007c6c7d358fc617252da40c9ff214f55312c6f8': Consider current EAP TLS configurations as 'valid'
| * | | Consider current EAP TLS configurations as 'valid'Vinit Deshapnde2013-09-161-1/+9
| | |/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | Multiple authentication methods are currently considered invalid; but WPA_EAP and IEEE8021X are set simultaneously. This means we need to fix code to consider them a valid combination. Bug: 10325089 Change-Id: I2b4f4d75f21df78bfca66a930e85214c0cd6922e
* | | am 3d52eb7f: am 14e55996: Merge "Fix Batched Scan Results to give Timestamp ↵Robert Greenwalt2013-09-121-1/+3
|\ \ \ | |/ / | | | | | | | | | | | | | | | in uS" into klp-dev * commit '3d52eb7f1dde460d547fc20ec0b93465d69ec496': Fix Batched Scan Results to give Timestamp in uS
| * | Merge "Fix Batched Scan Results to give Timestamp in uS" into klp-devRobert Greenwalt2013-09-131-1/+3
| |\ \
| | * | Fix Batched Scan Results to give Timestamp in uSRobert Greenwalt2013-09-121-1/+3
| | |/ | | | | | | | | | | | | | | | | | | | | | | | | ScanResult should have timestamp in uS but we are getting age in ms from the wifi driver - multiply to have the same units though not the implied precision. bug: 10410465 Change-Id: Idf5c5996d69a4793dae3d74edb790d40b9bd3298
* | | am 7d400ead: am 9d5c33c5: Merge "Fix build break with missing VDBG." into ↵Stephen Hines2013-09-121-0/+1
|\ \ \ | |/ / | | | | | | | | | | | | | | | klp-dev * commit '7d400eadb7340c139f35263f43fe3418d402f409': Fix build break with missing VDBG.
| * | Fix build break with missing VDBG.Stephen Hines2013-09-121-0/+1
| | | | | | | | | | | | Change-Id: Iaf64cf49300a6a0a91374efa3030d6894367c9b8
* | | am 4d1cef6b: am 96ece970: Merge "Disable additional logging in ↵Vinit Deshapnde2013-09-122-29/+33
|\ \ \ | |/ / | | | | | | | | | | | | | | | WifiConfigStore/WifiNative" into klp-dev * commit '4d1cef6b3fec5ad4da0c99d57b1c4e768a2f1efa': Disable additional logging in WifiConfigStore/WifiNative
| * | Disable additional logging in WifiConfigStore/WifiNativeVinit Deshapnde2013-09-122-29/+33
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It was introduced to debug the disappearing APs; now that we think that we've got to the bottom of it, it is being disabled by default. Set VDBG to true to get it back. Bug: 10568538 Change-Id: I226cacf48cccba9671f09164bbb50380adc6b322
* | | am b2c06ba5: am b481dae2: Merge "Fix invalid Wifi Network system crash" into ↵Vinit Deshapnde2013-09-122-0/+21
|\ \ \ | |/ / | | | | | | | | | | | | | | | klp-dev * commit 'b2c06ba5711ffa3781b9bfe1c11051cc274be9e3': Fix invalid Wifi Network system crash
| * | Merge "Fix invalid Wifi Network system crash" into klp-devVinit Deshapnde2013-09-122-0/+21
| |\ \ | | |/ | |/|
| | * Fix invalid Wifi Network system crashVinit Deshapnde2013-09-092-0/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | There is some validation code that is eventually detecting that we have an invalid network; only the result is a crash. The right thing to do is to do validation up front; and fail calls if the network configuration looks invalid. Bug: 10571289 Change-Id: I100506b777a34b26ac9a310ba508140560f87a90
* | | am 16666176: am 8f435bac: Merge "Fix Wifi Batch Scanning" into klp-devRobert Greenwalt2013-09-123-32/+57
|\ \ \ | |/ / | | | | | | | | | * commit '16666176c0de5abc1f5390b9b2e07c32e51a97f9': Fix Wifi Batch Scanning
| * | Fix Wifi Batch ScanningRobert Greenwalt2013-09-113-32/+57
| | | | | | | | | | | | | | | | | | | | | Some parsing bugs, more debug logs, etc. bug:9301872 Change-Id: I245ab00955e245be81a019750be0f8491aa505fd
* | | resolved conflicts for merge of 03422d26 to masterDianne Hackborn2013-09-111-2/+2
|\ \ \ | |/ / | | | | | | Change-Id: I5d012fb122224c949a0039450bf0a9a475dc8e82
| * | Fix issue #10688644: Java crash in com.android.phone:Dianne Hackborn2013-09-111-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | java.lang.SecurityException: Operation not allowed There was a situation I wasn't taking into account -- components declared by the system has a special ability to run in the processes of other uids. This means that if that code loaded into another process tries to do anything needing an app op verification, it will fail, because it will say it is calling as the system package name but it is not actually coming from the system uid. To fix this, we add a new Context.getOpPackageName() to go along-side getBasePackageName(). This is a special call for use by all app ops verification, which will be initialized with either the base package name, the actual package name, or now the default package name of the process if we are creating a context for system code being loaded into a non-system process. I had to update all of the code doing app ops checks to switch to this method to get the calling package name. Also improve the security exception throw to have a more descriptive error message. Change-Id: Ic04f77b3938585b02fccabbc12d2f0dc62b9ef25
* | | Fix a few synchronization issues in WifiMonitor.Narayan Kamath2013-09-111-418/+415
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Guard all field accesses in WifiMonitorSingleton with a lock. - WifiMonitorSingleton is now responsible for dispatching events to a given monitor (or all monitors if it can't find a matching monitor). - Individual WifiMonitors are now responsible for dispatching events sent to them. This makes WifiMonitorThread a dumb object. All it does is wait for events and feed them back into the WifiMonitorSingleton. - Also fixes a bug where we weren't telling the WifiMonitor that we're disconnected and another where we don't check whether a monitor is connected or not before asking it to dispatch an event. - Also, replaces a few uses of entrySet() with a values() iterator when the keys are never used. The performance of both methods is identical for a HashMap, but the latter is a bit more concise and easier to read. Change-Id: I7ce00174a78c72836666d25ccc5e6e9e687c2570
* | | am f7bea433: am ba85b970: Merge "Set country code on P2p interfaces as well" ↵Vinit Deshapnde2013-09-103-4/+19
|\ \ \ | |/ / | | | | | | | | | | | | | | | into klp-dev * commit 'f7bea43325e0ffe04f3a7f729cb141f690c58d2a': Set country code on P2p interfaces as well