1935 Commits

Author SHA1 Message Date
Etan Cohen
416d6fba17 [AWARE] Remove enableUsage/disableUsage API
The APIs (never public) were provided for indirect access to enable
or disable Aware usage. No longer necessary.

Bug: 35435032
Test: unit tests and integration (sl4a) tests
Change-Id: Ia5c2b8aed8dd908f49b5e4f42a77feed3cda946c
2017-02-16 14:13:42 -08:00
Ningyuan Wang
58e6fe321f Merge "Create createFromByteArray() for WifiSsid" am: fb19d8d7c1 am: 18b3a7f586 am: 9d1be09462
am: c2c718b717

Change-Id: I82b27a1b4f0891d1153efdfb0058fe10b533316c
2017-02-14 02:32:04 +00:00
Ningyuan Wang
c2c718b717 Merge "Create createFromByteArray() for WifiSsid" am: fb19d8d7c1 am: 18b3a7f586
am: 9d1be09462

Change-Id: If221ae36424377501677f70a3601509328268604
2017-02-14 02:28:30 +00:00
Ningyuan Wang
fb19d8d7c1 Merge "Create createFromByteArray() for WifiSsid" 2017-02-14 02:13:34 +00:00
Ningyuan Wang
a6ea570a4a Create createFromByteArray() for WifiSsid
Bug: 35318006
Test: compile, unit tests
Change-Id: I0138bd67c0dec37419897318401b18ee4445a111
2017-02-13 15:40:19 -08:00
Peter Qiu
bfceb41f5d Merge "hotspot2: fix typo in the getter functions" am: d3146f3c3c am: 5644c190a0
am: 1b510ecff7

Change-Id: I56f99259149adb6a5e2fda7e2bbf8093a528a675
2017-02-13 20:12:20 +00:00
Treehugger Robot
d3146f3c3c Merge "hotspot2: fix typo in the getter functions" 2017-02-13 19:49:51 +00:00
Paul Stewart
edb9b8df23 Merge "Allow EAP-SIM authentication methods under PEAP" am: e690e0178c am: 549c3fc0da
am: bdfb1b86d3

Change-Id: I083778d8867e79b1a2c04166811508a6642a9c68
2017-02-11 02:52:44 +00:00
Paul Stewart
e613fccb56 Allow EAP-SIM authentication methods under PEAP
Extend the PEAP outer method to contain EAP-SIM innner methods
so these transactions can be encrypted.

Cherry-pick of 68c63024c2ace87921c1e84a99d18dae6001c74c

Bug: 34835771
Test: Unit tests

Change-Id: I4931ed43e396c93bad0bfce1750291982f8cd146
2017-02-10 16:15:52 -08:00
Sundeep Ghuman
328daab62f Fix error logging level in WifiNetworkScoreCache.
Bug: 35143659
Test: NA
Change-Id: Ibae6ccdacd9eef3b8ccc940489eaaeed0eeb9b8b
2017-02-09 18:02:58 -08:00
Roshan Pius
ec38eb6988 WifiManager: API upates for O am: fb441f5009 am: aabb1c7ecf
am: 02bf13a6c9

Change-Id: I75883c53958f2495a3e906a8940ef2a7ced98ec5
2017-02-08 21:07:48 +00:00
Roshan Pius
6a4322b6d6 WifiConfiguration: Remove priority field am: 45491113ed am: 51641c20b2
am: 707ced526f

Change-Id: I294a36db16c8e079cae5b748421dccfbb50dadc4
2017-02-08 21:06:45 +00:00
Peter Qiu
701a4b55c9 hotspot2: fix typo in the getter functions
Bug: 34862444
Test: frameworks/base/wifi/tests/runtests.sh
Test: frameworks/opt/net/wifi/tests/wifitests/runtests.sh
Change-Id: If833fb06cead7df9d631b3b12d66d05b8422d46c
Merged-In: If833fb06cead7df9d631b3b12d66d05b8422d46c
2017-02-08 20:59:02 +00:00
Peter Qiu
8dee619860 hotspot2: fix typo in the getter functions
Bug: 34862444
Test: frameworks/base/wifi/tests/runtests.sh
Test: frameworks/opt/net/wifi/tests/wifitests/runtests.sh
Change-Id: If833fb06cead7df9d631b3b12d66d05b8422d46c
2017-02-08 11:01:43 -08:00
Roshan Pius
fb441f5009 WifiManager: API upates for O
Deprecate the following API's:
1. pingSupplicant() - We don't want apps trying to figure out if
wpa_supplicant is running or not. It should not be something that
apps need to know.
2. saveConfiguration() - No longer needed, we automatically persist data
when needed.

