1826 Commits

Author SHA1 Message Date
Amin Shaikh
d3dfd3b8e9 Make WifiConfiguration#meteredHint a @SystemApi
This allows NetworkRecommendationProviders to set this field on
returned WifiConfigurations.

Test: make
Bug: 33760009
Change-Id: I4d34272a1fb8d88bcc56cf4f00d8beadd06ac603
Merged-In: I4d34272a1fb8d88bcc56cf4f00d8beadd06ac603
2016-12-20 12:46:50 -08:00
Amin Shaikh
f9d47b79b2 Expose ScanResult#untrusted as a @SystemApi.
- Expose ScanResult#untrusted to inform NetworkRecommendationProviders
  that a ScanResult does not correspond to a saved network.
- Add static construction methods and assertions to RecommendationResult

Test: runtest frameworks-services

Bug: 33490132
Change-Id: If7006040f63843c1c468c9d95c5c017383c5c5dd
2016-12-20 12:22:08 -08:00
Amin Shaikh
14965357b7 Make WifiConfiguration#meteredHint a @SystemApi
This allows NetworkRecommendationProviders to set this field on
returned WifiConfigurations.

Test: make
Bug: 33760009
Change-Id: I4d34272a1fb8d88bcc56cf4f00d8beadd06ac603
2016-12-20 11:00:34 -08:00
Svetoslav Ganov
e07563cc96 Add WiFi toggle prompts - framework
am: 82737b42a6

Change-Id: Ia8958b54d04fff971b96fc6d29771eb94fd9b17e
2016-12-13 16:02:23 +00:00
Sundeep Ghuman
5aea94e128 Copy WifiNetworkScoreCache into frameworks/base. Add tests. am: 46169f946b am: e436024c65 am: c600c4058b
am: e4fb9aaa3f

