1281 Commits

Author SHA1 Message Date
Roshan Pius
56eac13284 WifiScanner: Add PNO public API
am: e4fd150962

* commit 'e4fd150962e07dbcb0646d556bf372be0cc15f1f':
  WifiScanner: Add PNO public API
2016-03-04 22:01:04 +00:00
Roshan Pius
e4fd150962 WifiScanner: Add PNO public API
Add the public interface for starting/stopping PNO scan.

This is the internal flow that is going to be used for PNO scan:
1. Set Pno list
2. Start background scan

This flow will not work as is for supplicant, since background scan is
done manually today. So, we'll need a flag to indicate that this
background scan is targetted for PNO.

BUG: 27167559
Change-Id: I3f6921c5d03f7d9e8ad1847e57e12fb38df6c9c9
TEST: Compiles & unit-test passes
2016-03-04 13:37:48 -08:00
mukesh agrawal
d4ef42f0e5 Merge "WifiConfiguration: show more detail in toString()" into mm-wireless-dev
am: 7516adbd6d

* commit '7516adbd6d8584aff957ff722dd20543c25c6897':
  WifiConfiguration: show more detail in toString()
2016-03-03 21:22:43 +00:00
Mukesh Agrawal
7516adbd6d Merge "WifiConfiguration: show more detail in toString()" into mm-wireless-dev 2016-03-03 21:15:18 +00:00
Jeremy Joslin
b94df9db50 Merge "Revert "New systemapi to mark a wifi network as metered."" into mm-wireless-dev
am: 3f7314e331

* commit '3f7314e3310fbaddc984ae3218f7bb22f13cda11':
  Revert "New systemapi to mark a wifi network as metered."
2016-03-03 16:54:28 +00:00
Jeremy Joslin
3f7314e331 Merge "Revert "New systemapi to mark a wifi network as metered."" into mm-wireless-dev 2016-03-03 16:49:28 +00:00
mukesh agrawal
e23993848c WifiConfiguration: show more detail in toString()
When debugging WiFi issues, it's helpful to know whether
or not a network uses a hidden SSID. Update
WifiConfiguration.toString(), to provide this information.

BUG=26836097
TEST=capture bugreport, verify "HIDDEN: false" is present for normal net
TEST=capture bugreport, verify "HIDDEN: true" is present for hidden net

Change-Id: I1f7c587fc2eda358e0868e9a7ef0bb2058e726a8
2016-03-03 03:06:05 +00:00
Jeremy Joslin
e9e6083ee1 Revert "New systemapi to mark a wifi network as metered."
This reverts commit 7a598d3d800fc47b7c2f9300411edc0ef06da493.

Change-Id: Ib6b9081ee4ded7582fb90d7a9066de95ab221f61
2016-03-02 22:16:27 +00:00
Lorenzo Colitti
b7ffb76437 Merge changes Ic366b532,I0179b45b into nyc-dev
* changes:
  Move PinningNetworkCallback out to a new NetworkPinner class.
  Use MessageUtils in ConnectivityManager.
2016-03-02 04:18:03 +00:00
Lorenzo Colitti
531a344300 Move PinningNetworkCallback out to a new NetworkPinner class.
Also add tests.

Bug: 19159232
Change-Id: Ic366b53259ee5944a8e864876425a6558c0a7216
2016-03-02 12:50:35 +09:00
Jeff Sharkey
c53962d4ed When system server goes down, crash apps more.
Apps making calls into the system server may end up persisting
internal state or making security decisions based on the perceived
success or failure of a call, or the default values returned.

The reality is that if the system process just died, init will be
along shortly to kill all running apps, so we should have no problem
rethrowing the RemoteException as a RuntimeException.

Bug: 27364859
Change-Id: Ife0bcb079636c88d54c44d17eb580409fd79028b
2016-03-01 19:29:16 -07:00
Randy Pan
037dd4aea0 Retire ScanResult.autoJoinStatus
am: 366da67282

* commit '366da672828864fa166f184757e44f89e5139a31':
  Retire ScanResult.autoJoinStatus
2016-02-25 19:12:41 +00:00
Randy Pan
366da67282 Retire ScanResult.autoJoinStatus
This attribute is no longer in use.

Bug: 27340037
Change-Id: I2e5dfdc266673388a55ef34a4d088352d2e1723c
2016-02-24 16:51:05 -08:00
Roshan Pius
e0e00dc79c Merge "Modify the wake reasons data structure(2/2)" into mm-wireless-dev
am: 2d3bea7f01

* commit '2d3bea7f014a7fa2eff91ce996663059218bf21d':
  Modify the wake reasons data structure(2/2)
2016-02-23 19:09:24 +00:00
Etan Cohen
ad3693d59b [NAN] API cleanup - rename FLAGS. [DO NOT MERGE]
Per API guidelines - non-overlapping constants can be (should be)
named with "FLAG".

Bug: 27122760
Change-Id: If8b2c0f9b2818215a64b5635e76731c8fdfd3b8d
2016-02-23 16:44:09 +00:00
Roshan Pius
2d3bea7f01 Merge "Modify the wake reasons data structure(2/2)" into mm-wireless-dev 2016-02-23 16:08:25 +00:00
Wei Wang
f89786f31c Merge "Disallow duplicate listeners for WifiScanner." into mm-wireless-dev
am: 3c0d65de0b