Other changes:
1. Reworded the docstrings to remove direct reference to wpa_supplicant
for network configuration related API's.
2. We no longer allow apps to modfiy network configuration of other
apps. Added a docstring explaining that in the 3 modify API's.
3. Changed the wording of enableNetwork's |disableOthers| flag.

Bug: 31146757
Test: make update-api
Change-Id: If970d85146de3532072191cb2b7ecb0d5adb2774
2017-02-08 08:51:26 -08:00
Roshan Pius
45491113ed WifiConfiguration: Remove priority field
This field is no longer used anywhere within wifi framework and hence
removing this from public API.

Bug: 28341078
Test: make update-api
Change-Id: I5bd115742ca610735b00c20f2ffab7590c5f3256
2017-02-08 08:50:29 -08:00
Roshan Pius
4f2eba2a10 Merge changes If970d851,I5bd11574
* changes:
  WifiManager: API upates for O
  WifiConfiguration: Remove priority field
2017-02-08 16:40:39 +00:00
TreeHugger Robot
c71d1c2880 Merge "Allow EAP-SIM authentication methods under PEAP" 2017-02-08 15:35:28 +00:00
Peter Qiu
7d172feb01 hotspot2: expose Passpoint APIs as public am: bffe405e1f am: b898025e8c
am: 1a8cb5dfec

Change-Id: I75201e7f464e7228458b62d9f79565097b602752
2017-02-07 23:49:35 +00:00
Peter Qiu
97f04b5efa hotspot2: fix class/function/variable names to comply with API guideline am: da8a67e8a6 am: 7fec249699
am: 57375308dc

Change-Id: I897cd2c051d7c4b3b5165114d975f5e7398f4556
2017-02-07 23:48:42 +00:00
Peter Qiu
6c3bed61c9 hotspot2: rename classes to comply with API guideline am: a77809766c am: c4f4a1ac9e
am: 9bddb8ccd8

Change-Id: I78d0edc46b89683832f26061f97f3ebebe245f93
2017-02-07 23:47:32 +00:00
Peter Qiu
bffe405e1f hotspot2: expose Passpoint APIs as public
Bug: 34862444
Test: frameworks/base/wifi/tests/runtests.sh
Test: frameworks/opt/net/wifi/tests/wifitests/runtests.sh

Change-Id: I8bf5c715b9088c673e59a73a78e18f6e6b64d1d1
2017-02-07 13:34:47 -08:00
Peter Qiu
da8a67e8a6 hotspot2: fix class/function/variable names to comply with API guideline
Bug: 34862444
Test: frameworks/base/wifi/tests/runtests.sh
Test: frameworsk/opt/net/wifi/tests/wifitests/runtests.sh
Change-Id: Ide425c06be46bc41c8f601e732dca0543de096b1
2017-02-07 13:34:46 -08:00
Peter Qiu
a77809766c hotspot2: rename classes to comply with API guideline
This is purely a file rename operation.

Bug: 34862444
Test: None
Change-Id: I297a228f3ee7e09c9cce5ca9f677eb1db478fd46
2017-02-07 13:34:46 -08:00
Roshan Pius
9ef9bfdaff WifiManager: API upates for O
Deprecate the following API's:
1. pingSupplicant() - We don't want apps trying to figure out if
wpa_supplicant is running or not. It should not be something that
apps need to know.
2. saveConfiguration() - No longer needed, we automatically persist data
when needed.

Other changes:
1. Reworded the docstrings to remove direct reference to wpa_supplicant
for network configuration related API's.
2. We no longer allow apps to modfiy network configuration of other
apps. Added a docstring explaining that in the 3 modify API's.
3. Changed the wording of enableNetwork's |disableOthers| flag.