Change-Id: I311fb02b2d0a2f12a0f76411de61074145b9077e
2016-12-13 02:35:09 +00:00
Sundeep Ghuman
46169f946b Copy WifiNetworkScoreCache into frameworks/base. Add tests.
Begin process of migrating WifiNetworkScoreCache.java from System Server
(//frameworks/opt/net/wifi/service/java/com/android/server/wifi/) to a
SystemApi. This CL is a straight copy and paste of
WifiNetworkScoreCache.java. Only new code is located in
WifiNetworkScoreCacheTest.java

Bug: b/33050254
Test: Unit tests added to cover most common use cases.
Change-Id: I7510420d293339ce7811fcf71a6efceb8d809c3a
2016-12-12 14:57:10 -08:00
Michael Plass
f47437fd8b Merge "Remove user-triggered disconnect counters" am: 2007ee8de3 am: b8d3324bb7 am: 2c106012fe
am: 88f6752547

Change-Id: Ie2d0a341db570e2fb807da3b8ff7a049c055c49f
2016-12-07 23:21:49 +00:00
Michael Plass
1ff5bd2646 Remove user-triggered disconnect counters
Removes these fields of WifiConfiguration:
  numUserTriggeredWifiDisableLowRSSI
  numUserTriggeredWifiDisableBadRSSI
  numUserTriggeredWifiDisableNotHighRSSI
  numTicksAtBadRSSI
  numTicksAtNotHighRSSI
  numUserTriggeredJoinAttempts

Add parcel test for WifiConfiguration.

Bug: 33013630
Test: unit tests pass
Change-Id: I39566c4e7845b01899739c36d6ec633f272fec6f
2016-12-07 08:50:10 -08:00
Etan Cohen
fc3d4896aa Merge "[AWARE] Fix javadocs for match filter update" am: 7241d28826 am: 65617f21bf am: 4c43aba36e
am: 4f6b7f87f8

Change-Id: I5c15d5915d5fd7ce84d150986af1f8d45b9a65dc
2016-12-05 16:14:19 +00:00
Etan Cohen
65617f21bf Merge "[AWARE] Fix javadocs for match filter update"
am: 7241d28826

Change-Id: I67b2798b0eb1bc7e4ccd727aad9e761da49a8823
2016-12-05 15:57:37 +00:00
Etan Cohen
7241d28826 Merge "[AWARE] Fix javadocs for match filter update" 2016-12-05 15:51:18 +00:00
Svetoslav Ganov
82737b42a6 Add WiFi toggle prompts - framework
If permission review is enabled toggling WiFi on or off
results in a user prompt to collect a consent. This applies
only to legacy apps, i.e. ones that don't support runtime
permissions as they target SDK 22.

bug:28715749

Change-Id: I020601e208c0736005bcabc7b7b77b96eee45b03
2016-12-05 13:52:05 +00:00
Paul Stewart
1fd6f643ac Add constants for 802.11r
am: e72f7dc385

Change-Id: I06d93c3ce96cddd6447b340304ce9fec2d4e41f2
2016-12-03 04:16:58 +00:00
Roshan Pius
f301986727 Merge changes from topic 'fast-bss-transition'
* changes:
  Add capability flag for 802.11r fast BSS transition
  Add constants for 802.11r
2016-12-02 23:57:40 +00:00
Paul Stewart
20569fee35 Add constants for 802.11r am: 3ed7caa0f9
am: 7e6940d728

Change-Id: Ic86302bd0ef53ee5797b2caf9cb998e40537ef12
2016-12-02 22:43:07 +00:00
Paul Stewart
7e6940d728 Add constants for 802.11r
am: 3ed7caa0f9

Change-Id: Iff6064efa02138a0458d31f630335c039b057145
2016-12-02 22:18:25 +00:00
Etan Cohen
0ae58fa665 [AWARE] Fix javadocs for match filter update
Javadocs update. Specifically, cannot contain generics (since
under-the-hood generics are just the undecorated class).

Bug: 32840891
Test: generated docs (no functional change)
Change-Id: I4bc2967a60ad27d137fd5a4dd3db18625343c910
2016-12-01 16:59:41 -08:00
Etan Cohen
8574c88237 Merge "AWARE: Abstract structure of match filters" am: f358a69cba am: 7f12aa5470 am: 61eb0bf8fc
am: 257ed21d93

Change-Id: I59d444dc877f07b3a9c9e5f3286c708cd0d6c0e9
2016-12-01 22:26:59 +00:00
Etan Cohen
7f12aa5470 Merge "AWARE: Abstract structure of match filters"
am: f358a69cba

Change-Id: Ic7e87e47e9a9beebb11aa7465e4d2be9dd3e767a
2016-12-01 21:35:05 +00:00
Etan Cohen
f358a69cba Merge "AWARE: Abstract structure of match filters" 2016-12-01 15:42:35 +00:00
Stephen Chen
11ab16f650 Merge "Add meteredOverride field to WifiConfiguration." am: f9479fe639 am: dfd9942a31 am: 99bd27f7ee
am: 2fd19b6d52

Change-Id: I30fb4aae566e77e5ed29092387050542cbbb2eb2
2016-12-01 03:41:11 +00:00
Stephen Chen
dfd9942a31 Merge "Add meteredOverride field to WifiConfiguration."
am: f9479fe639

Change-Id: I0d2540cf0a360f07c1dd103191fd348602099ff5
2016-12-01 03:23:32 +00:00
Treehugger Robot
f9479fe639 Merge "Add meteredOverride field to WifiConfiguration." 2016-12-01 03:08:44 +00:00
Etan Cohen
1857b982c3 AWARE: Abstract structure of match filters
Replace byte[] representation with a List<byte[]> representation
which abstracts the LV (TLV without a type field) structure of
the match filters.

Tlv utilities: remove tag indicating that will be made public API.
That is no longer expected (will be an internal utility) since the
match filter structure is now parsed when exposed to API.

Lv utilities: removed. Was a simple wrapper around Tlv utilities -
no longer needed since will not be exposed as API.

(cherry-pick of commit c9870d0d431471bf1362e46fc4f2f1bc6722896a)

Bug: 32840891
Test: unit-tests and integration (sl4a) tests passing
Change-Id: I6d792c4d7584ce002f6c11692e83e7654ef3e764
2016-11-30 17:01:52 -08:00
Stephen Chen
c76fda7269 Add meteredOverride field to WifiConfiguration.
This stores a user's metered selection. This will be set by
Settings -> Data Usage -> Network restrictions and used in conjunction
with WifiConfiguration.meteredHint to properly track a Wifi network's
metered state.

Bug: 33106464
Bug: 26545374
Test: runtest --path
frameworks/opt/net/wifi/tests/wifitests/src/com/android/server/wifi/util/XmlUtilTest.java
runtest --path
frameworks/opt/net/wifi/tests/wifitests/src/com/android/server/wifi/WifiStateMachineTest.java

Change-Id: I1a378ef2946c1b5b6091bba379f2ab48a15d29d8
2016-11-30 11:15:13 -08:00
Etan Cohen
ba4a81b363 Merge "[AWARE] Data-path creation roles hard-coded for discovery sessions" am: 47502919ad am: ad299d38ff am: 1c92763087
am: 1f5d3014c5

Change-Id: I1f874e790b35686968f6c54f668db0cd996b6f70
2016-11-30 17:30:23 +00:00
Etan Cohen
ad299d38ff Merge "[AWARE] Data-path creation roles hard-coded for discovery sessions"
am: 47502919ad

Change-Id: If8f7d8e0e039d2d9961de84e5aa8693448b77a26
2016-11-30 17:08:32 +00:00
Etan Cohen
1ddf6a6d3a [AWARE] Data-path creation roles hard-coded for discovery sessions
Data-path roles (initiator & responder) are hard-coded for discovery
session participants by the spec: subscriber <-> initiator and
publisher <-> responder. Remove API parameter which allowed caller
to specify role.

(cherry-pick of commit 9c7483fec41db681a2d6de93a9061fb8764ecba5)

Bug: 32883026
Test: unit-tests and integration (sl4a) tests passing.
Change-Id: I889eacda9416d9ecd04caa0c72413f984611d40c
2016-11-30 07:10:42 -08:00
Etan Cohen
260823eba4 Merge "[AWARE] Move manager tests from service to manager directory" am: 018f6ec16f am: f74733a367 am: cd4be8b7e0
am: 28d58e1c95

Change-Id: Ie6ea910839b577914e56b0718345e45db16ab146
2016-11-24 00:19:16 +00:00
Etan Cohen
f74733a367 Merge "[AWARE] Move manager tests from service to manager directory"
am: 018f6ec16f

Change-Id: I795e75882ac702c3637afa43ba2f73d612d74661
2016-11-23 23:50:27 +00:00
Etan Cohen
b77b69545e [AWARE] Move manager tests from service to manager directory
Move operation - no functional tests. Only editorial changes:
- Remove (no longer) necessary import statements
- Removed reference to a constant sitting on the service side.
  Replaced with locally defined constant.

(cherry pick of commit 7ba5ad3c53dac62e56cd12dbe2054ce8374b6b92)

Bug: 32954930
Test: unit-tests pass
Change-Id: Ibe463fa73c27fc67996460eb91ea0222437927a6
2016-11-23 10:28:09 -08:00
Peter Qiu
028f18d340 Merge "wifi: hotspot2: add copy constructor for PasspointConfiguration" am: 248c8311e8 am: 3aa7fdd19a am: 5366e9bf71
am: f598da48f2

Change-Id: I005042e2acf5f53fd70373443f7763b68d783f0f
2016-11-22 17:52:57 +00:00
Peter Qiu
3aa7fdd19a Merge "wifi: hotspot2: add copy constructor for PasspointConfiguration"
am: 248c8311e8

Change-Id: I9a652a0f02f2895bde3ac9e4c332c80fc38b0df6
2016-11-22 01:37:00 +00:00
Treehugger Robot
248c8311e8 Merge "wifi: hotspot2: add copy constructor for PasspointConfiguration" 2016-11-22 00:03:43 +00:00
Etan Cohen
43518242a3 Merge "[AWARE] Update API per review" am: 9e4f111e0f am: ce7f932be7 am: 86cd994a15
am: 355e52215f

Change-Id: I0f334e1db798bdfcadb4547d7edda5200e160b43
2016-11-21 23:07:34 +00:00
Etan Cohen
ce7f932be7 Merge "[AWARE] Update API per review"
am: 9e4f111e0f

Change-Id: I69001477d02c612540ff74385400551293f7c600
2016-11-21 21:50:34 +00:00
Etan Cohen
6831f93725 [AWARE] Update API per review
- Move Handler to last position
- Peer ID changed from 'Object' -> opaque class
- Rename onMessageSent -> onMessageSendSucceeded

(cherry pick of commit 1fef08507aeb49bb2e4e7be4804a378ba2cf7770)

Bug: 31470256
Test: unit tests & integration (sl4a) tests pass
Change-Id: I5530d310e982ea16a63a5af1f704625fd24e436c
2016-11-21 18:23:39 +00:00
Paul Stewart
3ed7caa0f9 Add constants for 802.11r
Add constants FT-EAP and FT-PSK, which implement 802.11r Fast
BSS Transition.

Bug: 32607043
Change-Id: Ic089bf9331723f1fce3978253437f5759c6d61e9
Test: Build (constants only)
2016-11-18 10:26:24 -08:00
Peter Qiu
42efc4ba7a Merge "wifi: hotspot2: add support for validating passpoint configuration" am: ebb722d04a am: 8bbb583ff7 am: 1b3a17c280
am: b011af9573

Change-Id: I7c45b558c87e4c24083f82ea69c7584668fb15aa
2016-11-18 09:10:43 +00:00
Peter Qiu
8bbb583ff7 Merge "wifi: hotspot2: add support for validating passpoint configuration"
am: ebb722d04a

Change-Id: Ic20a77103961bd9ff61b6af90130c25ad19c451a
2016-11-18 08:54:11 +00:00
Treehugger Robot
ebb722d04a Merge "wifi: hotspot2: add support for validating passpoint configuration" 2016-11-18 08:45:15 +00:00
Peter Qiu
8b75eeef42 Merge "wifi: add constant definition for EAP types" am: a908e65b66 am: 40dfd2d0bc am: 120cb677f0
am: 9562122699

Change-Id: I3840e74b17bfe22b8b62597b6f98c4cee79e14f1
2016-11-17 19:02:30 +00:00
Peter Qiu
40dfd2d0bc Merge "wifi: add constant definition for EAP types"
am: a908e65b66

Change-Id: I283fba81ca5246222bda07f7f109d2f359e5e395
2016-11-17 02:21:41 +00:00
Treehugger Robot
a908e65b66 Merge "wifi: add constant definition for EAP types" 2016-11-17 02:10:23 +00:00
Ningyuan Wang
4a4213845b Merge "Add security capabilities enums to ScanResult" am: a3c0324824 am: 6e67bb87cf am: 7cad272109
am: 5f72d153aa

Change-Id: Idf96f8abaed98608d8252484e9eba86d669ac7d4
2016-11-17 00:22:06 +00:00
Ningyuan Wang
6e67bb87cf Merge "Add security capabilities enums to ScanResult"
am: a3c0324824

Change-Id: Iad2aba87155d52343b372b2d7af3e037842c1ca4
2016-11-16 23:54:24 +00:00
Peter Qiu
a32e50986e wifi: hotspot2: add copy constructor for PasspointConfiguration
Bug: 32714562
Test: frameworks/base/wifi/tests/runtests.sh
Change-Id: Ida7e4da3d6a9679743397643e0250434dbdb43af
2016-11-16 15:35:48 -08:00
Peter Qiu
a25d717de8 wifi: hotspot2: add support for validating passpoint configuration
Bug: 32572199
Test: frameworks/base/wifi/tests/runtests.sh
Change-Id: I8e649430af54d863dfa5492abc3dfd79c772c765
2016-11-16 15:08:03 -08:00
Peter Qiu
4a79ac2c82 wifi: add constant definition for EAP types
Bug: 32810711
Test: frameworks/base/wifi/tests/runtests.sh
Change-Id: Ia62f2674e8cdf975d1380f733a8687bdb15ed197
2016-11-16 13:49:22 -08:00
Ningyuan Wang
d150b2b001 Add security capabilities enums to ScanResult
This adds enums of security parameters, including
protocol, key management, and cipher suites.

Bug: 32512793
Test: compile

Change-Id: Ibf784d79695ca5e261c6bfe623406bc693c5ac17
2016-11-16 11:13:42 -08:00