summaryrefslogtreecommitdiffstats
path: root/wifi
Commit message (Collapse)AuthorAgeFilesLines
* am a3c187bc: am f87606fe: Merge "add debug logs to confirm network flapping ↵vandwalle2014-12-181-3/+15
|\ | | | | | | | | | | | | | | | | issue is fixed Bug:18706288" into lmp-mr1-dev automerge: 67878bb * commit '67878bb5ea8b4cc873a25ab577a94a8d6f122dc1': add debug logs to confirm network flapping issue is fixed Bug:18706288
| * am a3c187bc: am f87606fe: Merge "add debug logs to confirm network flapping ↵vandwalle2014-12-181-3/+15
| |\ | | | | | | | | | | | | | | | | | | issue is fixed Bug:18706288" into lmp-mr1-dev * commit 'a3c187bc1f97dc098ff939cfe937a482a9bdf7fb': add debug logs to confirm network flapping issue is fixed Bug:18706288
| | * add debug logs to confirm network flapping issue is fixedvandwalle2014-12-171-3/+15
| | | | | | | | | | | | | | | | | | Bug:18706288 Change-Id: I59378faafbccfa58639d942c8b8e2e0e815261f4
* | | New Additions to WifiScanner APIsVinit Deshpande2014-12-151-9/+185
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added single shot scan, and maxScansToCache. Also fixed getScanResults() to report scan results to listeners. Bug: 18087596 Bug: 17694040 Bug: 18059273 Change-Id: I8a6da5426561e22e72d1e99c5537205b893077dd
* | | Introduce onLost event on bssid hotlistVinit Deshpande2014-12-151-0/+8
| | | | | | | | | | | | Change-Id: I84c3174398fea9a1456fb007586c2c559dd3fe4d
* | | am fa205fff: am 9ef07ad2: Merge "make sure wificonfiguration scan cache ↵Prem Kumar2014-12-141-0/+36
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | | | | doesnt grow unbounded Bug:18703749" into lmp-mr1-dev automerge: da6ebb4 * commit 'da6ebb4ee29fff8b5455cd8b779aaabc029cd3b5': make sure wificonfiguration scan cache doesnt grow unbounded Bug:18703749
| * | am fa205fff: am 9ef07ad2: Merge "make sure wificonfiguration scan cache ↵Prem Kumar2014-12-141-0/+36
| |\ \ | | |/ | | | | | | | | | | | | | | | doesnt grow unbounded Bug:18703749" into lmp-mr1-dev * commit 'fa205ffff292bcbc1c504491b7ca2a5ee1b7b547': make sure wificonfiguration scan cache doesnt grow unbounded Bug:18703749
| | * make sure wificonfiguration scan cache doesnt grow unboundedvandwalle2014-12-111-0/+36
| | | | | | | | | | | | | | | | | | Bug:18703749 Change-Id: I8e35d602a80b341668d9607db2da3ca6fdb970ae
* | | am 820ba1f9: am 401ef259: am a4144563: Merge "add disable Ephemeral Network ↵Jeff Davidson2014-12-092-1/+16
|\ \ \ | |/ / | | | | | | | | | | | | | | | API Bug:18525241" into lmp-mr1-dev * commit '820ba1f96f5917db98df5b5d36cf5f4b32f50f59': add disable Ephemeral Network API Bug:18525241
| * | am 401ef259: am a4144563: Merge "add disable Ephemeral Network API ↵Jeff Davidson2014-12-082-1/+16
| |\ \ | | |/ | | | | | | | | | | | | | | | Bug:18525241" into lmp-mr1-dev * commit '401ef259f3b2c8c87b02c9939c0599d6ad0f6f39': add disable Ephemeral Network API Bug:18525241
| | * add disable Ephemeral Network APIvandwalle2014-12-052-1/+16
| | | | | | | | | | | | | | | | | | Bug:18525241 Change-Id: I954c53c55c39f6c376b2bae3c7ac4d28246a7f5a
* | | am f12fc2e1: am b6c9cbc5: am 47772ac8: Merge "make startScan with worksource ↵vandwalle2014-11-262-0/+18
|\ \ \ | |/ / | | | | | | | | | | | | | | | specific to location scans" into lmp-mr1-dev * commit 'f12fc2e14ebcf14745de03963a621e36bda11232': make startScan with worksource specific to location scans
| * | am b6c9cbc5: am 47772ac8: Merge "make startScan with worksource specific to ↵vandwalle2014-11-262-0/+18
| |\ \ | | |/ | | | | | | | | | | | | | | | location scans" into lmp-mr1-dev * commit 'b6c9cbc57694fb7fbd903fa08d42a55bc729114d': make startScan with worksource specific to location scans
| | * make startScan with worksource specific to location scansvandwalle2014-11-252-0/+18
| | | | | | | | | | | | Change-Id: Ia09dae3e334ef6fd11f2b468e78ad7c2c3cf55e9
* | | am 77fe4c96: am a34f3d30: am 800bf3ae: Merge "Fix WPS docs for LABEL method" ↵Vinit Deshpande2014-11-191-1/+1
|\ \ \ | |/ / | | | | | | | | | | | | | | | into lmp-mr1-dev * commit '77fe4c96b75550e5d22a294314b05beabd55e97a': Fix WPS docs for LABEL method
| * | am a34f3d30: am 800bf3ae: Merge "Fix WPS docs for LABEL method" into lmp-mr1-devVinit Deshpande2014-11-191-1/+1
| |\ \ | | |/ | | | | | | | | | * commit 'a34f3d30c6a7a4b8863175f009935c61ace42b4e': Fix WPS docs for LABEL method
| | * Fix WPS docs for LABEL methodVinit Deshpande2014-11-181-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | Since we don't support LABEL method in startWps, document it explicitly. Bug: 18298388 Change-Id: I5d4c2475a68f1b41e5fc449c911b7b01b3b82fc4
| * | Merge "dont blacklist wifi config that have had validated internet status in ↵vandwalle2014-11-121-8/+31
| |\ \ | | |/ | | | | | | | | | | | | | | | | | | | | | the past" into lmp-mr1-dev automerge: 3f558e7 automerge: 39c5118 * commit '39c5118037b5f401217db0fa5ac934291f45e378': dont blacklist wifi config that have had validated internet status in the past
* | | Merge commit 'ec3e9805dd7c527f961d1f2a14e5752b461186ca' into fix-merge-conflictWink Saville2014-11-121-8/+31
|\ \ \ | | |/ | |/| | | | | | | | | | | | | Conflicts: wifi/java/android/net/wifi/WifiConfiguration.java Change-Id: If52be614cadf80955025097589f922072363e7ba
| * | dont blacklist wifi config that have had validated internet status in the pastvandwalle2014-11-101-8/+31
| | | | | | | | | | | | Change-Id: Iadb4e0e1beeb9e582b944e003470815a5a865652
* | | am a45e9897: am 8cae7f64: am 8fe7676e: Merge "Fix incorrect doc for ↵Jeff Davidson2014-11-061-1/+1
|\ \ \ | | |/ | |/| | | | | | | | | | | | | WifiInfo#getSSID()." into lmp-mr1-dev * commit 'a45e98974e571ca539436b295a98d513faa10d19': Fix incorrect doc for WifiInfo#getSSID().
| * | am 8cae7f64: am 8fe7676e: Merge "Fix incorrect doc for WifiInfo#getSSID()." ↵Jeff Davidson2014-11-051-1/+1
| |\ \ | | |/ | | | | | | | | | | | | | | | into lmp-mr1-dev * commit '8cae7f644c59f0200f1962abdfbc6001166a192c': Fix incorrect doc for WifiInfo#getSSID().
| | * Fix incorrect doc for WifiInfo#getSSID().Jeff Davidson2014-11-051-1/+1
| | | | | | | | | | | | | | | | | | | | | This method will never return null. It may return "<unknown ssid>" if no network is currently connected. Change-Id: Iae09a6b2376e47c2d010f8d05750a16361510cca
* | | am 1199a4c4: am f2a598e4: am 074c5b5b: Merge "Don\'t drop ↵Jeff Davidson2014-10-151-1/+5
|\ \ \ | |/ / | | | | | | | | | | | | | | | WifiConfiguration\'s ephemeral bit on copy/parcel." into lmp-mr1-dev * commit '1199a4c436b4e08306c02f615360e233124bff55': Don't drop WifiConfiguration's ephemeral bit on copy/parcel.
| * | am f2a598e4: am 074c5b5b: Merge "Don\'t drop WifiConfiguration\'s ephemeral ↵Jeff Davidson2014-10-151-1/+5
| |\ \ | | |/ | | | | | | | | | | | | | | | bit on copy/parcel." into lmp-mr1-dev * commit 'f2a598e445800c9209dc58ab0005ca466eb14679': Don't drop WifiConfiguration's ephemeral bit on copy/parcel.
| | * Merge "Don't drop WifiConfiguration's ephemeral bit on copy/parcel." into ↵Jeff Davidson2014-10-151-1/+5
| | |\ | | | | | | | | | | | | lmp-mr1-dev
| | | * Don't drop WifiConfiguration's ephemeral bit on copy/parcel.Jeff Davidson2014-10-061-1/+5
| | | | | | | | | | | | | | | | | | | | Bug: 15892711 Change-Id: I4a027c99634a11d13bb3c8420ba959c201644689
* | | | resolved conflicts for merge of 28495b02 into masterPrimiano Tucci2014-10-083-13/+79
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | Conflicts: wifi/java/android/net/wifi/ScanResult.java Change-Id: I86a4537d603cbf325e5e0bff715a442d9dc6b6db
| * | | am b75369e2: am 7bbf867b: am 0c0c680d: am a741efd5: Merge "adding debug ↵vandwalle2014-10-083-13/+79
| |\ \ \ | | |/ / | | | | | | | | | | | | | | | | | | | | information to bug report for Bug:16751877" into lmp-dev * commit 'b75369e22c4617371606571398f0faa0838f02ef': adding debug information to bug report for Bug:16751877
| | * | adding debug information to bug report for Bug:16751877vandwalle2014-10-073-13/+79
| | |/ | | | | | | | | | Change-Id: I9d417c20c6b6721933a4eb943c1305845005facf
* | | Fix the "Fix broken merge of "handle bssid blacklist in case of dhcp failures""Primiano Tucci2014-10-081-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The change Iad35fb8dc2ce14874ef7424c4be5648ca7ac916c (Fix broken merge of ...) seem be a partial resolution of Iba13db478ed69976c37bd4882f59bf0cae2212e6: the parcel ser/des lines are missing. This is causing today a merge conflict (lmp-dev -> master) on a dependent change (I89b4f5c05a1f64f9d1e8c407f62036efa0265043), which is confused by the lack of the parcel ser/des lines. I think this was a genuine mistakes. Readding these lines should make the conflict go away and fix master. Change-Id: I8499b9caeb1667f95727fdd18f318c5859a2321e
* | | am 542cc240: am 88b927e2: am c67e5ae2: am 4f5fd780: am 68104b05: Merge "add ↵vandwalle2014-10-041-1/+1
|\ \ \ | |/ / | | | | | | | | | | | | | | | millisecond timestamp to locallog" into lmp-dev * commit '542cc240b5bd68a728067f65cd8bc4d8f6473b83': add millisecond timestamp to locallog
| * | am 88b927e2: am c67e5ae2: am 4f5fd780: am 68104b05: Merge "add millisecond ↵vandwalle2014-10-041-1/+1
| |\ \ | | |/ | | | | | | | | | | | | | | | timestamp to locallog" into lmp-dev * commit '88b927e258214a31342326d46f527528e5979f85': add millisecond timestamp to locallog
| | * add millisecond timestamp to locallogvandwalle2014-10-031-1/+1
| | | | | | | | | | | | Change-Id: I33d8672efd2747ed3f49dd8d5bcd5f47bf418053
* | | am 65d720b3: am 6245bd9e: am eef8d3eb: am df959707: am 7fe95529: Merge ↵Lorenzo Colitti2014-10-021-12/+9
|\ \ \ | |/ / | | | | | | | | | | | | | | | "Revert the configKey generation algorithm to what it was in K." into lmp-dev * commit '65d720b3fb766f88c8f76bfba0538d0185cc6d21': Revert the configKey generation algorithm to what it was in K.
| * | am 6245bd9e: am eef8d3eb: am df959707: am 7fe95529: Merge "Revert the ↵Lorenzo Colitti2014-10-021-12/+9
| |\ \ | | |/ | | | | | | | | | | | | | | | configKey generation algorithm to what it was in K." into lmp-dev * commit '6245bd9e19639ec3f64cae4268b204f8bfa0c6c9': Revert the configKey generation algorithm to what it was in K.
| | * Revert the configKey generation algorithm to what it was in K.Lorenzo Colitti2014-09-301-12/+9
| | | | | | | | | | | | | | | Bug: 17670914 Change-Id: Ibb2ea26ea28a38518caab7d1b45ae535a0eaf661
| * | am 9e22f280: am 713b200d: am 9794dc95: am 0829f6b6: Merge "handle bssid ↵vandwalle2014-09-232-5/+61
| |\ \ | | |/ | | | | | | | | | | | | | | | blacklist in case of dhcp failures" into lmp-dev * commit '9e22f2803c26626851f24db7c54fa68b85ca5e45': handle bssid blacklist in case of dhcp failures
| | * handle bssid blacklist in case of dhcp failuresvandwalle2014-09-232-5/+61
| | | | | | | | | | | | Change-Id: Iba13db478ed69976c37bd4882f59bf0cae2212e6
* | | User wifi separation feature.Sky Faber2014-09-261-0/+9
| | | | | | | | | | | | Change-Id: Iab79db10107ab5dbeb469c12621a9a4916bd62c9
* | | Separate wifi AP added by applications.Sky Faber2014-09-261-1/+76
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | -Add field for tracking user approval of application added networks. -Add WifiConfig fields for creating/updating application name -Add permission to allow system apps to modify any network Bug: 16953082 Change-Id: I12943563ef714c4287e13488578f020d136d006d
* | | Fix broken merge of "handle bssid blacklist in case of dhcp failures"Mike Lockwood2014-09-242-5/+59
| | | | | | | | | | | | | | | | | | | | | Change-Id: Iba13db478ed69976c37bd4882f59bf0cae2212e6 Conflicts: wifi/java/android/net/wifi/ScanResult.java
* | | am ccafcfbc: am 6839bf68: am 41fa5e86: am 699ba17f: am 14f0aba3: Merge "Fix ↵Vinit Deshpande2014-09-231-1/+1
|\ \ \ | |/ / | | | | | | | | | | | | | | | documentation for Wifi ScanResult.timestamp" into lmp-dev * commit 'ccafcfbc63a0f7e279112b8ce717f7408ac3774d': Fix documentation for Wifi ScanResult.timestamp
| * | am 6839bf68: am 41fa5e86: am 699ba17f: am 14f0aba3: Merge "Fix documentation ↵Vinit Deshpande2014-09-231-1/+1
| |\ \ | | |/ | | | | | | | | | | | | | | | for Wifi ScanResult.timestamp" into lmp-dev * commit '6839bf68d8f557e7d31410a3f88f2e32a4f1a2b8': Fix documentation for Wifi ScanResult.timestamp
| | * Fix documentation for Wifi ScanResult.timestampVinit Deshpande2014-09-191-1/+1
| | | | | | | | | | | | | | | Bug: 14997906 Change-Id: Idfcf9ade905c7565cc1d59d15aa4362c1b597b72
* | | am 27f19d75: am c3eea0ee: am a203fbc8: Merge "Allow creating EAP_TLS network ↵Prem Kumar2014-09-151-1/+3
|\ \ \ | |/ / | | | | | | | | | | | | | | | without specifying Phase2.None" into lmp-dev * commit '27f19d75d3dd5e6c8524a8214fa768052c396849': Allow creating EAP_TLS network without specifying Phase2.None
| * | am c3eea0ee: am a203fbc8: Merge "Allow creating EAP_TLS network without ↵Prem Kumar2014-09-151-1/+3
| |\ \ | | |/ | | | | | | | | | | | | | | | specifying Phase2.None" into lmp-dev * commit 'c3eea0ee551af36c4ad18e8b0f96e5e04bef270c': Allow creating EAP_TLS network without specifying Phase2.None
| | * Merge "Allow creating EAP_TLS network without specifying Phase2.None" into ↵Prem Kumar2014-09-151-1/+3
| | |\ | | | | | | | | | | | | lmp-dev
| | | * Allow creating EAP_TLS network without specifying Phase2.NoneVinit Deshpande2014-09-131-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Phase2 isn't required for EAP_TLS networks, and it is possible for a developer to miss it. We are requiring it for internal book keeping - so this change just sets Phase2 to 'None' when EAP_TLS is set on the configuration. Bug: 17043082 Change-Id: I5a8e0a3a236d0dfd1295584de55d5b9a1b76b483
* | | | am ffbae6e2: am dfb82a24: am 35967d04: Merge "make wifi cellular params ↵vandwalle2014-09-141-3/+6
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | configurable" into lmp-dev * commit 'ffbae6e26a354dceadd2f1c9a18dffd0b1151fe3': make wifi cellular params configurable