aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2013-06-26Merge "Remove obsolete keystore path"HEADmastermainjb-mr1.1-dev-plus-aospKenny Root
2013-06-26Remove obsolete keystore pathKenny Root
It's not possible to get a raw private key from keystore anymore, so this would fail every time anyway. Remove it so it doesn't confuse anyone that looks at this code. Change-Id: I36c2d18e63e8ef34938925f1b702a6c246fd0dff
2013-03-01Merge "wpa_supplicant: use correct header files."tools_r22.2tools_r22Nick Kralevich
2013-03-01wpa_supplicant: use correct header files.Nick Kralevich
Change-Id: Id67f92430f7022810af2e9ae9e27040649251e70
2012-11-14Merge "Switch keystore to binder"jb-mr1-dev-plus-aospKenny Root
2012-11-13Switch keystore to binderKenny Root
Change-Id: I9dd32b1f1ac5d32cb2335f805ce74bb649459f97
2012-08-17am 20e9350e: am 6c86b774: Merge "Get rid of LOCAL_MODULE_TAGS := user"android-sdk-support_r11android-cts-4.2_r2android-cts-4.2_r1android-4.2_r1android-4.2.2_r1.2android-4.2.2_r1.1android-4.2.2_r1android-4.2.1_r1.2android-4.2.1_r1.1android-4.2.1_r1jb-mr1.1-releasejb-mr1.1-devjb-mr1-releasejb-mr1-devJoe Onorato
* commit '20e9350e5fd358cd58db82c9157e9b23562ac097': Get rid of LOCAL_MODULE_TAGS := user
2012-08-16am 6c86b774: Merge "Get rid of LOCAL_MODULE_TAGS := user"tools_r21Joe Onorato
* commit '6c86b77423a33e8b06c4dd4337cdc13696513b1d': Get rid of LOCAL_MODULE_TAGS := user
2012-08-16Merge "Get rid of LOCAL_MODULE_TAGS := user"Joe Onorato
2012-07-31Get rid of LOCAL_MODULE_TAGS := userJoe Onorato
Change-Id: I9d010fc5ade312a74a7c8db8920dd40e259bf0a4
2012-07-31am 0c19ef3d: (-s ours) Reconcile with jb-mr0-release - do not mergeThe Android Open Source Project
* commit '0c19ef3df1e47accc7534a1d40e55b7df8725441':
2012-07-31Reconcile with jb-mr0-release - do not mergeThe Android Open Source Project
Change-Id: I210109f82080d0a7b783f7f10a6ca1cc30460405
2012-07-31merge in jb-mr0-release history after reset to jb-devandroid-4.1.2_r2.1android-4.1.2_r2android-4.1.2_r1jb-mr0-releaseThe Android Automerger
2012-07-26am e3bf5a16: Merge "Use SSL_OP_NO_TLSv1_1 SSL_OP_NO_TLSv1_2 SSL_OP_NO_TICKET ↵Brian Carlstrom
for better wpa_supplicant_6 interoperability" * commit 'e3bf5a169f6a766bbde14ea0176c4bc284af4c2a': Use SSL_OP_NO_TLSv1_1 SSL_OP_NO_TLSv1_2 SSL_OP_NO_TICKET for better wpa_supplicant_6 interoperability
2012-07-26Merge "Use SSL_OP_NO_TLSv1_1 SSL_OP_NO_TLSv1_2 SSL_OP_NO_TICKET for better ↵Brian Carlstrom
wpa_supplicant_6 interoperability"
2012-07-26Use SSL_OP_NO_TLSv1_1 SSL_OP_NO_TLSv1_2 SSL_OP_NO_TICKET for better ↵Brian Carlstrom
wpa_supplicant_6 interoperability Bug: https://bugs.launchpad.net/ubuntu/+source/wpasupplicant/+bug/969343/comments/72 Bug: http://w1.fi/bugz/show_bug.cgi?id=447#c7 Bug: http://code.google.com/p/android/issues/detail?id=34212 Bug: 6883259 (cherry-picked from 617450fed233b4b17a8a7c7b9f60ecabc513df21) Change-Id: I14c83f51da98c9340ec0c8429d16ae5c06a0d2c1
2012-07-26am 617450fe: Use SSL_OP_NO_TLSv1_1 SSL_OP_NO_TLSv1_2 SSL_OP_NO_TICKET for ↵Brian Carlstrom
better wpa_supplicant_6 interoperability * commit '617450fed233b4b17a8a7c7b9f60ecabc513df21': Use SSL_OP_NO_TLSv1_1 SSL_OP_NO_TLSv1_2 SSL_OP_NO_TICKET for better wpa_supplicant_6 interoperability
2012-07-25Use SSL_OP_NO_TLSv1_1 SSL_OP_NO_TLSv1_2 SSL_OP_NO_TICKET for better ↵android-cts-4.1_r4android-cts-4.1_r2jb-devBrian Carlstrom
wpa_supplicant_6 interoperability Bug: https://bugs.launchpad.net/ubuntu/+source/wpasupplicant/+bug/969343/comments/72 Bug: http://w1.fi/bugz/show_bug.cgi?id=447#c7 Bug: http://code.google.com/p/android/issues/detail?id=34212 Bug: 6883259 Change-Id: I867c5b1b7d98cf70876d76868d3cea0e71d91623
2012-05-16Reconcile with jb-release nakasi-factoryrom-releaseThe Android Open Source Project
Change-Id: I565a757a5f9b37f075d53a446c915506ceef0074
2012-05-04merge in jb-release history after reset to jb-devandroid-4.1.1_r6.1android-4.1.1_r6android-4.1.1_r5android-4.1.1_r4android-4.1.1_r3android-4.1.1_r2android-4.1.1_r1.1android-4.1.1_r1jb-releaseThe Android Automerger
2012-05-03wpa_supplicant: Set default wpa_supplicant to 0.6.Xandroid-cts-4.1_r1Dmitry Shmidt
Change-Id: I32a66d3996760909b31055753b332411f8b43667 Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
2012-04-02merge in jb-release history after reset to masterThe Android Automerger
2012-02-24merge in jb-release history after reset to masterThe Android Automerger
2012-02-22Merge "Move .config for Android to android.config"Dmitry Shmidt
2012-02-22Move .config for Android to android.configDmitry Shmidt
Change-Id: I3d256ed1ef83faaf44973a1c63a6b48f62d2d75e Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
2012-02-15Move keystore to system/securityKenny Root
Change-Id: Ifdbc06be5e70a7b9ba99a404ddded22520eb9807
2011-07-11Remove the simulator target from all makefiles.android-sdk-adt_r20android-sdk-adt_r16.0.1android-sdk-4.0.3_r1android-sdk-4.0.3-tools_r1android-cts-verifier-4.0_r1android-cts-verifier-4.0.3_r1android-cts-4.0_r1android-cts-4.0.3_r2android-cts-4.0.3_r1android-4.0.4_r2.1android-4.0.4_r2android-4.0.4_r1.2android-4.0.4_r1.1android-4.0.4_r1android-4.0.3_r1.1android-4.0.3_r1android-4.0.2_r1android-4.0.1_r1.2android-4.0.1_r1.1android-4.0.1_r1tools_r20ics-plus-aospics-mr1-releaseics-mr1ics-mr0-releaseics-mr0ics-factoryrom-2-releaseJeff Brown
Bug: 5010576 Change-Id: I108baa45dbda7a3d484eb69386b0167abed1243b
2011-03-22Add SCAN_INTERVAL command and remove system property accessDmitry Shmidt
Change-Id: Ia6fcdc44cf65b861d978f851bbe79b09b015d3c2 Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
2011-03-21Remove obsolete code: reassociate is called from the wifi managerDmitry Shmidt
Change-Id: Ia77193aaf5c738519a8ae6c9e34494d094c07a0b Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
2011-03-09wpa_cli: Fix alternative socket pathDmitry Shmidt
Change-Id: I1c3b53d84a9ccb5de280cfb6df4e3ccb9dc45cf4 Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
2011-03-07Remove forcing of RW to wpa_supplicant.confDmitry Shmidt
Change-Id: Ib34bfd132e3d26eb211231ee429ce546aee09e37 Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
2011-03-04Check select() return value in wpa_ctrl_request()Dmitry Shmidt
Change-Id: I7bd8bbae8a5d74ef576de3e3b3f08473fc9b6d0b Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
2011-03-04Remove WPA_IDLE stateDmitry Shmidt
Change-Id: Ia5f408616763e6c6f786f90f1a21e0a0f619100f Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
2011-03-01Merge "Set ap_scan to default in case of disassociation"Dmitry Shmidt
2011-03-01Set ap_scan to default in case of disassociationDmitry Shmidt
Change-Id: I01b9611600e8fcabb03d820979d7a5fe9e36464d Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
2011-02-23am c5f70d68: WEXT: Suppress scan errors during background scanDmitry Shmidt
* commit 'c5f70d689ab6e50a51caa2d13fa85812574fc32a': WEXT: Suppress scan errors during background scan
2011-02-23am f09d4bb3: (-s ours) WEXT: Add background scan command supportDmitry Shmidt
* commit 'f09d4bb307a8a925c098942868c035b67d248e31': WEXT: Add background scan command support
2011-02-22WEXT: Suppress scan errors during background scanDmitry Shmidt
Change-Id: Iabc142f7d36955b55ac39605fe524b5edcc8c43c Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
2011-02-22WEXT: Add background scan command supportDmitry Shmidt
Change-Id: Ie7d6b9570acbe798bba13b0d99e98e488c682340 Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
2011-02-22WEXT: Suppress scan errors during background scanDmitry Shmidt
Change-Id: Iab7138e1408afe409b27657d599a159d0fcb8ed8 Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
2011-02-18WEXT: Add background scan command supportDmitry Shmidt
Change-Id: Ib9b37d4a4f43148c245942b2f59a0eee5629ec4d Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
2011-01-19Fix for WPS certification test 5.1.5Irfan Sheriff
The test verifies that the device can be configured to use open network settings to join an AP’s WLAN using PIN method through WLAN external Registrar. Bug: 3368598 Change-Id: Id6b9a1cb97f0b35a584b304426af9836d74e0570
2011-01-18Add WPS bss match check in Non WPA selectionIrfan Sheriff
This change is necessary to pass WPS test case 5.1.7 Bug: 3362571 Change-Id: I97771010aff7fc76180646fb38b618715e324be3
2010-11-17Remove Android log messages in wpa_msg()Dmitry Shmidt
Change-Id: I9b8507bfd479b992691501ee46a85e9aac70d6c5 Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
2010-11-16Remove scan debug messagesDmitry Shmidt
Change-Id: Id36255be3e756b1ac0f724fd82707da1c177f69f Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
2010-11-08Fix combo-scan prev SSID pointer update in case of scan failureDmitry Shmidt
Change-Id: Ia3d302ade71d558f4749177a522e08b768f20735 Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
2010-09-28am b2522a10: Remove WPS availability messagingIrfan Sheriff
Merge commit 'b2522a100c9c6688508261b04e83fa1d0bdc88ab' * commit 'b2522a100c9c6688508261b04e83fa1d0bdc88ab': Remove WPS availability messaging
2010-09-28Remove WPS availability messagingandroid-sdk-tools_r12android-sdk-adt_r12android-sdk-2.3.4_r1android-cts-2.3_r5android-cts-2.3_r4android-cts-2.3_r3android-cts-2.3_r2android-cts-2.3_r12android-cts-2.3_r11android-cts-2.3_r10android-cts-2.3_r1android-2.3_r1android-2.3.7_r1android-2.3.6_r1android-2.3.6_r0.9android-2.3.5_r1android-2.3.4_r1android-2.3.4_r0.9android-2.3.3_r1aandroid-2.3.3_r1.1android-2.3.3_r1android-2.3.2_r1android-2.3.1_r1gingerbread-releasegingerbread-mr4-releasegingerbreadIrfan Sheriff
We check WPS availability from scan results. We can do without the frequenty log/message of WPS availability. Bug: 3042300 Change-Id: I0756ea544d60bd13c0d61c0e14a4aea5d4f71b49
2010-09-24Fix build.Ying Wang
Change-Id: Ib4e764c5d31d776421ab0056056e5c2747c4be0d
2010-09-24Use regular module to build wpa_supplicant.confYing Wang
Now PRODUCT_COPY_FILES is not allowed in module makefiles. Bug: 3003508 Change-Id: Id2d163926365c3bce541990dc4d77eebc4e20975
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-04 10:51:48 +0000