summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* resolve merge conflicts of 849c5c7 to mnc-devstable/cm-13.0-ZNH2KNingyuan Wang2016-12-081-1/+1
* wifinative jni: check array length to prevent stack overflowNingyuan Wang2016-12-081-0/+7
* VenueNameElement: fix off-by-one enum bounds checkSamuel Tan2016-10-041-4/+4
* ANQPFactory: catch all potential parsing errorsSamuel Tan2016-10-041-71/+87
* Deal correctly with short stringsPaul Stewart2016-08-021-5/+13
* p2p: Add a fallback to model-name for wifi directRicardo Cerqueira2016-07-131-0/+4
* wifi: fixup hotspot disconnect on subscriber changeKhalid Zubair2016-07-081-7/+32
* wifi: don't disable AP on sub change if it's the same subRoman Birg2016-07-081-0/+15
* wifi: disable access point on subscription changeRoman Birg2016-07-081-0/+32
* hotspot: Add a fallback to model-name for SSIDRicardo Cerqueira2016-06-231-0/+4
* Fix EAP-SIM fallback identity generation outside of North AmericaRicardo Cerqueira2016-05-091-2/+12
* Merge tag 'android-6.0.1_r24' into HEADJessica Wagantall2016-04-050-0/+0
|\
| * merge in mnc-dr1.5-release history after reset to mnc-dr1.5-devThe Android Automerger2016-03-170-0/+0
| |\
| | * Revert "Appropriately fail EAP-SIM/AKA when SIM doesn't generate good response"Paul Stewart2016-03-082-26/+8
| | * Appropriately fail EAP-SIM/AKA when SIM doesn't generate good responseVinit Deshpande2016-03-022-8/+26
| | * Revert "Appropriately fail EAP-SIM/AKA when SIM doesn't generate good response"Paul Stewart2016-03-012-26/+8
| |/
* | EAP: Make the state-machine MSIM-awareRicardo Cerqueira2016-04-051-6/+42
* | eap-sim: Unbreak the standard non-proxied flow for multi-challenge requestsRicardo Cerqueira2016-04-041-3/+4
* | WifiScanningService: Fix invalid offset errorLegrand Benjamin2016-03-171-1/+1
* | Merge tag 'android-6.0.1_r22' of https://android.googlesource.com/platform/fr...staging/cm-13.0+r22Steve Kondik2016-03-105-68/+290
|\|
| * Allow turning off Wi-Fi when emergency call is made [DO NOT MERGE]Vinit Deshpande2016-01-132-17/+70
| * Guard against HAL returning null scan resultsVinit Deshpande2016-01-121-2/+7
| * Reset idenitities for EAP-SIM networks when SIM is pulledVinit Deshpande2016-01-123-0/+53
| * Appropriately fail EAP-SIM/AKA when SIM doesn't generate good responseVinit Deshpande2016-01-122-8/+26
| * Fix issue with WiFi scan reportingAdam Lesinski2015-12-151-3/+2
| * WiFi not connecting to WiFi when screen OFFxinhe2015-11-302-8/+103
| * Don\'t set RSSI to -1 when no value is returned am: 78ca9b3d6fMitchell Wills2015-10-291-9/+8
| |\
| | * Don\'t set RSSI to -1 when no value is returnedMitchell Wills2015-10-291-9/+8
| | |\
| * | | Merge "[DO NOT MERGE] Fix build breakage introduced by CL 797896" into mnc-dr...xin He2015-10-231-1/+1
| |\| |
| | * | Merge "[DO NOT MERGE] Fix build breakage introduced by CL 797896" into mnc-dr...xin He2015-10-231-1/+1
| | |\ \
| * | | | Merge "[DO NOT MERGE] EAP-TLS PMKID mismatch error" into mnc-dr-dev am: e8e62...xin He2015-10-233-4/+51
| |\| | |
| | * | | Merge "[DO NOT MERGE] EAP-TLS PMKID mismatch error" into mnc-dr-devxin He2015-10-233-4/+51
| | |\ \ \
| * | | | | Merge "Disable Portable Wi-Fi hotspot in ECM" into mnc-dr-dev am: 2fd94d6887Pavel Zhamaitsiak2015-10-201-0/+7
| |\| | | |
| | * | | | Merge "Disable Portable Wi-Fi hotspot in ECM" into mnc-dr-devPavel Zhamaitsiak2015-10-201-0/+7
| | |\ \ \ \
| * | | | | | am 25f32f28: am a15a2ee6: Security Vulnerability in android::onPnoNetworkFoun...xinhe2015-10-190-0/+0
| |\| | | | |
| | * | | | | am a15a2ee6: Security Vulnerability in android::onPnoNetworkFound [DO NOT MERGE]xinhe2015-10-190-0/+0
| | |\ \ \ \ \
| * | | | | | | am 4720b8c8: am f5535dfe: am 4436f1f2: am dcf7577b: am d32033b8: am 8b41627f:...Vinit Deshpande2015-10-160-0/+0
| |\| | | | | |
| | * | | | | | am f5535dfe: am 4436f1f2: am dcf7577b: am d32033b8: am 8b41627f: Fix a race i...Vinit Deshpande2015-10-160-0/+0
| | |\ \ \ \ \ \
| * | | | | | | | am be964f00: am 35f3b9ce: Merge "Fix foreground scans for pre-M apps when loc...Fyodor Kupolov2015-10-161-11/+18
| |\| | | | | | |
| | * | | | | | | am 35f3b9ce: Merge "Fix foreground scans for pre-M apps when location is disa...Fyodor Kupolov2015-10-161-11/+18
| | |\ \ \ \ \ \ \
| * | | | | | | | | am c9bea298: am f2e7f4fa: Merge "Security Vulnerability in android::onPnoNetw...xin He2015-10-162-3/+3
| |\| | | | | | | |
| | * | | | | | | | am f2e7f4fa: Merge "Security Vulnerability in android::onPnoNetworkFound" int...xin He2015-10-162-3/+3
| | |\ \ \ \ \ \ \ \
| * | | | | | | | | | am 9d864238: am a8ed84c5: DO NOT MERGE Make sure wifi driver is actually turn...Mitchell Wills2015-10-161-3/+4
| |\| | | | | | | | |
| | * | | | | | | | | am a8ed84c5: DO NOT MERGE Make sure wifi driver is actually turned off when r...Mitchell Wills2015-10-161-3/+4
| | |\ \ \ \ \ \ \ \ \
| * | | | | | | | | | | am 680ac28c: am 4a7d3850: Merge "Prevent corruption of Wifi scan battery stat...Mitchell Wills2015-10-151-1/+4
| |\| | | | | | | | | |
| | * | | | | | | | | | am 4a7d3850: Merge "Prevent corruption of Wifi scan battery stats" into mnc-d...Mitchell Wills2015-10-151-1/+4
| | |\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | am d8c80cc7: am e2ba917b: Merge "Do not throw an exception if appop\'s result...Fyodor Kupolov2015-10-151-12/+7
| |\| | | | | | | | | | |
| | * | | | | | | | | | | am e2ba917b: Merge "Do not throw an exception if appop\'s result is MODE_IGNO...Fyodor Kupolov2015-10-151-12/+7
| | |\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | am 7af1ef61: am 7b97c836: Merge "Set hs20 property to 1 when connecting to pa...Pankaj Kanwar2015-10-152-0/+10
| |\| | | | | | | | | | | |
| | * | | | | | | | | | | | am 7b97c836: Merge "Set hs20 property to 1 when connecting to passpoint netwo...Pankaj Kanwar2015-10-152-0/+10
| | |\ \ \ \ \ \ \ \ \ \ \ \