Bug: 31146757
Test: make update-api
Change-Id: If970d85146de3532072191cb2b7ecb0d5adb2774
2017-02-03 14:40:28 -08:00
Roshan Pius
c082d63a3b WifiConfiguration: Remove priority field
This field is no longer used anywhere within wifi framework and hence
removing this from public API.

Bug: 28341078
Test: make update-api
Change-Id: I5bd115742ca610735b00c20f2ffab7590c5f3256
2017-02-03 14:37:29 -08:00
Paul Stewart
68c63024c2 Allow EAP-SIM authentication methods under PEAP
Extend the PEAP outer method to contain EAP-SIM innner methods
so these transactions can be encrypted.

Bug: 34835771
Test: Unit tests

Change-Id: I4931ed43e396c93bad0bfce1750291982f8cd146
2017-02-03 10:53:07 -08:00
Peter Qiu
637c407d78 Merge "wifi: WifiConfiguration: add isHomeProviderNetwork field" am: e724f82b3d am: 281fae21f8
am: eeeb10c645

Change-Id: Ib218b76e03bb6a6082113d27ec514b03f2348b6e
2017-02-02 19:46:51 +00:00
Peter Qiu
d46383ee0b hotspot2: expose Passpoint APIs as public
Bug: 34862444
Test: frameworks/base/wifi/tests/runtests.sh
Test: frameworks/opt/net/wifi/tests/wifitests/runtests.sh

Change-Id: I8bf5c715b9088c673e59a73a78e18f6e6b64d1d1
2017-02-02 11:45:13 -08:00
Peter Qiu
bb700dc826 hotspot2: fix class/function/variable names to comply with API guideline
Bug: 34862444
Test: frameworks/base/wifi/tests/runtests.sh
Test: frameworsk/opt/net/wifi/tests/wifitests/runtests.sh
Change-Id: Ide425c06be46bc41c8f601e732dca0543de096b1
2017-02-02 11:45:13 -08:00
Peter Qiu
91930d786b hotspot2: rename classes to comply with API guideline
This is purely a file rename operation.

Bug: 34862444
Test: None
Change-Id: I297a228f3ee7e09c9cce5ca9f677eb1db478fd46
2017-02-02 11:45:00 -08:00
Treehugger Robot
e724f82b3d Merge "wifi: WifiConfiguration: add isHomeProviderNetwork field" 2017-02-02 19:29:53 +00:00
Peter Qiu
bc7858b56b Merge "hotspot2: implement hashCode() for classes with equals() function" am: 2ac992fcad am: 9e7725040b am: ec61beaa7a
am: 3e6c9c9462

Change-Id: I1f345852ec2ea536e02caabd81818fa16d4c0dc7
2017-02-01 03:46:58 +00:00
Jeremy Joslin
16bbb0cd64 Merge "Print the package name and creator UID in dump()." am: cf7f9dd6a1 am: ba4bc08dae am: 9c245a51f7
am: 499f1f39ff

Change-Id: I873b8c6239bb7766ac1a4b4078afb3700000186b
2017-02-01 03:39:57 +00:00
Peter Qiu
0636791424 Merge "hotspot2: update PasspointConfiguration APIs" am: 59da9b24ca am: 4ed5fe8191 am: 28630218cc
am: ebafa7c813

Change-Id: I0bc0326e3ff67fff697f1aea004806978c4244b3
2017-02-01 03:38:07 +00:00
Peter Qiu
3e6c9c9462 Merge "hotspot2: implement hashCode() for classes with equals() function" am: 2ac992fcad am: 9e7725040b
am: ec61beaa7a

Change-Id: I26269af9bf18789ce40858df0645e17867f44469
2017-02-01 03:37:58 +00:00
Jeremy Joslin
499f1f39ff Merge "Print the package name and creator UID in dump()." am: cf7f9dd6a1 am: ba4bc08dae
am: 9c245a51f7

Change-Id: I33a60ce4525561705572ebaa0fe1851d46c24b63
2017-02-01 03:32:27 +00:00
Peter Qiu
ebafa7c813 Merge "hotspot2: update PasspointConfiguration APIs" am: 59da9b24ca am: 4ed5fe8191
am: 28630218cc

