summaryrefslogtreecommitdiff
AgeCommit message (Expand)Author
2017-07-14Merge cherrypicks of [2540686, 2540687, 2540384, 2540688, 2540689, 2540690, 2...android-6.0.1_r81marshmallow-mr2-releaseandroid-build-team Robot
2017-07-14cherry-pick: wifinative jni: check array length for trackSignificantWifiChangeNingyuan Wang
2017-07-10release-request-7d0d54d4-91f7-482d-9ef3-b2099127bec4-for-git_mnc-mr2-release-...android-build-team Robot
2017-07-10release-request-7d0d54d4-91f7-482d-9ef3-b2099127bec4-for-git_mnc-mr2-release-...android-build-team Robot
2017-06-29Merge cherrypicks of [2480357, 2480488, 2480426, 2480504, 2480559, 2480579, 2...android-build-team Robot
2017-06-29cherry-pick: wifinative jni: check array length for trackSignificantWifiChangeNingyuan Wang
2017-03-15Merge remote-tracking branch 'goog/security-aosp-mnc-mr1-release' into HEADandroid-6.0.1_r80Bill Yi
2017-01-27configparse: do not delete passpoint configuration filePeter Qiu
2017-01-20configparse: do not delete passpoint configuration filePeter Qiu
2016-11-03resolve merge conflicts of 849c5c7 to mnc-devandroid-6.0.1_r79android-6.0.1_r78Ningyuan Wang
2016-11-03wifinative jni: check array length to prevent stack overflowNingyuan Wang
2016-10-20resolve merge conflicts of 849c5c7 to mnc-devNingyuan Wang
2016-10-20wifinative jni: check array length to prevent stack overflowNingyuan Wang
2016-08-30Revert "Fix Runtime Restart caused by ag/1370419"Feng Yu
2016-08-29Fix Runtime Restart caused by ag/1370419Adam Seaton
2016-08-25ANQPFactory: catch all potential parsing errorsandroid-6.0.1_r74android-6.0.1_r70Samuel Tan
2016-08-25VenueNameElement: fix off-by-one enum bounds checkSamuel Tan
2016-08-24Merge "VenueNameElement: fix off-by-one enum bounds check" into security-aosp...Feng Yu
2016-08-23ANQPFactory: catch all potential parsing errorsSamuel Tan
2016-08-02VenueNameElement: fix off-by-one enum bounds checkSamuel Tan
2016-06-24Deal correctly with short stringsPaul Stewart
2016-06-23Deal correctly with short stringsandroid-6.0.1_r66android-6.0.1_r61android-6.0.1_r60android-6.0.1_r59android-6.0.1_r58Paul Stewart
2016-02-24DO NOT MERGE Update network priorities before PNO is triggeredandroid-6.0.1_r52android-6.0.1_r51android-6.0.1_r50android-6.0.1_r49android-6.0.1_r46android-6.0.1_r43android-6.0.1_r42android-6.0.1_r41android-6.0.1_r40android-6.0.1_r30Roshan Pius
2016-02-24DO NOT MERGE ANYWHERE: Fix issue with WiFi scan reportingAdam Lesinski
2015-10-28Don't set RSSI to -1 when no value is returnedandroid-6.0.1_r9android-6.0.1_r8android-6.0.1_r7android-6.0.1_r48android-6.0.1_r47android-6.0.1_r3android-6.0.1_r28android-6.0.1_r27android-6.0.1_r26android-6.0.1_r20android-6.0.1_r17android-6.0.1_r13android-6.0.1_r12android-6.0.1_r11android-6.0.1_r10android-6.0.1_r1android-6.0.0_r41marshmallow-mr1-devMitchell Wills
2015-10-23Merge "[DO NOT MERGE] Fix build breakage introduced by CL 797896" into mnc-dr...xin He
2015-10-23[DO NOT MERGE] Fix build breakage introduced by CL 797896xinhe
2015-10-23Merge "[DO NOT MERGE] EAP-TLS PMKID mismatch error" into mnc-dr-devxin He
2015-10-23[DO NOT MERGE] EAP-TLS PMKID mismatch errorxinhe
2015-10-20Merge "Disable Portable Wi-Fi hotspot in ECM" into mnc-dr-devPavel Zhamaitsiak
2015-10-20Disable Portable Wi-Fi hotspot in ECMPavel Zhamaitsiak
2015-10-19am a15a2ee6: Security Vulnerability in android::onPnoNetworkFound [DO NOT MERGE]xinhe
2015-10-19Security Vulnerability in android::onPnoNetworkFound [DO NOT MERGE]xinhe
2015-10-16am 4436f1f2: am dcf7577b: am d32033b8: am 8b41627f: Fix a race in WifiNative ...Vinit Deshpande
2015-10-16am dcf7577b: am d32033b8: am 8b41627f: Fix a race in WifiNative objectsVinit Deshpande
2015-10-16am d32033b8: am 8b41627f: Fix a race in WifiNative objectsVinit Deshpande
2015-10-16am 8b41627f: Fix a race in WifiNative objectsVinit Deshpande
2015-10-16Merge "Fix foreground scans for pre-M apps when location is disabled" into mn...Fyodor Kupolov
2015-10-16Merge "Security Vulnerability in android::onPnoNetworkFound" into mnc-dr-devxin He
2015-10-16Security Vulnerability in android::onPnoNetworkFoundxinhe
2015-10-16Fix a race in WifiNative objectsVinit Deshpande
2015-10-16DO NOT MERGE Make sure wifi driver is actually turned off when requestedMitchell Wills
2015-10-15Merge "Prevent corruption of Wifi scan battery stats" into mnc-dr-devMitchell Wills
2015-10-15Fix foreground scans for pre-M apps when location is disabledFyodor Kupolov
2015-10-15Merge "Do not throw an exception if appop's result is MODE_IGNORED" into mnc-...Fyodor Kupolov
2015-10-15Merge "Set hs20 property to 1 when connecting to passpoint network" into mnc-...Pankaj Kanwar
2015-10-15Merge "Fix center frequency parsing bug." into mnc-dr-devPankaj Kanwar
2015-10-14Do not throw an exception if appop's result is MODE_IGNOREDFyodor Kupolov
2015-10-14Prevent corruption of Wifi scan battery statsMitchell Wills
2015-10-14Set hs20 property to 1 when connecting to passpoint networkVinit Deshpande