1555 Commits

Author SHA1 Message Date
Paul Stewart
ec1e5e80fc Merge "WifiManager: Defer Async Channel init" into nyc-dev 2016-03-22 19:35:07 +00:00
Jeremy Joslin
f0c9b8c68f Add meteredHint to WifiConfiguration.
Adding a new field, meteredHint, to WifiConfiguration so that it
can be passed through and eventually used to set the meteredHint
field on WifiInfo.

BUG: 27120794
Change-Id: If08966c6a5e8eab0905f3335b1c6822975b2f0b5
2016-03-22 07:56:45 -07:00
Paul Stewart
c12bb1dd8c Fix string equality comparison
Don't use "==" to compare strings.

Bug: 25624963
Change-Id: Id25696e4fdcbcf4d48ec74e8ed65c1a33716b30c
2016-03-21 11:47:42 -07:00
Paul Stewart
bf8cbb05e0 WifiManager: Use ConnectivityThread
Instead of minting it's own hander thread, have WifiManager use
the looper from ConnectivityThread.

Bug: 27432949

Change-Id: Iddeebeb8ab506c912f526c7569f304e10b9d7ab8
2016-03-19 10:05:06 -07:00
Paul Stewart
75f129e17b WifiManager: Defer Async Channel init
Now that WifiManager instances are separate and do not depend
on a single static AsyncChannel for the entire process, all
contexts within a process will create an async channel on init.
Since creating this channel requires special permissions that
some applications do not have, it is problematic for them all
to request it in the process of getting a WifiManager instance.

This CL defers AsyncChannel initialization until it is actually
going to be used.  This allows callers to create WifiManager
instances without necessarily creating an AsyncChannel.
Depending on what parts of the API will be used, some callers
will never need one.  Also, this means that these apps will
not run afoul of permissions exceptions that do not apply to
them unless they actually request functionality that requires
the AsyncChannel.

While here, this CL no longer catches SecurityException while
requesting a messenger from WifiService. That hack appeared to
be an artifact of the static instance of sAsyncChannel -- it
was not clear to WifiManager which context had permissions to
successfully create the messenger, so it was necessary to
silently fail the attempt especially since that attempt was
made in the constructor.  With the restructuring to keep
mAsyncChannel per-instance and now only created at the time
specific API calls require it, a SecurityException is
completely relevant to the caller and should not be discarded.

Bug: 27694933
Test: Boot full image, repro b/27694933 with com.google.android.music

Change-Id: I680bf2443bc5b057e629544a687f985261201ded
2016-03-19 10:05:06 -07:00
Roshan Pius
42e606250a Add new wifi tx power levels in Wifi activity energy
BUG: 27227497
Change-Id: I66db7f61a5e3a8223a008f7182bb56921145c831
2016-03-16 14:26:15 -07:00
Roshan Pius
3ec7cfeedf Add new wifi tx power levels in link layer stats
BUG: 27227497
Change-Id: I48dd88d2ab5ade8e5ad9bafa153925f4d55aba26
2016-03-16 14:07:23 -07:00
Etan Cohen
2a73c7fb2a [NAN] Refactor session lifecycle to clarify API & eliminate race conditions [DO NOT MERGE]
Bug: 27257965
Change-Id: I4d7eaa6fa1f089bed2e9185f59a37f59b530975d
2016-03-15 16:03:03 -07:00
Wei Wang
e1e3d99c46 Merge "Fix device reboot when ranging empty params." into nyc-dev 2016-03-15 21:32:03 +00:00
Etan Cohen
a5ed693788 [NAN] Removed NAN event registration - dispatch all callbacks. [DO NOT MERGE]
All events dispatched by default - there's no reason to ignore events.
The specific identity changed events for which there are use-cases to
get or ignore is controlled through a new configuration.

Bug: 27607613
Change-Id: I289a36157b55270c58311a016ef79f8746e0e0a0
2016-03-14 18:21:34 -07:00
Etan Cohen
8414f5cf2b [NAN] Consolidate publish/subscribe callback sets into single set [DO NOT MERGE]
Merge onPublishFail & onSubscribeFail into onSessionConfigFail.
Merge onPublishTerminated & onSubscribeTerminated into onSessionTerminated.
A session is either publish or subscribe (never the two) so redundant.

Bug: 27610709
Change-Id: I0282d17db88754428da25ee5f064b9a4805f9736
2016-03-14 18:21:34 -07:00
Etan Cohen
e393f57d0d [NAN] Replace session callback configuration control [DO NOT MERGE]
Controlling session callback invocation:
- Remove event registration
- Add configurations to the subset (actually just termination) which
  can be configured through the HAL

Bug: 27607613
Change-Id: I608314cc2a9b077b4d5a2d2d0d315d55c6a7724b
2016-03-14 18:21:34 -07:00
Etan Cohen
8ef7453416 [NAN] Expose match style configuration as public API. [DO NOT MERGE]
Match style allows apps to configure getting a single notification
or continuous notifications (for all matches).

