Commit Graph

217572 Commits

Author SHA1 Message Date
Erik Kline
c3b52bc466 Delete all NetworkUtils DHCP-related code.
Bug: 26991160
Change-Id: I2c74e0161f43f65c1b6a85dc9f294b64c8f1ae6e
2016-02-22 15:14:31 +09:00
Erik Kline
b242549166 Give bluetooth sufficient capabilities to run DhcpClient
Specifically:
    CAP_NET_RAW
    CAP_NET_BIND_SERVICE

Bug: 26991160
Change-Id: I2afddc9efa3b613d974afb0ea33703948203d99a
2016-02-22 15:14:31 +09:00
Erik Kline
111d55658b Add WaitForProvisioningCallback
This centralizes code that is shared by both bluetooth and ethernet
transport layers.

Bug: 26991160
Change-Id: I8e2dd8580c29c86394119768e3a5529850b4b859
2016-02-22 13:02:02 +09:00
Erik Kline
d0e843b8ef Support setting TCP buffer sizes and HTTP Proxy config
This allows IpManager to send callback recipients a more satisfying
LinkProperties.

Bug: 26991160
Change-Id: I2eb60dc633e5be38dad9410a1096d0095ddf57a0
2016-02-22 12:50:44 +09:00
Glen Kuhne
70fc162330 Merge "Add EID_TIM to ScanResult.InformationElement" into mm-wireless-dev 2016-02-19 21:35:10 +00:00
Glen Kuhne
b6cd6fa5a7 Add EID_TIM to ScanResult.InformationElement
Added EID_TIM to enable parsing of TrafficIndicationMap
InformationElements.

BUG=25691077
Change-Id: I99450f0b720175660486da15d6b13affbdb61adc
2016-02-19 10:54:51 -08:00
Mitchell Wills
3ca1ccb419 Merge "Fix FastXmlSerializerTest" into mm-wireless-dev 2016-02-19 18:13:58 +00:00
Mitchell Wills
acd97e2e0f Merge "Remove AsyncChannelTest because it does not test anything" into mm-wireless-dev 2016-02-19 18:11:20 +00:00
Mitchell Wills
9272fd8f4c Merge "DO NOT MERGE Disable failing test case" into mm-wireless-dev 2016-02-19 18:10:54 +00:00
Paul Stewart
274042519d 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
2016-02-19 07:10:31 -08:00
Wei Wang
0db6066c7b Merge "Add Java API for secure RTT protocol." into mm-wireless-dev 2016-02-19 09:22:44 +00:00
Mitchell Wills
86821c07c2 DO NOT MERGE Disable failing test case
Bug: 27258801

Change-Id: I832505e0feca9f0abbf627d009d5982a4437bf83
2016-02-19 07:59:20 +00:00
Mitchell Wills
733fc6b6f9 Fix FastXmlSerializerTest
Change-Id: Ie984abae588927e65bdeffa5a6f5c58bd6ba0bf1
2016-02-18 23:43:30 -08:00
Mitchell Wills
c91e57c1aa Remove AsyncChannelTest because it does not test anything
Change-Id: I7d3fe580a8c32ef3bd10895b51a7fc436f79919f
2016-02-18 23:37:14 -08:00
Lorenzo Colitti
5947d11119 Merge "Move tests for com.android.internal.util out of coretests" into mm-wireless-dev 2016-02-19 06:04:25 +00:00
Lorenzo Colitti
35402eb8ae Move tests for com.android.internal.util out of coretests
These are very simple tests with no dependencies, and moving them
out of FrameworksCoreTests makes it possible to iterate much more
quickly.  "runtest frameworks-core" takes almost a minute just to
push to the device, before any tests even start running.

Bug: 25691379
Change-Id: I8d99316a5940e0171883b97c578f9a6882b699a0
2016-02-19 14:35:48 +09:00
Mitchell Wills
019fb9f4e4 Merge "DO NOT MERGE Add a new WakeupMessage class" into mm-wireless-dev 2016-02-19 05:33:36 +00:00
Lorenzo Colitti
e9ae977322 DO NOT MERGE Add a new WakeupMessage class
This is useful when using the new AlarmManager direct callback
interface to wake up the system and request that an object whose
API consists of messages (such as a StateMachine) perform some
action.

In this situation, using AlarmManager.onAlarmListener by itself
will wake up the system to send the message, but does not
guarantee that the system will be awake until the target object
has processed it. This is because as soon as the onAlarmListener
sends the message and returns, the system is free to go to sleep
again.

