2141 Commits

Author SHA1 Message Date
Rebecca Silberstein
4ee03a919d Merge "WifiConfiguration: add local only networkId" into oc-dev am: 46f4d5c4a6
am: 0ffff6a341

Change-Id: I84c310c491dff17f193e8e7942c2ba90798e65b9
2017-06-06 16:11:46 +00:00
Jeff Sharkey
ec68b46bc8 Merge "Annotate @SystemApi with required permissions." into oc-dev am: c1406978a4
am: 7a2e4a8486

Change-Id: Ib629e25dbf047c110feaf03e4ff744b5c6df9aeb
2017-06-06 15:48:24 +00:00
Jeff Sharkey
67cb5f5210 Merge "Give Doclava our manifest; more permission docs." into oc-dev
am: 65d4cbba37

Change-Id: I2ec50efb67debd15d354db69b84fb620eb74bc0e
2017-06-06 15:28:26 +00:00
Jeff Sharkey
65d4cbba37 Merge "Give Doclava our manifest; more permission docs." into oc-dev 2017-06-06 15:19:23 +00:00
Rebecca Silberstein
0ffff6a341 Merge "WifiConfiguration: add local only networkId" into oc-dev
am: 46f4d5c4a6

Change-Id: I76454a05fdeec94b84d0bfb6f084790e0a7f77d5
2017-06-06 14:49:57 +00:00
Rebecca Silberstein
46f4d5c4a6 Merge "WifiConfiguration: add local only networkId" into oc-dev 2017-06-06 14:42:59 +00:00
Jeff Sharkey
bfc4fcde9f Give Doclava our manifest; more permission docs.
We've seen some @SystemApi methods protected with non-system
permissions, so give Doclava the platform AndroidManifest.xml so it
can parse the actual permission protection levels to look for APIs
that are letting in non-system apps.

Also document more @SystemApi permissions.

This is purely a docs change; no logic changes are being made.

Test: make -j32 update-api
Bug: 62263906
Change-Id: Ie0f0a5fb0033817bcc95060f2183a52ae4ae7b06
2017-06-05 17:38:19 -06:00
Jeff Sharkey
7a2e4a8486 Merge "Annotate @SystemApi with required permissions." into oc-dev
am: c1406978a4

Change-Id: I305967cad945a807c3f8234efabaad0ef8b591d1
2017-06-05 22:28:21 +00:00
Jeff Sharkey
d86b8fea43 Annotate @SystemApi with required permissions.
Most @SystemApi methods should be protected with system (or higher)
permissions, so annotate common methods with @RequiresPermission to
make automatic verification easier.

Verification is really only relevant when calling into system
services (where permissions checking can happen on the other side of
a Binder call), so annotate managers with the new @SystemService
annotation, which is now automatically documented.

This is purely a docs change; no logic changes are being made.

Test: make -j32 update-api && make -j32 offline-sdk-docs
Bug: 62263906
Change-Id: I2554227202d84465676aa4ab0dd336b5c45fc651
2017-06-05 13:27:11 -06:00
TreeHugger Robot
cc4804631a Merge "wifi: hotspot2: implement Parcelable class for OSU provider" 2017-06-02 18:38:04 +00:00
Peter Qiu
55840d018e wifi: hotspot2: implement Parcelable class for OSU provider
Bug: 62235196
Test: frameworks/base/wifi/tests/runtests.sh
Change-Id: I3327981569fccbe20aba780f4c3f0f5bcb432f31
2017-06-01 14:11:53 -07:00
Rebecca Silberstein
544eff2d23 WifiConfiguration: add local only networkId
When applications start LOHS, they need a way to connect to the
network on the same device.  The WifiConfiguration.networkId
will be set to the newly defined value to serve as a signal to
ConnectivityService that this request is for a local only
network connection.

Bug: 62076211
Test: frameworks/base/wifi/tests/runtests.sh
Change-Id: Iab5240a7b4f526f8bc72dd44cdba59e65faedcd1
2017-05-31 22:51:06 -07:00
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
b205f4fbc0 Merge "[AWARE] Add is out-of-band utility function" 2017-05-10 13:28:25 +00: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
Rebecca Silberstein
a23cbf0656 Merge "WifiManagerTest: alt way to check callback" into oc-dev am: 52fbde5255
am: dd28278023

Change-Id: I8e56318a4d62330d31fb129439cd3ed26305f13a
2017-05-05 20:22:42 +00:00
Rebecca Silberstein
dd28278023 Merge "WifiManagerTest: alt way to check callback" into oc-dev
am: 52fbde5255

Change-Id: I6aaf92372ec62b1d7775492b56ac908f09cf056f
2017-05-05 20:11:22 +00:00