Commit Graph

2046 Commits

Author SHA1 Message Date
Peter Qiu
1e38ea4fe2 Merge "hotspot2: add/update javadoc for Passpoint APIs" into oc-dev am: 8837aff18b
am: c3e58eb3f2

Change-Id: Icf572f5b5b224a78762fd728ab90778d84c9ecbc
2017-05-31 22:42:10 +00:00
Peter Qiu
c3e58eb3f2 Merge "hotspot2: add/update javadoc for Passpoint APIs" into oc-dev
am: 8837aff18b

Change-Id: I1659c6bd9ac5f5420eae1ffded9c0d257e8436c6
2017-05-31 22:35:11 +00:00
Peter Qiu
e5850517c4 hotspot2: add/update javadoc for Passpoint APIs
Add javadoc for getter/setter methods configuration classes.
Document exceptions with @throws tag.

Bug: 37907515
Test: build
Change-Id: Ied1842912f6710530bf77db4df5ef5d30a44b2a7
2017-05-31 13:16:50 -07:00
Rebecca Silberstein
3cf4ad52b3 Merge "WifiManager: setWifiApEnabled always returns false" into oc-dev am: c0643da09e
am: 84296900b0

Change-Id: I500e8256583aa05b0fd2096988e34de6d1ed0f3c
2017-05-31 16:14:49 +00:00
Rebecca Silberstein
84296900b0 Merge "WifiManager: setWifiApEnabled always returns false" into oc-dev
am: c0643da09e

Change-Id: Ibaec59c3416f502c6ff9b131d12f38c6205f2287
2017-05-31 15:59:37 +00:00
Rebecca Silberstein
c0643da09e Merge "WifiManager: setWifiApEnabled always returns false" into oc-dev 2017-05-31 15:42:33 +00:00
Peter Qiu
66197daa9d Merge changes from topic 'hide_passpoint_r2' into oc-dev am: 4bd47fce86
am: 421018f44b

Change-Id: I6d56c9c822e707ed41fc3a4b3c0ca58188bc1000
2017-05-30 19:08:03 +00:00
Peter Qiu
421018f44b Merge changes from topic 'hide_passpoint_r2' into oc-dev
am: 4bd47fce86

Change-Id: I71fe905c7842384d7700f02f923b12cdae9bf594
2017-05-30 18:55:37 +00:00
TreeHugger Robot
4bd47fce86 Merge changes from topic 'hide_passpoint_r2' into oc-dev
* changes:
  hotspot2: hide Release 2 APIs
  Voice Messaging Intent API.
2017-05-30 18:47:12 +00:00
Peter Qiu
ff323d3ce9 hotspot2: hide Release 2 APIs
These APIs are based on the design of the legacy OSU app.  Since
the app will be redesigned, hide these APIs for now.

Bug: 38260972
Test: build
Change-Id: I56b9c27305624306773284a7cc1721606037462d
2017-05-30 09:47:43 -07:00
Erik Kline
ea60f1d6d6 Merge "WifiManager: add iface name and mode labels" into oc-dev am: dfd185c62f
am: 3e737d1cf0

Change-Id: Ieff7af7c1ac2113b8044c16a01cad0f96cb70158
2017-05-26 10:01:30 +00:00
Erik Kline
3e737d1cf0 Merge "WifiManager: add iface name and mode labels" into oc-dev
am: dfd185c62f

Change-Id: I67f82525b5c0fa5b81235311988c9b186d16077a
2017-05-26 09:55:29 +00:00
TreeHugger Robot
2ed64ce4d5 Merge "wifi: override equals method for WifiSsid" 2017-05-25 18:11:54 +00:00
Rebecca Silberstein
4ac2cab8fd WifiManager: add iface name and mode labels
Connectivity service needs to get the interface name and intended ip
configuration mode for softap.
This CL adds the interface name and softap target mode variables to
use to insert the extra info into the wifi ap state change broadcast.