Bug: 20157436
Bug: 25823676
Cherry-picked WakeupMessage.java from 9d3aadb247
Change-Id: Idff20029d287f26347441a2523b7fb20eda6a8b0
2016-02-18 18:02:14 -08:00
Lorenzo Colitti
d2457a3ee3 Add a MessageUtils class to convert int constants to strings.
This class uses reflection to find accessible static integer
members in a specified list of classes and returns a SparseArray
mapping the integers to their names. This will allow us to
replace various 400-line switch statements with a simple
array access.

Change-Id: I3607e6389a423cde0bd83270c00b3c863ae1bb29
2016-02-19 10:26:55 +09:00
Etan Cohen
0d0f0c7faf [NAN] Renamed listeners to callback per API guidelines [DO NOT MERGE]
The interfaces had multiple functions and are hence callback
and not a listener.

Note: purely a rename operation.

Bug: 27122760
Change-Id: Ib12711f56a64052455843859125d72268c465fc0
2016-02-18 23:48:59 +00:00
Etan Cohen
e4c50de752 [NAN]: API update - consolidate Puslish|Subscribe Data+Subscribe -> Config [DO NOT MERGE]
Simplify configuration and consolidate structures whose difference
wasn't very clear.

Bug: 27122760
Change-Id: I0651cade71eb146d9ea9219baf6d2253588db3de
2016-02-18 23:46:01 +00:00
Wei Wang
71210b1022 Add Java API for secure RTT protocol.
Change-Id: I1c012f9e92e8b2af332524363f8f0c9921bf4bb5
2016-02-18 13:07:43 -08:00
Etan Cohen
aa36f07194 NAN: Support multiple instantiation per UID - introduce a client ID. [DO NOT MERGE]
Add the concept of a client ID which is used to identify a specific
(one of several) clients in all API calls.

Bug: 26962024
Change-Id: I43f13d51bee8b57c6d0ba1174168288b8d6c21c5
2016-02-18 20:57:44 +00:00
Erik Kline
ca4c61aa9f Add Protocol.BASE_ETHERNET
Change-Id: I4e51370c0b53d9902eea8aae409f9f7cffaf28ad
2016-02-18 18:15:52 +09:00
Erik Kline
efa4209fe0 {,Base}DhcpStateMachine is no more
Bug: 26991160
Change-Id: I21f8c30627bf2a7fbcd5b4d5f1f1ad1a2dda759b
2016-02-18 12:56:45 +09:00
Mitchell Wills
07e27b7541 Merge "Remove REPORT_EVENT_CONTEXT_HUB gscan option" into mm-wireless-dev 2016-02-17 20:30:56 +00:00
Erik Kline
29a215268d Remove references to BaseDhcpStateMachine and DhcpStateMachine
Bug: 26991160
Change-Id: I3742780a4e5121c163d9d1380951e25edaba19f3
2016-02-17 21:44:25 +09:00
Erik Kline
b1ee39540e Add IpManager#shutdown() to terminate the state machine.
Additionally, remove IpManager.Callback#usingIpReachabilityMonitor()
now that this is now longer used.

Bug: 26991160
Change-Id: I9a17497c82238a9fb37a20d01aeca7bc4913ae2c
2016-02-17 20:54:10 +09:00
Nathan Harold
e629c06730 Merge "Create BandMode Constants" into mm-wireless-dev 2016-02-17 00:44:13 +00:00
Peter Qiu
03d7581cf6 Merge "WifiConfiguration: add constants for radio band" into mm-wireless-dev 2016-02-16 18:04:14 +00:00
Erik Kline
93b1a36e31 Add IpManager.ProvisioningRequest class
This class captures provisioning request parameters to be passed to
IpManager#startProvisioning().

Bug: 26991160
Change-Id: I56652bbc4b9ae6cfca3f225a8d99cdfc01bb54d9
2016-02-16 18:11:47 +09:00
Bartosz Fabianowski
e1bdbd216f Merge "Remove wifiConfiguration.isVisibleToUser()" into mm-wireless-dev 2016-02-15 09:56:53 +00:00
Nathan Harold
aa0f5873a7 Create BandMode Constants
Bug: 27145805
Change-Id: I733026268600f504325bc92061ee830d1448bbf5
2016-02-12 13:38:53 -08:00
Peter Qiu
d667616659 WifiConfiguration: add constants for radio band
Change-Id: I2287ffb3d93351d73659327cef37a6d3ecd588b3
2016-02-12 08:50:05 -08:00
Paul Stewart
323561773f Merge "Revert "Properly map EAP-GTC for TTLS"" into mm-wireless-dev 2016-02-12 16:23:43 +00:00
Paul Stewart
d3be75fd4b Revert "Properly map EAP-GTC for TTLS"
This reverts commit be5084b87a.

