| a464a9fce8d160d2bbac3aeea3b23ecc7bb179a0 |
|
17-Jun-2016 |
Mitchell Wills <mwills@google.com> |
Don't save the anonymous identity for EAP-SIM/AKA/AKA-Prime
wpa_supplicant can update this value when authenticating so if the
framework writes it back the new value can be overwritten.
TEST: Patch was validated by original reporter
Enterprise tests pass (b/29608435)
Change-Id: If359b4ca625371fbdb68177c7cdb6498c3a519a1
Fixes: 28161335
/frameworks/base/wifi/java/android/net/wifi/WifiEnterpriseConfig.java
|
| 82f3053476c4b206847a7ab951d750fe1fd83b2f |
|
14-Apr-2016 |
Jan Nordqvist <jannq@google.com> |
Merge "Fixed incomplete OSEN config code." into nyc-dev
|
| f5c0a55d1eca29be3f63fbf07f7bd35ff5a68a62 |
|
07-Apr-2016 |
Rubin Xu <rubinxu@google.com> |
Fix wrong condition
am: 492ed58
* commit '492ed589df3609a15dd6a33709fc8d855ec1072d':
Fix wrong condition
Change-Id: I23f23c4b77d19286915e501bea482e4d1fe7e714
|
| 492ed589df3609a15dd6a33709fc8d855ec1072d |
|
07-Apr-2016 |
Rubin Xu <rubinxu@google.com> |
Fix wrong condition
Bug: 28050399
Change-Id: If729ee2bcc5496b5ee381e490f72c751da04dc09
/frameworks/base/wifi/java/android/net/wifi/WifiEnterpriseConfig.java
|
| 61b5a7689320274ce5fff9a9eae1866d8d696b9b |
|
31-Mar-2016 |
Jan Nordqvist <jannq@google.com> |
Fixed incomplete OSEN config code.
Bug=27929688
Change-Id: I8f4a0415576e6dc35d735fa46dc50591478403af
/frameworks/base/wifi/java/android/net/wifi/WifiEnterpriseConfig.java
|
| c12bb1dd8ca3e7a41b381d9a087e91d990b8545f |
|
21-Mar-2016 |
Paul Stewart <pstew@google.com> |
Fix string equality comparison
Don't use "==" to compare strings.
Bug: 25624963
Change-Id: Id25696e4fdcbcf4d48ec74e8ed65c1a33716b30c
/frameworks/base/wifi/java/android/net/wifi/WifiEnterpriseConfig.java
|
| 173aa05908588de731d23f0ee0c3a66611af7e88 |
|
19-Feb-2016 |
Paul Stewart <pstew@google.com> |
Properly map EAP-GTC for TTLS
am: 274042519d
* commit '274042519d84ad837f03572865bc096a537c73fb':
Properly map EAP-GTC for TTLS
|
| 274042519d84ad837f03572865bc096a537c73fb |
|
16-Jan-2016 |
Paul Stewart <pstew@google.com> |
Properly map EAP-GTC for TTLS
The "auth=GTC" method was never valid for the TTLS outer
authentication for wpa_supplicant. Instead, to perform
GTC authentication within TTLS, we should use EAP-GTC.
This CL performs this mapping within WifiEnterpriseConfig.
It accomplishes this by making the EAP Method and Phase 2
Method parameters a part of the internal object state
instead of maintaining this value within the mFields
hashmap.
Further, the problematic "getFields" method is removed
since as this actually provided read/write access to the
entirety of the WifiEnterpriseConfig's internal state.
This was understandably suboptimal. All callers have
been updated to either use getFieldValue() or to call
a newly added getSupplicantFields() / setSupplicantFields()
methods which make the WifiEnterpriseConfig object a sole
arbiter for the mapping between its internal state and
wpa_supplicant.
In the future it might be good to change this logic to
strip WifiEnterpriseConfig of all of the string hashmap
entirely, leaving WifiEnterpriseConfig as a "struct"
and move supplicant mappings to WifiConfigStore.
Bug:26400915
Change-Id: I866e2f77ad53d9a51c5f61acb9adef522661f721
Test:runtest frameworks-wifi # New unit test in the same topic
Test:cts-tradefed run cts -d --class android.net.wifi.cts.WifiEnterpriseConfigTest
/frameworks/base/wifi/java/android/net/wifi/WifiEnterpriseConfig.java
|
| 67a28e8c3809f7d68999f586edd7d7ff4bd27c9b |
|
12-Feb-2016 |
Paul Stewart <pstew@google.com> |
Merge "Revert "Properly map EAP-GTC for TTLS"" into mm-wireless-dev
am: 323561773f
* commit '323561773f43f561997155aed4654a6be3299511':
Revert "Properly map EAP-GTC for TTLS"
|
| d3be75fd4babcad6e83b005d0cca9c13ec3c9f44 |
|
12-Feb-2016 |
Paul Stewart <pstew@google.com> |
Revert "Properly map EAP-GTC for TTLS"
This reverts commit be5084b87aa6a5e97becac6a43b448fee34196c2.
Reverting to re-land after test team does their thing
Change-Id: Ia236b77f08d15f47efb5469478000ded3b0d7954
/frameworks/base/wifi/java/android/net/wifi/WifiEnterpriseConfig.java
|
| 825fb3492a02b4a4101bf9039d2f020ad131193f |
|
12-Feb-2016 |
Paul Stewart <pstew@google.com> |
Merge "Properly map EAP-GTC for TTLS" into mm-wireless-dev
am: 724ea69e4b
* commit '724ea69e4b4d79d59629e8152f2b0183e13aa45e':
Properly map EAP-GTC for TTLS
|
| be5084b87aa6a5e97becac6a43b448fee34196c2 |
|
16-Jan-2016 |
Paul Stewart <pstew@google.com> |
Properly map EAP-GTC for TTLS
The "auth=GTC" method was never valid for the TTLS outer
authentication for wpa_supplicant. Instead, to perform
GTC authentication within TTLS, we should use EAP-GTC.
This CL performs this mapping within WifiEnterpriseConfig.
It accomplishes this by making the EAP Method and Phase 2
Method parameters a part of the internal object state
instead of maintaining this value within the mFields
hashmap.
Further, the problematic "getFields" method is removed
since as this actually provided read/write access to the
entirety of the WifiEnterpriseConfig's internal state.
This was understandably suboptimal. All callers have
been updated to either use getFieldValue() or to call
a newly added getSupplicantFields() / setSupplicantFields()
methods which make the WifiEnterpriseConfig object a sole
arbiter for the mapping between its internal state and
wpa_supplicant.
In the future it might be good to change this logic to
strip WifiEnterpriseConfig of all of the string hashmap
entirely, leaving WifiEnterpriseConfig as a "struct"
and move supplicant mappings to WifiConfigStore.
Bug:26400915
Test:runtest frameworks-wifi # New unit test in the same topic
Test:cts-tradefed run cts -d --class android.net.wifi.cts.WifiEnterpriseConfigTest
Change-Id: I1e09fb3f1f27b2ba844acbed14ec0f570e915b80
/frameworks/base/wifi/java/android/net/wifi/WifiEnterpriseConfig.java
|
| eddbff07c42684596e9d2121958fee86cfb70142 |
|
09-Feb-2016 |
Samuel Tan <samueltan@google.com> |
Merge "WifiEnterpriseConfig: allow getting and setting of ca_path" into mm-wireless-dev
am: 8629390701
* commit '8629390701efe0ed74730a06ab2fc868a7ca265d':
WifiEnterpriseConfig: allow getting and setting of ca_path
|
| 8629390701efe0ed74730a06ab2fc868a7ca265d |
|
09-Feb-2016 |
Samuel Tan <samueltan@google.com> |
Merge "WifiEnterpriseConfig: allow getting and setting of ca_path" into mm-wireless-dev
|
| 962c6a81e3f9b3ea6b4b178ca41a87230864525e |
|
03-Feb-2016 |
Jan Nordqvist <jannq@google.com> |
Merge "New System APIs for Passpoint r2 app." into mm-wireless-dev
am: fd600b1113
* commit 'fd600b1113af6f66e28b65f5b53f4a7c751cdef9':
New System APIs for Passpoint r2 app.
|
| a772f0cf34f0db67997cb31fa44315c0933563da |
|
28-Jan-2016 |
Vinit Deshpande <vinitd@google.com> |
New System APIs for Passpoint r2 app.
Change-Id: I09428e9a393999f43aefe5efd77cffe4b1b17da5
/frameworks/base/wifi/java/android/net/wifi/WifiEnterpriseConfig.java
|
| c136cf95393fb8f646b95cccd038ca9cb3450214 |
|
30-Jan-2016 |
Samuel Tan <samueltan@google.com> |
WifiEnterpriseConfig: allow getting and setting of ca_path
Add getters and setters for WPA supplicant's ca_path directive.
BUG: 26879191
Change-Id: Iad2857ddf7f09dd918637f99f740932e1fb7187c
TEST: WifiEnterpriseConfigTest CTS test
/frameworks/base/wifi/java/android/net/wifi/WifiEnterpriseConfig.java
|
| 7705a0d6ad04fb3c6f32c7700d09f13fdf7c9cee |
|
27-Jan-2016 |
Rubin Xu <rubinxu@google.com> |
resolve merge conflicts of b84954cf92 to master.
Change-Id: I8a5a1a989968c46ea4807db9e7e06b298244876d
|
| a0e3d62162e71fcf701edac84fddbf219bbaa45d |
|
14-Jan-2016 |
Rubin Xu <rubinxu@google.com> |
API to set multiple CA certificates for WifiEnterpriseConfig
Support multiple CA certificates as trust anchors for server certs
when connecting to EAP networks. For the full feature, also requries
wpa_supplicant support, Wifi stack change to set up certificates and
aliases, and Wifi Setting UI tweak.
Bug: 22547958
Change-Id: I3c9f0e184632b79044a9e623ce0e7d9aaddd2ae3
/frameworks/base/wifi/java/android/net/wifi/WifiEnterpriseConfig.java
|
| ae64b185fca97c23f72d0e71f63d9511f6dd06ce |
|
11-Nov-2015 |
Paul Stewart <pstew@google.com> |
WifiEnterpriseConfiguration: Do not print credentials in toString
BUG:25624963
Change-Id: I939a12a27d6b915d8a9cc8b142f645fba0ee42ec
/frameworks/base/wifi/java/android/net/wifi/WifiEnterpriseConfig.java
|
| 2452e54de65312163b1073fc699a432e2dd2a704 |
|
21-Oct-2015 |
xinhe <xinhe@google.com> |
[DO NOT MERGE] EAP-TLS PMKID mismatch error
b/24253154
Change-Id: I45c770dc4769e74b668385dbc3a618d31a40dc7e
/frameworks/base/wifi/java/android/net/wifi/WifiEnterpriseConfig.java
|
| a0d929e505432a8c84f3899696c910db16bd73bf |
|
13-Jun-2015 |
Vinit Deshpande <vinitd@google.com> |
Address API review comments
Added a flags field in ScanResult; along with flag
values and methods to read them.
Changed types of passpoint related fields.
Bug: 21342042
Bug: 21572290
Bug: 21343777
Change-Id: I413960de88b387853d11b9e10f92665e9c06a81b
/frameworks/base/wifi/java/android/net/wifi/WifiEnterpriseConfig.java
|
| 37f0820d6c23aa92a2b591327a734916131cb69a |
|
17-Apr-2015 |
Jan Nordqvist <jannq@google.com> |
Changed [gs]etDomSubjectMatch to [gs]etDomainSubjectMatch.
Change-Id: I42a69320a95a96522500375e3e101c159ee5bf1b
/frameworks/base/wifi/java/android/net/wifi/WifiEnterpriseConfig.java
|
| c91bc62f2bdca18c0ed96a740cbaa0383ea2860a |
|
17-Apr-2015 |
Jan Nordqvist <jannq@google.com> |
Added setDomSuffixMatch for AAA cert suffix matching.
Change-Id: I112399d2ce3d940ccf4451477b3b4edb93010b42
/frameworks/base/wifi/java/android/net/wifi/WifiEnterpriseConfig.java
|
| 6f6c781cca66cabc1f06be368a6dfedceb88ed0e |
|
27-Mar-2015 |
Vinit Deshpande <vinitd@google.com> |
Remove scanResultCache from WifiConfiguration
This is in preparation to use ScanDetail - which is a superset
of ScanResult - in wifi stack. There are no external users of
scanResultCache; so it can be safely removed.
Also fixed a javadoc comment for getPlmn()
Change-Id: I7c49532664ffe2e3e5e134bfcd42615d5999d02f
/frameworks/base/wifi/java/android/net/wifi/WifiEnterpriseConfig.java
|
| adf9e95ecc5d0867adf1dc2d7adcac958457b98e |
|
11-Dec-2014 |
Jean-Michel Bachot <jean-michel.bachot@intel.com> |
EAP-AKA' : Add support of EAP-AKA' in WiFi Enterprise methods
EAP-AKA' is a new hidden method
Change-Id: Ic103b25ad58807eebd5e0f8eefe3bfc02397aedc
Signed-off-by: Jean-Michel Bachot <jean-michel.bachot@intel.com>
Signed-off-by: Abdelmajid MLAYEH <abdelmajidx.mlayeh@intel.com>
/frameworks/base/wifi/java/android/net/wifi/WifiEnterpriseConfig.java
|
| b21d2489c1bd330e39f4489c7f221ebb4dffc283 |
|
02-Feb-2015 |
Vinit Deshpande <vinitd@google.com> |
Passpoint API - Take 1
Added some common fields to WifiConfigurations; which
should be used with WifiEnterpriseConfig. The network
information is saved in a file.
Change-Id: Ica2069900dfc373e14792cbe81a185586e2954cc
/frameworks/base/wifi/java/android/net/wifi/WifiEnterpriseConfig.java
|
| 26a98001ad3ec626f18fd57165ccc404f80d4e51 |
|
13-Sep-2014 |
Vinit Deshpande <vinitd@google.com> |
Allow creating EAP_TLS network without specifying Phase2.None
Phase2 isn't required for EAP_TLS networks, and it is possible
for a developer to miss it. We are requiring it for internal
book keeping - so this change just sets Phase2 to 'None' when
EAP_TLS is set on the configuration.
Bug: 17043082
Change-Id: I5a8e0a3a236d0dfd1295584de55d5b9a1b76b483
/frameworks/base/wifi/java/android/net/wifi/WifiEnterpriseConfig.java
|
| c8505931420dd9a76acf940a56b31354cd0105b0 |
|
22-Jul-2014 |
Vinit Deshpande <vinitd@google.com> |
Support EAP-SIM and EAP-AKA
This change un-hides constants for these two methods and
also un-hides RADIUS/AAA FQDN field to allow creating
Passpoint release 1 credentials.
Change-Id: Ia3501017dc1f5c0b4932bb45e1e9c5bf7262d7fe
/frameworks/base/wifi/java/android/net/wifi/WifiEnterpriseConfig.java
|
| 7c28c3663470ce5eb818cfa2ce4a993e4bae8f33 |
|
22-May-2014 |
Yuhao Zheng <yuhaozheng@google.com> |
Update Hotspot 2.0 SDK APIs
- Add / fix java docs
- Add some setters in WifiPasspointCredential for update use
Change-Id: Ifc287ab9d69ea9e02bf036f22171947fde9ee94a
/frameworks/base/wifi/java/android/net/wifi/WifiEnterpriseConfig.java
|
| 7fee7232ee2ae45fb3cd4fcce314e8f1101ae8db |
|
15-May-2014 |
Roger Chang <roger.chang@mediatek.com> |
Hotspot 2.0 framework - add implementation
Bug: 5485670
Change-Id: I4d0f728f4c20676232f2d61bbf49691f6e21a100
/frameworks/base/wifi/java/android/net/wifi/WifiEnterpriseConfig.java
|
| ffadfb9ffdced62db215319d3edc7717802088fb |
|
07-Dec-2013 |
Vinit Deshapnde <vinitd@google.com> |
Move Wifi/P2p service components under services
Some methods need to be public, since frameworks/base complies before
frameworks/base/services; and services takes build dependency on base.
Similar issue exists with WifiEnterpriseConfig constants.
Bug: 9907308
Change-Id: Ied0e3dee0b25c939067dbc66867a9814b3b3b68e
/frameworks/base/wifi/java/android/net/wifi/WifiEnterpriseConfig.java
|
| ade8de3c4a021d6b0e753d77be148236af5f39ef |
|
07-Nov-2013 |
Vinit Deshapnde <vinitd@google.com> |
Refactor WifiEnterpriseConfig and move service part in WifiConfigStore
This change moves the code related to 'importing' the configuration
in supplicant and keystore from WifiEnterpriseConfig class to
WifiConfigStore class. This would allow moving system classes
to server package.
Bug: 9989922
Change-Id: Id96f34bb5d16ef192e9174d9caa867bdfdacf803
/frameworks/base/wifi/java/android/net/wifi/WifiEnterpriseConfig.java
|
| a3038b2b311cd07d851c404ccc5df2f4e07bcfd8 |
|
03-Oct-2013 |
Vinit Deshapnde <vinitd@google.com> |
Fix EAP-TLS reconnect after reboot issue
After a reboot, KeyStore is locked, and certificates encrypted with user
PIN are not accessible. So statemachines are not able to connect to
EAP-TLS networks. This change makes the problem less severe by
1. Not signing certificates with user PIN on devices with hardware backed
KeyStore.
2. Issuing a reconnect upon first USER_PRESENT event.
This means HH (which has a hardware backed keystore) can connect to
EAP-TLS networks without requiring user intervention and other devices
will automatically connect to those networks after user punches PIN.
Bug: 10325089
Change-Id: I023d60e58d8214152f051bd9ec84b85b702d829a
/frameworks/base/wifi/java/android/net/wifi/WifiEnterpriseConfig.java
|
| dda5a7152fd6e5933503aba8e8badbbba0631839 |
|
15-Aug-2013 |
Vinit Deshapnde <vinitd@google.com> |
Fix an exception caused by incorrect data handling
The prefixes in WifiEnterpriseConfig are optional, and should be treated
as such. If the prefix doesn't exist, it is possible for an
exception to be thrown (if the value size is smaller than prefix size).
Bug: 10304089
Change-Id: Id9b2bc0e371c818e35a5aa1913ee1697f167e19e
/frameworks/base/wifi/java/android/net/wifi/WifiEnterpriseConfig.java
|
| 8d06e430307d07e3d51f381b4c7c89f7d9155133 |
|
07-May-2013 |
Partha N <parthan@gmail.com> |
Enable Opportunistic Key Caching on WPA2-Enterprise Networks
Add a "proactive_key_caching=1" line to every network segment config that represents a
WPA2-Enterprise network. This enables Opportunistic Key Caching for all eligible
WLANs.
Change-Id: Ia529dcd1dee7a21a68c80de05a9f590ddd944d4c
Signed-off-by: Partha N <parthan@gmail.com>
/frameworks/base/wifi/java/android/net/wifi/WifiEnterpriseConfig.java
|
| 4a1d95139a57b8726fb168b08a5c54b9a134c8df |
|
19-Apr-2013 |
Irfan Sheriff <isheriff@google.com> |
Merge "Fix NPE issues seen by CTS" into jb-mr2-dev
|
| 63e550f2026e749e7be5ab03655f0a5105457b9e |
|
19-Apr-2013 |
Irfan Sheriff <isheriff@google.com> |
Merge "Add getters and private constructor" into jb-mr2-dev
|
| 0b4732c2248fa2b92a44f045dfcadb3547076ef4 |
|
19-Apr-2013 |
Irfan Sheriff <isheriff@google.com> |
Fix NPE issues seen by CTS
Bug: 8646305
Change-Id: Ief90c76d63f60aee9a3da080cd43dd9610f3f4fc
/frameworks/base/wifi/java/android/net/wifi/WifiEnterpriseConfig.java
|
| 40843589c46164c90fde29ad1c58291f17d4d9e6 |
|
19-Apr-2013 |
Irfan Sheriff <isheriff@google.com> |
Add getters and private constructor
Address API feedback
Bug: 8656930
Change-Id: Idc3dd8d8a7e633449329864e41cab58a6b193b5a
/frameworks/base/wifi/java/android/net/wifi/WifiEnterpriseConfig.java
|
| b2c0ff64d8ff92dab53e969a44fa12427d145952 |
|
13-Apr-2013 |
Kenny Root <kroot@google.com> |
Remove old KeyStore call sites
Remove the call sites that don't have the flags specified. This is to
ensure that callers know what flags they're setting.
Bug: 8122243
Change-Id: Ifbd178fddbf8dbd8f7b821ea739a20d056ef9fa7
/frameworks/base/wifi/java/android/net/wifi/WifiEnterpriseConfig.java
|
| 8b643c13f97c0f304a45039b9d1fe6900940499e |
|
22-Mar-2013 |
Irfan Sheriff <isheriff@google.com> |
Scope certs for wifi UID and handle migration
Bug: 8183303
Change-Id: I842c9b0c0d4f2fa42a3fc5b1ac22c28e202ef188
/frameworks/base/wifi/java/android/net/wifi/WifiEnterpriseConfig.java
|
| fdc028383a01eaaa9bf93cb5d3ce50bd744eab52 |
|
08-Feb-2013 |
Irfan Sheriff <isheriff@google.com> |
Expose EAP config API
This API allows apps to setup access to enterprise Wi-Fi networks.
Change-Id: I37573d76b8bd9cad72413afdc4fc62ce57b4dc43
/frameworks/base/wifi/java/android/net/wifi/WifiEnterpriseConfig.java
|
| 26d0076f0dbb021c4e5cc1b37b632b2223fd9278 |
|
05-Feb-2013 |
Irfan Sheriff <isheriff@google.com> |
Track keys per config and allow cert push from apps
Allow configuring keys for a configuration and update/delete
from wificonfigstore.
Change-Id: I79b43bf7ca58f7efc95f7dcc125fc84d7aa8c795
/frameworks/base/wifi/java/android/net/wifi/WifiEnterpriseConfig.java
|
| e095675c872f40f630aa3f9189eb5c02f3cfee6d |
|
17-Jan-2013 |
Irfan Sheriff <isheriff@google.com> |
eix enterprise config storage bugs
Reading empty and not updating was resulting in retaining old values
in a config. Also, fix matching phase2 entries.
Additionally, allow configuring subset of enterprise fields. Necessary
since password cannot be read back from supplicant.
Change-Id: I83a01690a0cf7cad1457a674f50f1e3a1a0441b5
/frameworks/base/wifi/java/android/net/wifi/WifiEnterpriseConfig.java
|
| 86ee9640ee6d6bd9bb655af830eea5515400f25b |
|
15-Jan-2013 |
Irfan Sheriff <isheriff@google.com> |
Fix build
Change-Id: Ib9fd57c641e3bd2001c7c802f35d97e0cb849b8a
/frameworks/base/wifi/java/android/net/wifi/WifiEnterpriseConfig.java
|
| 9b81319002634cf7118055f7aafaa26c27d4e5e8 |
|
11-Jan-2013 |
Irfan Sheriff <isheriff@google.com> |
Refactor enterprise config
Change-Id: I7104250e80317fce6164385701a7caffbcd14813
/frameworks/base/wifi/java/android/net/wifi/WifiEnterpriseConfig.java
|