* commit '3c0d65de0bbd7889f340aca4a45e55972de5896f':
  Disallow duplicate listeners for WifiScanner.
2016-02-23 05:13:19 +00:00
Wei Wang
3c0d65de0b Merge "Disallow duplicate listeners for WifiScanner." into mm-wireless-dev 2016-02-23 05:09:38 +00:00
Glen Kuhne
5045253e3e Merge "Add EID_TIM to ScanResult.InformationElement" into mm-wireless-dev
am: 70fc162330

* commit '70fc1623301ab5268c54bb203329893893ed35cb':
  Add EID_TIM to ScanResult.InformationElement
2016-02-19 21:39:41 +00: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
Roshan Pius
13f378e738 Modify the wake reasons data structure(2/2)
Changes in the android framework to use the modifed HAL API to
fetch the host wakeup reasons from the driver.

BUG: 26902794

Change-Id: I4df53c00b6b4ffd9f9ddb45577f6bccf150c43e4
2016-02-19 08:15:45 -08:00
Paul Stewart
173aa05908 Properly map EAP-GTC for TTLS
am: 274042519d

* commit '274042519d84ad837f03572865bc096a537c73fb':
  Properly map EAP-GTC for TTLS
2016-02-19 15:29:04 +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
0a05e4aef9 Merge "Add Java API for secure RTT protocol." into mm-wireless-dev
am: 0db6066c7b

* commit '0db6066c7b0583610769fb0f9bc80ceafedefb75':
  Add Java API for secure RTT protocol.
2016-02-19 09:27:19 +00:00
Wei Wang
0db6066c7b Merge "Add Java API for secure RTT protocol." into mm-wireless-dev 2016-02-19 09:22:44 +00:00
Wei Wang
3cf4da9886 Disallow duplicate listeners for WifiScanner.
Bug:26663377

Change-Id: I2eea0fd3532c45f493aad7c0d5c28bda07f5bfed
2016-02-19 01:12:34 -08: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
Mitchell Wills
4dbf436cac Merge "Remove REPORT_EVENT_CONTEXT_HUB gscan option" into mm-wireless-dev
am: 07e27b7541

* commit '07e27b75412de52b3ba5606e35a721e2b31ff094':
  Remove REPORT_EVENT_CONTEXT_HUB gscan option
2016-02-17 20:43:47 +00:00
Mitchell Wills
07e27b7541 Merge "Remove REPORT_EVENT_CONTEXT_HUB gscan option" into mm-wireless-dev 2016-02-17 20:30:56 +00:00
Peter Qiu
b3f9ee0d5a Merge "WifiConfiguration: add constants for radio band" into mm-wireless-dev
am: 03d7581cf6

* commit '03d7581cf6dcc8072fe22c834513593a46fcf93b':
  WifiConfiguration: add constants for radio band
2016-02-16 18:14:42 +00:00
Peter Qiu
03d7581cf6 Merge "WifiConfiguration: add constants for radio band" into mm-wireless-dev 2016-02-16 18:04:14 +00:00
Bartosz Fabianowski
3e425f6c4b Merge "Remove wifiConfiguration.isVisibleToUser()" into mm-wireless-dev
am: e1bdbd216f

* commit 'e1bdbd216fef6d1f0bb6b3c61cc95abba3e67af7':
  Remove wifiConfiguration.isVisibleToUser()
2016-02-15 10:02:55 +00:00
Joe Onorato
9fcf3ca4de Turn down the logging a little bit.
Change-Id: Iec36925e3aff1490c8808bdc7a6bd39e7d549556
2016-02-12 14:55:05 -08:00
Peter Qiu
d667616659 WifiConfiguration: add constants for radio band
Change-Id: I2287ffb3d93351d73659327cef37a6d3ecd588b3
2016-02-12 08:50:05 -08:00
Paul Stewart
67a28e8c38 Merge "Revert "Properly map EAP-GTC for TTLS"" into mm-wireless-dev
am: 323561773f

* commit '323561773f43f561997155aed4654a6be3299511':
  Revert "Properly map EAP-GTC for TTLS"
2016-02-12 16:27:07 +00: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 be5084b87aa6a5e97becac6a43b448fee34196c2.

Reverting to re-land after test team does their thing

Change-Id: Ia236b77f08d15f47efb5469478000ded3b0d7954
2016-02-12 16:21:01 +00:00
Paul Stewart
825fb3492a Merge "Properly map EAP-GTC for TTLS" into mm-wireless-dev
am: 724ea69e4b

* commit '724ea69e4b4d79d59629e8152f2b0183e13aa45e':
  Properly map EAP-GTC for TTLS
2016-02-12 16:12:37 +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
Etan Cohen
fa8e9aabe2 NAN: Disable all DBG flags.
am: 7d6c389edf

* commit '7d6c389edf41ef8ce490fa7af963484f9502cbc1':
  NAN: Disable all DBG flags.
2016-02-12 00:35:10 +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
cea11df038 Merge "WifiManager: Return empty scan list on remote exception" into mm-wireless-dev
am: 4e9e3d02e0

* commit '4e9e3d02e057ddccb95d5299e60ac02da7766024':
  WifiManager: Return empty scan list on remote exception
2016-02-11 20:07:26 +00: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