Reverting to re-land after test team does their thing

Change-Id: Ia236b77f08d15f47efb5469478000ded3b0d7954
2016-02-12 16:21:01 +00:00
Paul Stewart
724ea69e4b Merge "Properly map EAP-GTC for TTLS" into mm-wireless-dev 2016-02-12 16:07:19 +00:00
Bartosz Fabianowski
00144e8de3 Remove wifiConfiguration.isVisibleToUser()
This method seemed like a good idea at the time (quickly check whether a
network configuration is visible to a given user). However, once managed
profiles come into play, this simple method is no longer appropriate.
There is a more comprehensive replacement at
com.android.server.wifi.WifiConfigurationUtil.isVisibleToAnyProfile()
now and this method here can go.

BUG:26867426

Change-Id: Ia66aa6f74003a16eca24c5088d3aba8e0c9f8140
2016-02-12 11:12:45 +01:00
Erik Kline
3b74289fdf Duplicate DhcpStateMachine public constants into DhcpClient
This is so we can ultimately delete DhcpStateMachine altogether.

Bug: 24837343
Bug: 26991160
Change-Id: If116639e5f72c97cfc67f748dc5f6433dccd9cf0
2016-02-12 17:10:15 +09:00
Tyler Gunn
989594638a Merge "IMS RAT Reporting in Registration Unsol" into mm-wireless-dev 2016-02-12 03:40:08 +00:00
Omkar Kolangade
d4e44bbdbf IMS RAT Reporting in Registration Unsol
Adding a parameter to the IMS registration complete
and progressing callbacks, allowing frameworks to be
notified of the radio access technology over which
IMS is registered.

Bug: 21902225
Change-Id: I271f2fca299585302a67d0f5476f6fac3e7099dd
2016-02-11 23:51:41 +00:00
Etan Cohen
7d6c389edf NAN: Disable all DBG flags.
Change-Id: Ib60cf3c9fd4c8dbf973e118d94340fbfd890a738
2016-02-11 15:00:57 -08:00
Paul Stewart
be5084b87a 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
2016-02-11 14:52:58 -08:00
Paul Stewart
4e9e3d02e0 Merge "WifiManager: Return empty scan list on remote exception" into mm-wireless-dev 2016-02-11 20:01:18 +00:00
Paul Stewart
ed9297991a WifiManager: Return empty scan list on remote exception
In the (hopefully rare) situation where there is a remote exception
from a call to getScanResults(), do not pass null back to callers.
Nobody expects this, and failures that occur as a result can distract
from the real problem (e.g., the system server crashing).  This CL
now returns an empty list.

BUG=27139097
TEST=None

Change-Id: I637eae1fa8ac1a1bc2b76dea8628359b5dec06e1
2016-02-11 11:16:17 -08:00
Jeremy Joslin
3d4acbf5fb Merge "New systemapi to mark a wifi network as metered." into mm-wireless-dev 2016-02-11 15:03:52 +00:00
Erik Kline
ef1f39abff Use IpManager.ifname as the tag in log messages.
Bug: 26991160
Change-Id: Idc9231819298b65da3cc3baa88f1f0cd18ab6df7
2016-02-11 21:07:07 +09:00
Jeremy Joslin
7a598d3d80 New systemapi to mark a wifi network as metered.
The implementation will come after the wifi code base has stablized.

BUG:27120794
Change-Id: I6a8140dae45dcd7ec70ac0c51b9513b907a41b63
2016-02-10 17:20:22 -08:00
Sanket Padawe
de0cc7f4d3 Merge "Add OEM specific error code space which can by used to replace Generic errors." into mm-wireless-dev 2016-02-11 00:04:01 +00:00
Mitchell Wills
5a982939d2 Remove REPORT_EVENT_CONTEXT_HUB gscan option
Since all scan results will now be reported to the context hub this flag
is no longer needed.

Change-Id: I21c157a31fe26169606f6f53e8e0ce44d57c5ca5
2016-02-10 14:37:27 -08:00