Change-Id: I264d4664bc9e69d9c70dce7ffcf75e3ae2e2e430
2017-02-01 03:30:58 +00:00
Treehugger Robot
2ac992fcad Merge "hotspot2: implement hashCode() for classes with equals() function" 2017-02-01 03:12:13 +00:00
Treehugger Robot
cf7f9dd6a1 Merge "Print the package name and creator UID in dump()." 2017-02-01 02:41:00 +00:00
Jeremy Joslin
711efaccd2 Print the package name and creator UID in dump().
Add a little more info to help differentiate the registered score
caches during a dump.

Test: adb shell dumpsys network_score
Change-Id: I59cb877b3237aaa85cb564795fb8a41c3d95e315
2017-01-31 14:48:01 -08:00
Peter Qiu
ddafc73496 hotspot2: implement hashCode() for classes with equals() function
According to API guideline, classes that override equals()
function should override hashCode() as well.  Make it so.

Bug: 34198926
Test: frameworks/base/wifi/tests/runtests.sh
Change-Id: I4c3afed78a2fc06cdc26dd04d076f579b3472139
2017-01-31 13:26:36 -08:00
Peter Qiu
aef5b6095f hotspot2: update PasspointConfiguration APIs
Based on the API guideline, use of public variables are discouraged.
So update PasspointConfiguration and its associated classes to use
private variables with public accessor methods.

While there, cleanup unit tests to reduce code duplications.

Bug: 34627062
Test: frameworks/base/wifi/tests/runtests.sh
Change-Id: I6ea45bbcf03aec01c187425a66094fad6098d75d
2017-01-31 13:26:36 -08:00
Peter Qiu
04959d48e1 wifi: WifiConfiguration: add isHomeProviderNetwork field
This is a boolean field indicating if the given WiFi network is provided
by a Passpont home provider. This is useful for the Passpoint provisioning
app to determine if the current WiFi connection is allowed to perform
Passpoint subscription or policy updates when it needs to.

This field will be set by PasspointNetworkEvaluator when generating
a WifiConfiguration for a Passpoint network.

Bug: 34467212
Test: make update-api; make -j32
Change-Id: Ia8ec2508de9658a9ee520087359ff2cd68091b63
Merged-In: I47310cda078cbf1f2d1b0a9bf79f487230fb668f
2017-01-31 11:43:14 -08:00
Peter Qiu
1f46283dc5 Merge "hotspot2: enclose conditional statement in parenthesis" am: 161ac8b006 am: ea14632665 am: 77095c33d3
am: e7e2dc148c

Change-Id: Ib6a5a5bac5886099581e7027af74e90fa98eb35f
2017-01-31 18:35:24 +00:00
Peter Qiu
e7e2dc148c Merge "hotspot2: enclose conditional statement in parenthesis" am: 161ac8b006 am: ea14632665
am: 77095c33d3

Change-Id: Ib0ee84bf185ac7b492029eae791436ae30c246e2
2017-01-31 18:29:49 +00:00
TreeHugger Robot
6b1c99fefe Merge "wifi: WifiConfiguration: add isHomeProviderNetwork field" 2017-01-31 18:28:34 +00:00
Treehugger Robot
161ac8b006 Merge "hotspot2: enclose conditional statement in parenthesis" 2017-01-31 18:12:57 +00:00
Peter Qiu
55078c4fa8 hotspot2: enclose conditional statement in parenthesis
Couple unit tests are failing due to conditional statements
not enclosed in the parenthesis, which causes unexpected
returned value for the equals function.  So fix it.

Bug: 34764955
Test: frameworks/base/wifi/tests/runtests.sh
Test: frameworks/opt/net/wifi/tests/wifitests/runtests.sh
Change-Id: Iaf0151803cb62eb8af308e5de40558617f84cd2f
2017-01-30 17:47:53 -08:00
Etan Cohen
9b07338cb2 Merge "[AWARE] Minor hardening of manager." am: d0f1c9d1d3 am: 155d9ba6fc am: 3e8f90a62b
am: 4717b99a9d

Change-Id: Ia87571d271f0dd271b40445b14bba9d05f5b34f1
2017-01-31 01:45:23 +00:00