- 8ffeda0 Merge commit 'ec3e9805dd7c527f961d1f2a14e5752b461186ca' into fix-merge-conflict by Wink Saville · 10 years ago
- 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
- ec3e980 dont blacklist wifi config that have had validated internet status in the past by vandwalle · 10 years ago
- e40ea96 am a45e9897: am 8cae7f64: am 8fe7676e: Merge "Fix incorrect doc for WifiInfo#getSSID()." into lmp-mr1-dev by Jeff Davidson · 10 years ago
- a45e989 am 8cae7f64: am 8fe7676e: Merge "Fix incorrect doc for WifiInfo#getSSID()." into lmp-mr1-dev by Jeff Davidson · 10 years ago
- f92fc1c Fix incorrect doc for WifiInfo#getSSID(). by Jeff Davidson · 10 years ago
- bc2ccb4 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
- 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
- 074c5b5 Merge "Don't drop WifiConfiguration's ephemeral bit on copy/parcel." into lmp-mr1-dev by Jeff Davidson · 10 years ago
- 0f422c6 resolved conflicts for merge of 28495b02 into master by Primiano Tucci · 10 years ago
- 73a6489 Fix the "Fix broken merge of "handle bssid blacklist in case of dhcp failures"" by Primiano Tucci · 10 years ago
- 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
- 63edd98 adding debug information to bug report for Bug:16751877 by vandwalle · 10 years ago
- 8faf2a2 Don't drop WifiConfiguration's ephemeral bit on copy/parcel. by Jeff Davidson · 10 years ago
- 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
- 542cc24 am 88b927e2: am c67e5ae2: am 4f5fd780: am 68104b05: Merge "add millisecond timestamp to locallog" into lmp-dev by vandwalle · 10 years ago
- c520aa8 add millisecond timestamp to locallog by vandwalle · 10 years ago
- 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
- 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
- 8e1e34a Revert the configKey generation algorithm to what it was in K. by Lorenzo Colitti · 10 years ago
- c55cd10 User wifi separation feature. by Sky Faber · 10 years ago
- 3e3857c Separate wifi AP added by applications. by Sky Faber · 10 years ago
- 0561030 Fix broken merge of "handle bssid blacklist in case of dhcp failures" by Mike Lockwood · 10 years ago
- 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
- 176a27f handle bssid blacklist in case of dhcp failures by vandwalle · 10 years ago
- 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
- 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
- 02b115b Fix documentation for Wifi ScanResult.timestamp by Vinit Deshpande · 10 years ago
- 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
- e2b32af am c3eea0ee: am a203fbc8: Merge "Allow creating EAP_TLS network without specifying Phase2.None" into lmp-dev by Prem Kumar · 10 years ago
- 97a0c45 Merge "Allow creating EAP_TLS network without specifying Phase2.None" into lmp-dev by Prem Kumar · 10 years ago
- 3d6e7eb am ffbae6e2: am dfb82a24: am 35967d04: Merge "make wifi cellular params configurable" into lmp-dev by vandwalle · 10 years ago
- 397b30b am dfb82a24: am 35967d04: Merge "make wifi cellular params configurable" into lmp-dev by vandwalle · 10 years ago
- 2e93c38f make wifi cellular params configurable by vandwalle · 10 years ago
- 26a9800 Allow creating EAP_TLS network without specifying Phase2.None by Vinit Deshpande · 10 years ago
- a487843 am 4ae83802: am 8c8f56ca: am e62a18e5: Merge "various fixes:" into lmp-dev by vandwalle · 10 years ago
- f28489b am 8c8f56ca: am e62a18e5: Merge "various fixes:" into lmp-dev by vandwalle · 10 years ago
- 94fe7e9 various fixes: by vandwalle · 10 years ago
- 37b26b4 am 0689adb0: am a5ef501a: am 9e444d7a: Merge "make autojoin configurable, clean up BSSID info that may be stake in WifiConfiguration" into lmp-dev by vandwalle · 10 years ago
- afc4885 am a5ef501a: am 9e444d7a: Merge "make autojoin configurable, clean up BSSID info that may be stake in WifiConfiguration" into lmp-dev by vandwalle · 10 years ago
- e26bc8f make autojoin configurable, clean up BSSID info that may be stake in WifiConfiguration by vandwalle · 10 years ago
- 3120fb3 am 9f593a21: am b73e94b4: am 8270c789: Merge "Secure access to WifiScanner" into lmp-dev by Vinit Deshpande · 10 years ago
- 174538f am b73e94b4: am 8270c789: Merge "Secure access to WifiScanner" into lmp-dev by Vinit Deshpande · 10 years ago
- a0000c6 Merge "Secure access to WifiScanner" into lmp-dev by Vinit Deshpande · 10 years ago
- 43f6eda am 80adb33a: am 33e1b95c: am fc591cc1: Merge "Implement getAvailableChannels" into lmp-dev by Vinit Deshpande · 10 years ago
- bb90cff am 33e1b95c: am fc591cc1: Merge "Implement getAvailableChannels" into lmp-dev by Vinit Deshpande · 10 years ago
- 592b959 Merge "Implement getAvailableChannels" into lmp-dev by Vinit Deshpande · 10 years ago
- 4b99756 Secure access to WifiScanner by Vinit Deshpande · 10 years ago
- bc189d8 am e1677497: am 344ddea4: am a35a795f: Merge "add more info to WifiConfiguration.toString: - add the noInternetAccess field - add stats about user triggered wifi state disabling requests - Wifi SSID can change even though we don\'t loose connection, hence it must be l by vandwalle · 10 years ago
- 8828537 am 344ddea4: am a35a795f: Merge "add more info to WifiConfiguration.toString: - add the noInternetAccess field - add stats about user triggered wifi state disabling requests - Wifi SSID can change even though we don\'t loose connection, hence it must be looked at with by vandwalle · 10 years ago
- 448e208 add more info to WifiConfiguration.toString: by vandwalle · 10 years ago
- 15f8907 Implement getAvailableChannels by Vinit Deshpande · 10 years ago
- 4ec0cf0 am 1fc17b58: am d3a78eff: am 36b0eac4: Merge "Add @SystemApi annotations to methods used by GmsCore. -Currently these methods are called using reflection for location. Bug: 17371392 Change-Id: I6546f5b485415beff69164ba0d526757ee831f69" into lmp-dev by David Christie · 10 years ago
- 25fb150 am d3a78eff: am 36b0eac4: Merge "Add @SystemApi annotations to methods used by GmsCore. -Currently these methods are called using reflection for location. Bug: 17371392 Change-Id: I6546f5b485415beff69164ba0d526757ee831f69" into lmp-dev by David Christie · 10 years ago
- e7baf5a Merge "Add @SystemApi annotations to methods used by GmsCore. -Currently these methods are called using reflection for location. Bug: 17371392 Change-Id: I6546f5b485415beff69164ba0d526757ee831f69" into lmp-dev by David Christie · 10 years ago
- c20b795 Add @SystemApi annotations to methods used by GmsCore. by David Christie · 10 years ago
- 3df10a6 am 21790061: am f4b970e5: am 2705b859: Merge "Address API Council feedback for WifiAdapter/WPS APIs" into lmp-dev by Vinit Deshpande · 10 years ago
- f0f4058 am f4b970e5: am 2705b859: Merge "Address API Council feedback for WifiAdapter/WPS APIs" into lmp-dev by Vinit Deshpande · 10 years ago
- 73f5d16 Address API Council feedback for WifiAdapter/WPS APIs by Vinit Deshpande · 10 years ago
- 8c1f0b3 am f7c9ffc3: am 4c5d4e29: Merge "fix ScanResult read from parcel, this function was broken and causes wifi settings to crash" into lmp-dev by vandwalle · 10 years ago
- b1dce02 fix ScanResult read from parcel, this function was broken and causes wifi settings to crash by vandwalle · 10 years ago
- fb9cf90 am 39b53f3c: am bdc65df3: Merge "remove passpoint - DO NOT MERGE" into lmp-dev by vandwalle · 10 years ago
- 7aea15a Merge "remove passpoint - DO NOT MERGE" into lmp-dev by vandwalle · 10 years ago
- 0f5734d am 362448d4: am dbf54ec2: am b2139607: Merge "add radio stats to link layer" into lmp-dev by vandwalle · 10 years ago
- 10d3d97 am dbf54ec2: am b2139607: Merge "add radio stats to link layer" into lmp-dev by vandwalle · 10 years ago
- 808079b remove passpoint - DO NOT MERGE by vandwalle · 10 years ago
- b928a38 add radio stats to link layer by vandwalle · 10 years ago
- 5223cc6 am de1bc6cb: am f654d5b2: am 2954d35a: Merge "Revert "Annotate @SystemApi on some WifiManager methods."" into lmp-dev by Wenchao Tong · 10 years ago
- 0a3bd24 am f654d5b2: am 2954d35a: Merge "Revert "Annotate @SystemApi on some WifiManager methods."" into lmp-dev by Wenchao Tong · 10 years ago
- ddd0986 Merge "Revert "Annotate @SystemApi on some WifiManager methods."" into lmp-dev by Wenchao Tong · 10 years ago
- 82615a6 am fad9e3a0: am 01c23ffb: am 23e25851: Merge "per bssid blacklist" into lmp-dev by vandwalle · 10 years ago
- 5197859 am 01c23ffb: am 23e25851: Merge "per bssid blacklist" into lmp-dev by vandwalle · 10 years ago
- beec215 Merge "per bssid blacklist" into lmp-dev by vandwalle · 10 years ago
- 99d853f am 00fde029: am 5e3130d6: am fa141926: Merge "Improve documentation of ScanResult and WifiInfo." into lmp-dev by Jeff Davidson · 10 years ago
- 2cfe535 am 5e3130d6: am fa141926: Merge "Improve documentation of ScanResult and WifiInfo." into lmp-dev by Jeff Davidson · 10 years ago
- cd8e041 Revert "Annotate @SystemApi on some WifiManager methods." by Wenchao Tong · 10 years ago
- 612519d per bssid blacklist by vandwalle · 10 years ago
- 833dcd4 Merge "Improve documentation of ScanResult and WifiInfo." into lmp-dev by Jeff Davidson · 10 years ago
- ccb019d am 3a7bbbff: am 14aa17a2: Merge "remove passpoint, except ANQP - DO NOT MERGE" into lmp-dev by vandwalle · 10 years ago
- da3475d Merge "remove passpoint, except ANQP - DO NOT MERGE" into lmp-dev by vandwalle · 10 years ago
- b413f19 am 143817b4: am 3e76a3aa: am 3ddfe1ce: Merge "Annotate @SystemApi on some WifiManager methods." into lmp-dev by Wenchao Tong · 10 years ago
- 459fcb6 am 3e76a3aa: am 3ddfe1ce: Merge "Annotate @SystemApi on some WifiManager methods." into lmp-dev by Wenchao Tong · 10 years ago
- aa740d3 am 5eb792fc: am 45b565ff: am 14152c79: Merge "Stop using LinkProperties for static configuration." into lmp-dev by Lorenzo Colitti · 10 years ago
- 56d4c18 am 45b565ff: am 14152c79: Merge "Stop using LinkProperties for static configuration." into lmp-dev by Lorenzo Colitti · 10 years ago
- 4d11492 Annotate @SystemApi on some WifiManager methods. by Wenchao Tong · 10 years ago
- 36ecb30 Merge "Annotate @SystemApi on some WifiManager methods." into lmp-dev by Wenchao Tong · 10 years ago
- 1575d90 remove passpoint, except ANQP - DO NOT MERGE by vandwalle · 10 years ago
- 74eea2a am 61520b2e: am 400ec1b9: am 085889e3: Merge "WifiP2pWfdInfo set device type bugfix" by Elliott Hughes · 10 years ago
- c97de79 am 400ec1b9: am 085889e3: Merge "WifiP2pWfdInfo set device type bugfix" by Elliott Hughes · 10 years ago
- 400ec1b am 085889e3: Merge "WifiP2pWfdInfo set device type bugfix" by Elliott Hughes · 10 years ago
- 0a82e80 Stop using LinkProperties for static configuration. by Lorenzo Colitti · 10 years ago
- 8b3b8100 WifiP2pWfdInfo set device type bugfix by Grigoriy Kraynov · 10 years ago
- d7d06fe am bcdd58c5: am e21dd346: am 3e941c33: Merge "Revert "Revert "Revert "Revert "Revert "Update Trusted Credentials screen in settings"""""" into lmp-dev by Zoltan Szatmary-Ban · 10 years ago
- 7db442e am 08390bf9: am 1d128a5a: am 856e0928: Merge "Revert "Revert "Revert "Revert "Update Trusted Credentials screen in settings""""" into lmp-dev by Zoltan Szatmary-Ban · 10 years ago
- a93fb72 am 2b83dc1a: am 09f669f0: am a7d930a0: Merge "Revert "Revert "Revert "Update Trusted Credentials screen in settings"""" into lmp-dev by Narayan Kamath · 10 years ago
- 55083f2 am a6e86ddf: am fe2114b4: am 19c8ce29: Revert "Revert "Update Trusted Credentials screen in settings"" by Zoltan Szatmary-Ban · 10 years ago
- 1e7bc0d Revert "Revert "Update Trusted Credentials screen in settings"" by Zoltan Szatmary-Ban · 10 years ago
- f8d72cc Revert "Revert "Revert "Revert "Update Trusted Credentials screen in settings"""" by Zoltan Szatmary-Ban · 10 years ago
- f75aadc Revert "Revert "Revert "Update Trusted Credentials screen in settings""" by Narayan Kamath · 10 years ago
- 3291de8 Revert "Revert "Revert "Revert "Revert "Update Trusted Credentials screen in settings""""" by Zoltan Szatmary-Ban · 10 years ago