1. 36711e0 Merge changes from topic 'mwd-merge-040115' by Etan Cohen · 10 years ago
  2. eb864d4 Merge commit 'd91f193' into merge2 by Etan Cohen · 10 years ago
  3. 984dc85 Move reset network settings into framework. by Stuart Scott · 10 years ago
  4. 4b6bd8d Retrieve WiFi info outside of BatteryStatsImpl by Adam Lesinski · 10 years ago
  5. adf9e95 EAP-AKA' : Add support of EAP-AKA' in WiFi Enterprise methods by Jean-Michel Bachot · 10 years ago
  6. ddfd35d add wifi config for power calculation by Pierre Vandwalle · 10 years ago
  7. 4209a28 Merge remote-tracking branch 'goog/mirror-m-wireless-internal-release' into master_merge by Prerepa Viswanadham · 10 years ago
  8. 3105289 Merge "More fixes to get passpoint working" into m-wireless-dev by Jan Nordqvist · 10 years ago
  9. af3f1c9 Merge "export API to disable autojoin scan initial implementation" into lmp-mr1-wfc-dev by Pierre Vandwalle · 10 years ago
  10. ad25bb8 More fixes to get passpoint working by Vinit Deshpande · 10 years ago
  11. 9954faa Change rtt Framework interface by xinhe · 10 years ago
  12. 2522c83 Fix scan results to hold passpoint data by Vinit Deshpande · 10 years ago
  13. 0444442 Improve passpoint configuration validation by Vinit Deshpande · 10 years ago
  14. 88dadfa am 7cff91ea: am 079cfa64: Merge "Frameworks/base: Fix a hashCode implementation" by Robert Greenwalt · 10 years ago
  15. 34a7d13 Frameworks/base: Fix a hashCode implementation by Andreas Gampe · 10 years ago
  16. fd67bf6 am "add 2 side RTT support on scan" by Vinit Deshpande · 10 years ago
  17. 8115762 am "Passpoint API - Take 1" by Vinit Deshpande · 10 years ago
  18. 9e535b8 am "Do not provide 5GHz option for softap if there is no country code available" by Vinit Deshpande · 10 years ago
  19. a86f074 am "get channel list from driver for SoftAP channel selection" by Vinit Deshpande · 10 years ago
  20. fc19120 am "Revert "Initial Passpoint code."" by Vinit Deshpande · 10 years ago
  21. 53f8738 am "Initial Passpoint code." by Vinit Deshpande · 10 years ago
  22. b35f4ef am "set softAP on a specified band, including both 2.4 and 5 GHz band" by Vinit Deshpande · 10 years ago
  23. 5914caf export API to disable autojoin scan initial implementation by Pierre Vandwalle · 10 years ago
  24. 046ac5e Few changes to make API check happy [DO NOT MERGE] by Vinit Deshpande · 10 years ago
  25. 0019e53 am "add 2 side RTT support on scan" by Vinit Deshpande · 10 years ago
  26. d2585f3 am "Passpoint API - Take 1" by Vinit Deshpande · 10 years ago
  27. e959443 am "Do not provide 5GHz option for softap if there is no country code available" by Vinit Deshpande · 10 years ago
  28. 14a2008 am "Introduce onLost event on bssid hotlist [DO NOT MERGE]" by Vinit Deshpande · 10 years ago
  29. 3cb5e4d am "get channel list from driver for SoftAP channel selection" by Vinit Deshpande · 10 years ago
  30. 76f9ace am "Revert "Initial Passpoint code."" by Vinit Deshpande · 10 years ago
  31. 29267b6 am "Initial Passpoint code." by Vinit Deshpande · 10 years ago
  32. b4499af am "set softAP on a specified band, including both 2.4 and 5 GHz band" by Vinit Deshpande · 10 years ago
  33. 1aa4dce am "Bring in passpoint code [DO NOT MERGE]" by Vinit Deshpande · 10 years ago
  34. 472cca0 am "New Additions to WifiScanner APIs [DO NOT MERGE]" by Vinit Deshpande · 10 years ago
  35. 488caeb Change WiFi and Bluetooth ActivityEnergyInfo classes by Adam Lesinski · 10 years ago
  36. 6e58424 add 2 side RTT support on scan by xinhe · 10 years ago
  37. 08c7116 Remove unused imports in frameworks/base. by John Spurlock · 10 years ago
  38. a357b5a Merge "Do not provide 5GHz option for softap if there is no country code available" into m-wireless-wifi-dev by xinhe · 10 years ago
  39. c4423a5 Merge "Passpoint API - Take 1" into m-wireless-wifi-dev by Vinit Deshpande · 10 years ago
  40. b21d248 Passpoint API - Take 1 by Vinit Deshpande · 10 years ago
  41. b938c0e Do not provide 5GHz option for softap if there is no country code available by xinhe · 10 years ago
  42. ab325cb Introduce onLost event on bssid hotlist [DO NOT MERGE] by Vinit Deshpande · 10 years ago
  43. 18ae1d2 get channel list from driver for SoftAP channel selection by xinhe · 10 years ago
  44. 5d7768f Revert "Initial Passpoint code." by Vinit Deshpande · 10 years ago
  45. 2eba02a Initial Passpoint code. by Jan Nordqvist · 10 years ago
  46. b53d1a2 Merge "aggressively blacklist WifiConfiguration for the purpose of switching network" into lmp-mr1-dev automerge: d169839 automerge: 0a22d43 by vandwalle · 10 years ago
  47. 7e553a0 Merge "aggressively blacklist WifiConfiguration for the purpose of switching network" into lmp-mr1-dev automerge: d169839 by vandwalle · 10 years ago
  48. 8650c03 aggressively blacklist WifiConfiguration for the purpose of switching network by vandwalle · 10 years ago
  49. 08cbd3e Merge "set softAP on a specified band, including both 2.4 and 5 GHz band" into m-wireless-wifi-dev by xinhe · 10 years ago
  50. a0be0fb set softAP on a specified band, including both 2.4 and 5 GHz band by xinhe · 10 years ago
  51. 7dd2f6b Bring in passpoint code [DO NOT MERGE] by Vinit Deshpande · 10 years ago
  52. f45acfe New Additions to WifiScanner APIs [DO NOT MERGE] by Vinit Deshpande · 10 years ago
  53. 1c9c3f4 am a3c187bc: am f87606fe: Merge "add debug logs to confirm network flapping issue is fixed Bug:18706288" into lmp-mr1-dev by vandwalle · 10 years ago
  54. 67878bb am a3c187bc: am f87606fe: Merge "add debug logs to confirm network flapping issue is fixed Bug:18706288" into lmp-mr1-dev by vandwalle · 10 years ago
  55. 72e1d3f add debug logs to confirm network flapping issue is fixed Bug:18706288 by vandwalle · 10 years ago
  56. c4f389e New Additions to WifiScanner APIs by Vinit Deshpande · 10 years ago
  57. 1265a98 Introduce onLost event on bssid hotlist by Vinit Deshpande · 10 years ago
  58. 572ff42 am fa205fff: am 9ef07ad2: Merge "make sure wificonfiguration scan cache doesnt grow unbounded Bug:18703749" into lmp-mr1-dev by Prem Kumar · 10 years ago
  59. da6ebb4e am fa205fff: am 9ef07ad2: Merge "make sure wificonfiguration scan cache doesnt grow unbounded Bug:18703749" into lmp-mr1-dev by Prem Kumar · 10 years ago
  60. 53d1f07 make sure wificonfiguration scan cache doesnt grow unbounded Bug:18703749 by vandwalle · 10 years ago
  61. 5d0bf5d am 820ba1f9: am 401ef259: am a4144563: Merge "add disable Ephemeral Network API Bug:18525241" into lmp-mr1-dev by Jeff Davidson · 10 years ago
  62. 820ba1f am 401ef259: am a4144563: Merge "add disable Ephemeral Network API Bug:18525241" into lmp-mr1-dev by Jeff Davidson · 10 years ago
  63. 93e4192 add disable Ephemeral Network API Bug:18525241 by vandwalle · 10 years ago
  64. a7af2e8 am f12fc2e1: am b6c9cbc5: am 47772ac8: Merge "make startScan with worksource specific to location scans" into lmp-mr1-dev by vandwalle · 10 years ago
  65. f12fc2e am b6c9cbc5: am 47772ac8: Merge "make startScan with worksource specific to location scans" into lmp-mr1-dev by vandwalle · 10 years ago
  66. da123a6 make startScan with worksource specific to location scans by vandwalle · 10 years ago
  67. 33f97d8 am 77fe4c96: am a34f3d30: am 800bf3ae: Merge "Fix WPS docs for LABEL method" into lmp-mr1-dev by Vinit Deshpande · 10 years ago
  68. 77fe4c9 am a34f3d30: am 800bf3ae: Merge "Fix WPS docs for LABEL method" into lmp-mr1-dev by Vinit Deshpande · 10 years ago
  69. c3eb155 Fix WPS docs for LABEL method by Vinit Deshpande · 10 years ago
  70. 8ffeda0 Merge commit 'ec3e9805dd7c527f961d1f2a14e5752b461186ca' into fix-merge-conflict by Wink Saville · 10 years ago
  71. 4d974fa Merge "dont blacklist wifi config that have had validated internet status in the past" into lmp-mr1-dev automerge: 3f558e7 by vandwalle · 10 years ago
  72. ec3e980 dont blacklist wifi config that have had validated internet status in the past by vandwalle · 10 years ago
  73. e40ea96 am a45e9897: am 8cae7f64: am 8fe7676e: Merge "Fix incorrect doc for WifiInfo#getSSID()." into lmp-mr1-dev by Jeff Davidson · 10 years ago
  74. a45e989 am 8cae7f64: am 8fe7676e: Merge "Fix incorrect doc for WifiInfo#getSSID()." into lmp-mr1-dev by Jeff Davidson · 10 years ago
  75. f92fc1c Fix incorrect doc for WifiInfo#getSSID(). by Jeff Davidson · 10 years ago
  76. bc2ccb48 am 1199a4c4: am f2a598e4: am 074c5b5b: Merge "Don\'t drop WifiConfiguration\'s ephemeral bit on copy/parcel." into lmp-mr1-dev by Jeff Davidson · 10 years ago
  77. 1199a4c am f2a598e4: am 074c5b5b: Merge "Don\'t drop WifiConfiguration\'s ephemeral bit on copy/parcel." into lmp-mr1-dev by Jeff Davidson · 10 years ago
  78. 074c5b5 Merge "Don't drop WifiConfiguration's ephemeral bit on copy/parcel." into lmp-mr1-dev by Jeff Davidson · 10 years ago
  79. 0f422c6 resolved conflicts for merge of 28495b02 into master by Primiano Tucci · 10 years ago
  80. 73a6489 Fix the "Fix broken merge of "handle bssid blacklist in case of dhcp failures"" by Primiano Tucci · 10 years ago
  81. 28495b0 am b75369e2: am 7bbf867b: am 0c0c680d: am a741efd5: Merge "adding debug information to bug report for Bug:16751877" into lmp-dev by vandwalle · 10 years ago
  82. 63edd98 adding debug information to bug report for Bug:16751877 by vandwalle · 10 years ago
  83. 8faf2a2 Don't drop WifiConfiguration's ephemeral bit on copy/parcel. by Jeff Davidson · 10 years ago
  84. 3041a9e am 542cc240: am 88b927e2: am c67e5ae2: am 4f5fd780: am 68104b05: Merge "add millisecond timestamp to locallog" into lmp-dev by vandwalle · 10 years ago
  85. 542cc24 am 88b927e2: am c67e5ae2: am 4f5fd780: am 68104b05: Merge "add millisecond timestamp to locallog" into lmp-dev by vandwalle · 10 years ago
  86. c520aa8 add millisecond timestamp to locallog by vandwalle · 10 years ago
  87. fb223e8 am 65d720b3: am 6245bd9e: am eef8d3eb: am df959707: am 7fe95529: Merge "Revert the configKey generation algorithm to what it was in K." into lmp-dev by Lorenzo Colitti · 10 years ago
  88. 65d720b am 6245bd9e: am eef8d3eb: am df959707: am 7fe95529: Merge "Revert the configKey generation algorithm to what it was in K." into lmp-dev by Lorenzo Colitti · 10 years ago
  89. 8e1e34a Revert the configKey generation algorithm to what it was in K. by Lorenzo Colitti · 10 years ago
  90. c55cd10 User wifi separation feature. by Sky Faber · 10 years ago
  91. 3e3857c Separate wifi AP added by applications. by Sky Faber · 10 years ago
  92. 0561030 Fix broken merge of "handle bssid blacklist in case of dhcp failures" by Mike Lockwood · 10 years ago
  93. 6933d61 am 9e22f280: am 713b200d: am 9794dc95: am 0829f6b6: Merge "handle bssid blacklist in case of dhcp failures" into lmp-dev by vandwalle · 10 years ago
  94. 176a27f handle bssid blacklist in case of dhcp failures by vandwalle · 10 years ago
  95. 2e88cec am ccafcfbc: am 6839bf68: am 41fa5e86: am 699ba17f: am 14f0aba3: Merge "Fix documentation for Wifi ScanResult.timestamp" into lmp-dev by Vinit Deshpande · 10 years ago
  96. 28a15a1 am 6839bf68: am 41fa5e86: am 699ba17f: am 14f0aba3: Merge "Fix documentation for Wifi ScanResult.timestamp" into lmp-dev by Vinit Deshpande · 10 years ago
  97. 02b115b Fix documentation for Wifi ScanResult.timestamp by Vinit Deshpande · 10 years ago
  98. 58e5d5e am 27f19d75: am c3eea0ee: am a203fbc8: Merge "Allow creating EAP_TLS network without specifying Phase2.None" into lmp-dev by Prem Kumar · 10 years ago
  99. e2b32af am c3eea0ee: am a203fbc8: Merge "Allow creating EAP_TLS network without specifying Phase2.None" into lmp-dev by Prem Kumar · 10 years ago
  100. 97a0c45 Merge "Allow creating EAP_TLS network without specifying Phase2.None" into lmp-dev by Prem Kumar · 10 years ago