Note: additional CLs are needed to verify the iface name and mode.  The
mode tracking is still in progress.

Bug: 62076211
Test: frameworks/base/wifi/tests/runtests.sh
Test: frameworks/opt/net/wifi/tests/wifitests/runtests.sh
Test: manually verified the name in the broadcast
Change-Id: I64e1d13a9e422945fe9c4c268c206da365d0a3eb
2017-05-25 03:34:17 -07:00
Rebecca Silberstein
8cc4eb79d2 WifiManager: setWifiApEnabled always returns false
The method setWifiApEnabled should not be used.  Introduction of the
start/stopTethering API left this call in an intermediate state, thus
introducing race conditions.  Callers with proper permissions should be
calling ConnectivityManager.startTethering or
WifiManager.startLocalOnlyHotspot.

Note: integration tests are being updated to reflect this change.

Bug: 38436732
Test: frameworks/base/wifi/tests/runtests.sh
Change-Id: I84b9514bf6bb67d733fd1a32492e0e0d485e2cd6
2017-05-25 01:16:56 -07:00
Peter Qiu
01a6ca780b wifi: override equals method for WifiSsid
Bug: 62053649
Test: frameworks/base/wifi/tests/runtests.sh
Change-Id: I02309880398750a1f5039b8b07a65972fe25104a
2017-05-24 13:21:19 -07:00
Etan Cohen
f7908cb6ec [AWARE] Clarify semantics of service discovery parameters
On service discovery which happens on the subscriber we receive
some information about the peer (the publisher): it's id, some
arbitrary blob it's providing (ssi), and a "match filter". The
match filter is the matching criteria (aside from service name)
used to find a service. The semantics are clarified by this CL:

- Unsolicited publish/passive subscriber: the publisher is active
  and broadcasting. We're getting the match filter which it
  advertises. No change.

- Solicited publish/active subscriber: the publisher is silent
  and will only respond if it matches what the subscriber provides.
  In such a case we will never know it's exact criteria and
  therefore cannot provide it to the app. We're simply providing
  the local match criteria. This is a clarification/possible
  change from initial understanding.

Bug: 36371061
Test: DiscoveryTest:test_positive_solicited_active_typical
Change-Id: I7d989cf0dc2383d15e4df18c9c0ea079f0486d80
2017-05-23 17:08:46 -07:00
Rebecca Silberstein
fa5713a2c2 Merge "WifiManager: get startLOHS packageName" into oc-dev am: 07f580eaff
am: 5dceb97fd3

Change-Id: I47cac61d2d4f4b8d4c659bfc4bb764710f67b018
2017-05-22 17:17:00 +00:00
Rebecca Silberstein
5dceb97fd3 Merge "WifiManager: get startLOHS packageName" into oc-dev
am: 07f580eaff

Change-Id: I06d47557fd35f519fbfe5d1ee11ec02c5027e4c7
2017-05-22 17:04:26 +00:00
Rebecca Silberstein
07f580eaff Merge "WifiManager: get startLOHS packageName" into oc-dev 2017-05-22 16:57:58 +00:00
Etan Cohen
c3ededf66e Merge "[AWARE] Enhance debug logs" 2017-05-22 13:25:01 +00:00
Glen Kuhne
0cb14dffa4 Merge "P2P: update WifiP2pServiceResponse creator" into oc-dev am: 387b97e68b
am: ad13c7abc9

Change-Id: I9909ddd5cf6c793e004b679ddb7c3d5fc36301a5
2017-05-19 22:50:59 +00:00
Glen Kuhne
ad13c7abc9 Merge "P2P: update WifiP2pServiceResponse creator" into oc-dev
am: 387b97e68b

Change-Id: I78fb0ac1f49d4a122cfe790fad2d0d7cb5de1589
2017-05-19 22:41:37 +00:00
Glen Kuhne
387b97e68b Merge "P2P: update WifiP2pServiceResponse creator" into oc-dev 2017-05-19 22:36:00 +00:00
Etan Cohen
116d2cabb1 [AWARE] Enhance debug logs
Add information to the debug message.