Bug: 27568256
Change-Id: I9b7bd2e4e58af5c73188267d11c1288a93cf64ed
2016-03-14 18:21:34 -07:00
Wei Wang
fabae2fff0 Fix device reboot when ranging empty params.
Empty Rtt params was converted to null in
read/write paracel.

Bug:27227320

Change-Id: I7c9c897b0f7ed0ced499e9763dd56b48d209d195
2016-03-14 12:22:38 -07:00
Paul Stewart
0f3b7ac4b5 Merge "WifiManager: Remove static objects" into mm-wireless-dev
am: d292ed866c

* commit 'd292ed866c27bc7a23cfa292603d722a6b7f9d81':
  WifiManager: Remove static objects
2016-03-14 14:21:29 +00:00
Paul Stewart
d292ed866c Merge "WifiManager: Remove static objects" into mm-wireless-dev 2016-03-14 14:13:34 +00:00
Paul Stewart
a016ebbee7 WifiManager: Remove static objects
Thanks to b/24334032, we know that there can be more than one
WifiManager object per process.  Also, due to b/19159232 we know
that holding static references to contexts within WifiManager is
not okay.  This CL addresses both issues by correctly implementing
Wifimanager as the per-context CachedService as it is instantiated
in SystemServiceRegistry.

To do this, all previously static object members of WifiManager
are converted to non-static.  This is primarily safe since:

  - In processes which only instantiated WifiManager from a single
    context, the behavior is functionally identical between the
    static and non-static implementation.

  - In situations where multiple WifiManager objects were created,
    this is not a real issue:

    + sListenerKey is okay to be tracked per-instance since it
      only tracks replies for asynchronous outgoing calls for a
      single WifiManager instance (replies are not multicast to
      all instances within a pid, since replies from
      WifiServiceImpl are addressed to the other end of the
      AsyncConnection the request message came from).
    + The same is true of sListenerMap and sListenerMapLock
    + Having a per-WifiManager-instance mAsyncChannel is at worst
      a small linear increase with the number of contexts that
      use WifiManager, but for the vast majority of processes will
      not be an increase at all.
    + Having a thread per WifiManager is something that has been
      brought up in the past (b/25644527 comes to mind).  I think
      we should continue to track that particular problem there.

One static was added: an sServiceHandlerDispatchLock which ensures
that listeners from multiple ServiceHandler threads will be called
sequentially instead of interleaved.  Since ServiceHandler was
previously static, this preserves the behavior where multiple
WifiManager objects would not deliver callbacks in parallel.

BUG=19159232
BUG=24334032

Change-Id: I24125a285f97e0c5b3ca4fd721ba8ed19aa245e9
2016-03-08 09:57:06 -08:00
Glen Kuhne
ae0da24c8d Merge "Added EIDs for ERP, Supported & Extended Rates" into mm-wireless-dev
am: 45eb1bdf87

* commit '45eb1bdf8788bc2aa537ec86bc93b3bf437d9c6e':
  Added EIDs for ERP, Supported & Extended Rates
2016-03-08 16:53:34 +00:00
Glen Kuhne
45eb1bdf87 Merge "Added EIDs for ERP, Supported & Extended Rates" into mm-wireless-dev 2016-03-08 16:48:35 +00:00
Roshan Pius
4e7ad35b2f Merge "WifiScanner: Add hidden networkIds in scan setting" into mm-wireless-dev
am: d412376ca0

* commit 'd412376ca00545857df7a21829e3f674253c0567':
  WifiScanner: Add hidden networkIds in scan setting
2016-03-07 22:47:59 +00:00
Roshan Pius
d412376ca0 Merge "WifiScanner: Add hidden networkIds in scan setting" into mm-wireless-dev 2016-03-07 22:44:08 +00:00
Lorenzo Colitti
2a3ca73158 DO NOT MERGE: Move PinningNetworkCallback out to a new NetworkPinner class.
Cherry-picked from 531a34430072b9296aaeb47d9e7d04326a93fee4

Bug: 19159232
Change-Id: Ic366b53259ee5944a8e864876425a6558c0a7216
2016-03-07 10:34:32 -08:00
Glen Kuhne
bff37ecdaa Added EIDs for ERP, Supported & Extended Rates
Added EIs to InformationElement to support the parsing of Supported
Rates, Extended Supported Rates, and ERP.

BUG=25691077
Change-Id: Ie540e94f9aa0dca11c3b1d6a46c5a638ec958cff
2016-03-07 08:54:07 -08:00
Roshan Pius
49b6f19ded WifiScanner: Add hidden networkIds in scan setting
Add the hidden networkId list in scan settings to be used for
connectivity scans.

BUG: 27503786
Change-Id: Ibe7eaccd84d03a7b48728e3ea1d98ccc974377ec
TEST: Compiles & unit-test passes
2016-03-06 20:22:11 -08:00
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