Bug: 31940045
Test: unit tests, integration (sl4a) tests
Change-Id: I076825164491a2025a8d04ebb5898a0e742af312
2017-05-19 14:03:57 -07:00
Rebecca Silberstein
967dfb4451 WifiManager: get startLOHS packageName
When an application calls startLocalOnlyHotspot, we need to send the
package name from the manager-side of the call.  This CL updates the
call to WifiServiceImpl.startLocalOnlyHotspot and the relevant aidl
file.

Bug: 31466854
Test: frameworks/base/wifi/tests/runtests.sh
Change-Id: I1dd0142dc58c767336c9323986d20e38bf11220d
2017-05-19 09:32:53 -07:00
Glen Kuhne
6f80049a41 P2P: update WifiP2pServiceResponse creator
WifiP2pServiceResponse.newInstance now receives the srcAddr and tlvs
binary data directory directly from the hal iface callback.
This fixes a bug introduced in O that broke serviceDiscoveryRequests.

Bug: 38174469
Test: CtsVerifier Service Discovery Requester
Test: frameworks/opt/net/wifi unit test
Change-Id: I66739713292a19ec399358a1033fccb35e76b9cf
2017-05-18 10:52:33 -07:00
Rebecca Silberstein
be1afcf188 Merge "WifiManager: add unspecified ip mode" into oc-dev am: f17d3b89d3
am: b4f1f290c9

Change-Id: Iaa1474bd24d63e957ae82745b66c7571a5f18433
2017-05-18 02:00:06 +00:00
Rebecca Silberstein
b4f1f290c9 Merge "WifiManager: add unspecified ip mode" into oc-dev
am: f17d3b89d3

Change-Id: I0d1db7ecb9cf7edd74d95f73d88b23571b87a27f
2017-05-18 01:50:40 +00:00
TreeHugger Robot
f17d3b89d3 Merge "WifiManager: add unspecified ip mode" into oc-dev 2017-05-18 01:44:35 +00:00
Roshan Pius
f03b9a7bce Merge "WifiP2pWfdInfo: Only pass the wfd info to WifiNative" into oc-dev am: 26ff5a67ee
am: f26430a0d8

Change-Id: I31f6e7d74604debe70b1f83ce4436c9e284c4307
2017-05-17 18:43:48 +00:00
Roshan Pius
f26430a0d8 Merge "WifiP2pWfdInfo: Only pass the wfd info to WifiNative" into oc-dev
am: 26ff5a67ee

Change-Id: I73ea001fb5deab02beb2d7c1ffc1d4330e8929a8
2017-05-17 18:28:51 +00:00
Rebecca Silberstein
bf47543618 WifiManager: add unspecified ip mode
Add an unspecified IP mode that allows WifiServiceImpl to clear state
in the interface-based IP mode tracking.

Bug: 31466854
Test: frameworks/base/wifi/tests/runtests.sh
Change-Id: I15485cdab95ed4308cf5c2877fba40eac82bf162
2017-05-17 00:25:24 -07:00
Roshan Pius
65c494a548 WifiP2pWfdInfo: Only pass the wfd info to WifiNative
WifiP2pWfdInfo.getDeviceInfoHex() is used to set the WFD info in
wpa_supplicant. The length of this WFD info will be calculated and
prepended by the HIDL interface itself, so there is no need for this
length to prepended in the framework. So, get rid of it.

Bug: 38222615
Test: Compiles
Change-Id: If8ff6e558dad974a053265e0a8c8222943065823
2017-05-16 09:17:37 -07:00
Etan Cohen
c7bd5101fe [AWARE] Add is out-of-band utility function
Add a utility function which indicates whether the network
specifier is an out-of-band network specifier.

Bug: 38171946
Test: unit tests + current integration (sl4a) pass
Change-Id: I68581b2c447d8547a1b35020c17188e220cca76b
2017-05-09 14:07:09 -07:00
Randy Pan
6d64bbdd47 Merge "Merge "Add network disabled reason starting index" into oc-dev am: c7642c3239" into oc-dev-plus-aosp
am: 6ea58fad63

Change-Id: I00af68bba1c5f6bd4a5abb60b7cce0527a8746d3
2017-05-03 23:08:34 +00:00
Randy Pan
0bda546639 Merge "Add network disabled reason starting index" into oc-dev
am: c7642c3239

Change-Id: I7b6c39a1e89642e8e8fb7674e26b8323949a79cb
2017-05-03 23:01:44 +00:00
Randy Pan
c7642c3239 Merge "Add network disabled reason starting index" into oc-dev 2017-05-03 22:55:48 +00:00
Wei Wang
3bf832c8ec Merge "Fix RttManager documation unit issue." into oc-dev am: 41c1e3f1aa
am: a269d60a2c

Change-Id: Ia1c5fdd5d0cbf3b7b039de73109cdd55fc1f82e9
2017-05-03 19:59:49 +00:00
Wei Wang
a269d60a2c Merge "Fix RttManager documation unit issue." into oc-dev
am: 41c1e3f1aa

Change-Id: I45d508c6f5ecf97f5166dbfb52d61fc8465b51b5
2017-05-03 19:52:56 +00:00
Wei Wang
41c1e3f1aa Merge "Fix RttManager documation unit issue." into oc-dev 2017-05-03 19:45:19 +00:00
Wei Wang
8330dc98f5 Fix RttManager documation unit issue.
Bug: 35138520

Test: Build passes. Nothing else to test as this only changes javadocs.
Change-Id: Id522eba4cf8dba2be670582e7d734bd9203b2aae
2017-05-02 20:32:37 -07:00
Randy Pan
f4315fed7e Add network disabled reason starting index
Bug: 36872201
Test: Flash, run connection tests and check the bug reports
Change-Id: I4b015bc805671765f32cbabe6e5f4b623498279d
2017-05-01 22:07:26 -07:00
Peter Qiu
294b0cc850 Merge "hotspot2: hide Release 2 APIs" into oc-dev am: 39da850a95
am: 10da2c2d84

Change-Id: I0cad5713f1c272770edd1400d09259b8c3e9932a
2017-05-02 01:58:15 +00:00
Peter Qiu
10da2c2d84 Merge "hotspot2: hide Release 2 APIs" into oc-dev
am: 39da850a95

Change-Id: Id5e1f6184de563b51fcd185fb2768c648f788ff9
2017-05-02 01:52:44 +00:00
Peter Qiu
a9f9889218 hotspot2: hide Release 2 APIs
Bug: 37514629
Test: builds
Change-Id: Idcd684cf9846791cb02ae0f74ec35ff4850666f1
2017-05-01 16:22:24 -07:00
Jeff Sharkey
16ec201af1 Merge changes from topic 'LOHSapi' into oc-dev am: 3ddc413b73
am: 5050b970bf

Change-Id: Ibbc1c8a17c51cda2797d4acb8b66ad6672011919
2017-05-01 22:51:57 +00:00
Jeff Sharkey
5050b970bf Merge changes from topic 'LOHSapi' into oc-dev
am: 3ddc413b73

Change-Id: I35750976e1f34c1195c109863f9deb988f7e42ef
2017-05-01 22:38:31 +00:00
Jeff Sharkey
3ddc413b73 Merge changes from topic 'LOHSapi' into oc-dev
* changes:
  WifiManager: expose base LOHS apis
  WifiManager: update API for LOHS
2017-05-01 22:35:05 +00:00
Jeff Sharkey
442b93c03a Merge "hotspot2: update method name for timestamp related APIs" into oc-dev am: b6f66cf931
am: 28b08173da

Change-Id: I4d019e13e0d7bb5d7f1bada97bfa7948a1b650ac
2017-05-01 22:21:34 +00:00