1942 Commits

Author SHA1 Message Date
Etan Cohen
b36a9e0eb5 Merge "[AWARE] Remove Publish/Subscribe Count configuration" am: 5d81b9d67d am: 9bc8e05da2
am: 342a27e7f7

Change-Id: I5b4d9ea932373e8dd82e846d2c31995b23329fff
2017-03-29 17:19:50 +00:00
Etan Cohen
9bc8e05da2 Merge "[AWARE] Remove Publish/Subscribe Count configuration"
am: 5d81b9d67d

Change-Id: I6f7545c6665d4381cdeed03290cf928bc21aef17
2017-03-29 17:08:51 +00:00
Etan Cohen
b51c04effb Merge "[AWARE] Fix unit tests" am: de8e09409b am: c24d7f781a
am: 7060ae081b

Change-Id: I7e90e4c0853457fa49335a48b20d74c3afb9ba1b
2017-03-29 15:14:30 +00:00
Etan Cohen
c24d7f781a Merge "[AWARE] Fix unit tests"
am: de8e09409b

Change-Id: I563dc61839664a7b51c1fe44283f7dd18217b012
2017-03-29 15:04:28 +00:00
Etan Cohen
2cbaf22bba [AWARE] Remove Publish/Subscribe Count configuration
Simplify API: semantics of publish/subscribe count restrictions
aren't clear at the app level. They depend on DW configuration as
well as discovery session type - number of packets transmitted over
the air.

There's already an app-facing discovery session lifetime configuration -
the TTL. That has clearer semantics and is sufficient (for now).

Bug: 36446307
Test: unit tests and integration (sl4a) tests.
Change-Id: I9129975bd2e1a61b3d23a4b6acaae703b42216c7
2017-03-28 11:25:21 -07:00
Etan Cohen
afddcc3c98 [AWARE] Fix unit tests
Update to reflect new mockito semantics.

No functional change, no change to test semantics!

Bug: 36680830
Test: unit tests now passing
Change-Id: Ic210f20ce47ab19da25bd0835ae2ee5ae0f73011
2017-03-28 10:50:41 -07:00
Roshan Pius
3d981130f4 Merge "WifiManager(aidl): Remove pingSupplicant binder call" am: 3777874320 am: 673de5b39d
am: d0919ba9c4

Change-Id: Ia955905826f7b7a2219086121212f4498ca92993
2017-03-28 07:58:32 +00:00
Roshan Pius
673de5b39d Merge "WifiManager(aidl): Remove pingSupplicant binder call"
am: 3777874320

Change-Id: Ia12b132ecb8bb8d7effe7b6fa98461c5cbfddf30
2017-03-28 05:34:27 +00:00
Roshan Pius
3777874320 Merge "WifiManager(aidl): Remove pingSupplicant binder call" 2017-03-28 05:25:25 +00:00
Amin Shaikh
e50a607a35 Update hidden WifiManager API.
- Refactor getWpsNfcConfigurationToken(int) to getCurrentNetworkWpsNfcConfigurationToken()

Bug: 35725168
Test: runtest frameworks-wifi
Change-Id: Ia362e4d781297d7f89a4437a0c5ae6edecff24e5
2017-03-23 18:50:01 -07:00
Peter Qiu
424c8c1716 Merge "Merge "wifi: use android.graphics.drawable.Icon for Passpoint icon data" am: 44ef19d131 am: aadbb2d45e" into nyc-mr2-dev-plus-aosp
am: 3f57a273d2

Change-Id: Ie314289ce69f07c872c7a16ddc90d36be25c777f
2017-03-23 23:13:32 +00:00
Peter Qiu
aadbb2d45e Merge "wifi: use android.graphics.drawable.Icon for Passpoint icon data"
am: 44ef19d131

Change-Id: I65b22e41ae62172cc7b241fe68c6d1c92c782a69
2017-03-23 23:00:06 +00:00
Treehugger Robot
44ef19d131 Merge "wifi: use android.graphics.drawable.Icon for Passpoint icon data" 2017-03-23 22:53:46 +00:00
Peter Qiu
cf08edf4ff Merge "hotspot2: ignore uninterested headers and content type attributes" am: 7a7bb444cb am: 10d1deff83
am: f9de6d77bc

Change-Id: I735caa47dc93f98e4ef0be7fb5f0fe700dffa1bf
2017-03-23 20:18:41 +00:00
Peter Qiu
10d1deff83 Merge "hotspot2: ignore uninterested headers and content type attributes"
am: 7a7bb444cb

Change-Id: Ic97238b1400e8da514612f983db1896011bf775f
2017-03-23 20:06:12 +00:00
Peter Qiu
ed1fc64efd wifi: use android.graphics.drawable.Icon for Passpoint icon data
Bug: 35857805
Test: frameworks/base/wifi/tests/runtests.sh
Test: frameworks/opt/net/wifi/tests/wifitests/runtests.sh
Change-Id: Ib076cd7f565638613173c7373ea5ea61affb876d
2017-03-23 11:42:49 -07:00
Peter Qiu
5a493241d9 hotspot2: ignore uninterested headers and content type attributes
Each vendor might put additional headers and content type attributes
in the installation file, and will not be useful for us.  So just
ignore them when parsing the installation file instead of error out.

While there, add support for parsing "Extension" node in PpsMoParser.
This an interior node containing vendor specific information, only
meaningful to the vendor.  So we will ignore fields under this node.

Bug: 36477333
Test: frameworks/base/wifi/tests/runtests.sh
Test: manual test by installing ruckus Passpoint profile
Change-Id: I9954ed000387bc8048d0452a5bfb0f339e676659
2017-03-23 11:40:05 -07:00
Dan Shi
874a0916fc Merge "Add test configs to apct tests under frameworks/base" 2017-03-22 17:55:58 +00:00
Roshan Pius
1abdd50ee3 WifiManager(aidl): Remove pingSupplicant binder call
This is now deprecated in the public API and instead calls
isWifiEnabled(). So, remove this AIDL call.

Bug: 36493092
Test: Compiles
Change-Id: I6339d5bb18f423d84fa9222a87e2df7eb9c336a9
2017-03-22 01:44:44 +00:00
Dan Shi
7f2afd2dff Add test configs to apct tests under frameworks/base
TouchLatency is needed by test TouchLatencyJankTestWear
UiBench is needed by test UiBenchJankTests

Details about test configs changes are tracked in doc
https://docs.google.com/document/d/1EWUjJ7fjy8ge_Nk0YQbFdRp8DSHo3z6GU0R8jLgrAcw/edit#

Bug: 35882476
Test: local test
make -j32 TouchLatency TouchLatencyJankTestWear  && \
tradefed.sh run template/local --template:map test=TouchLatencyJankTestWear \
      --test-tag testname --log-level-display VERBOSE
make -j32 UiBenchJankTests UiBench  && \
tradefed.sh run template/local --template:map test=UiBenchJankTests \
      --test-tag testname --log-level-display VERBOSE

Change-Id: I63f23e3a21ad1343607953958fb7bb0a5fb8c343
2017-03-21 00:05:14 -07:00
Peter Qiu
98595e7718 Merge "hotspot2: implement toString for PasspointConfiguration" am: 5bd337397b am: 8951172562
am: 79ff52975f

Change-Id: I80cdbc7f0140e6085c06cab8eaba63e1fc455538
2017-03-17 22:23:30 +00:00
Peter Qiu
8951172562 Merge "hotspot2: implement toString for PasspointConfiguration"
am: 5bd337397b

Change-Id: I8db5f02e6c6ab6b03de5ae3cff39619f85963e9b
2017-03-17 22:08:21 +00:00
Treehugger Robot
5bd337397b Merge "hotspot2: implement toString for PasspointConfiguration" 2017-03-17 21:57:16 +00:00
Peter Qiu
89537734e1 hotspot2: implement toString for PasspointConfiguration
Bug: 35850988
Test: Verify contents in "adb shell dumpsys"
Change-Id: Idabe65d505eb15113aba06dc05c879861b94b2af
2017-03-17 12:44:13 -07:00
Roshan Pius
da34226f06 Merge "WifiConfiguration: Correct documentation for priority"
am: f5fa26bf25

Change-Id: I37fd50fac3dc6c2db8c677d1a265fca73babf5da
2017-03-17 17:28:13 +00:00
Roshan Pius
6b6f1b9e12 Merge "WifiConfiguration: Update psk documentation"
am: 89c79ff632

Change-Id: I3ac1ed89de58038cf7bcddcac7b090fc07a8e4b8
2017-03-17 17:26:57 +00:00
Roshan Pius
651b264b3d WifiConfiguration: Correct documentation for priority
Addressing the concerns raised by API council for deprecating this
field.

Bug: 35854198
Test: make update-api
Change-Id: If9ca582f5d3bd8539a226b425662832241a447cc
2017-03-17 08:44:06 -07:00
Roshan Pius
cbd0c76ad0 WifiConfiguration: Update psk documentation
Adding some documentation to explain the expected contents of this
field.

Bug: 35967623
Test: make update-api
Change-Id: Ia28e2c79834c4d7b0de7350c18d5f32633e6309d
2017-03-17 08:40:17 -07:00
TreeHugger Robot
77724a5be7 Merge "WifiConfiguration: Correct documentation for priority" 2017-03-17 04:06:52 +00:00
Roshan Pius
60d9c84209 Merge "WifiConfiguration: Update psk documentation" 2017-03-17 03:59:40 +00:00
Peter Qiu
b1aff6b190 Merge "Merge "wifi: add a flag indicating legacy Passpoint configuration" am: 2d87679a11 am: 1228b6cdec" into nyc-mr2-dev-plus-aosp
am: 01213393fb

Change-Id: Ic5ea3f8c8521e818ee771b20cdb4d43875d6daa7
2017-03-16 23:54:12 +00:00
Roshan Pius
26300afd75 WifiConfiguration: Correct documentation for priority
Addressing the concerns raised by API council for deprecating this
field.

Bug: 35854198
Test: make update-api
Change-Id: If9ca582f5d3bd8539a226b425662832241a447cc
2017-03-16 16:41:12 -07:00
Roshan Pius
a3406db72c WifiConfiguration: Update psk documentation
Adding some documentation to explain the expected contents of this
field.

Bug: 35967623
Test: make update-api
Change-Id: Ia28e2c79834c4d7b0de7350c18d5f32633e6309d
2017-03-16 16:41:04 -07:00
Peter Qiu
1228b6cdec Merge "wifi: add a flag indicating legacy Passpoint configuration"
am: 2d87679a11

Change-Id: I12bc10c8bf51df93ee7c2c7b770820ca7189527d
2017-03-16 23:32:33 +00:00
Treehugger Robot
2d87679a11 Merge "wifi: add a flag indicating legacy Passpoint configuration" 2017-03-16 23:20:45 +00:00
TreeHugger Robot
587b60282e Merge "frameworks/base: Add APCT tests to the device-tests suite." 2017-03-16 17:35:12 +00:00
Simran Basi
473a16e492 frameworks/base: Add APCT tests to the device-tests suite.
This CL adds the APCT tests within this project to
a similar suite as CTS known as device-tests.

The current method of running APCT tests in the infrastructure
is unaffected.

Bug: 35882476
Test: `make dist device-tests -j` and local builds of
      continuous_instrumentation_tests & continuous_native_tests

Change-Id: Ifa382fe691842c1cd76897775b9e2a1653449eb5
2017-03-15 14:46:27 -07:00
Roshan Pius
825cc3ac65 Merge "WiFi: Wifi service get configured networks use ParceledListSlice." am: 8b549c9539 am: 530d75965d
am: 081d93d13c

Change-Id: I88fd3cc3f16907a1d14bbf80ae7b35bb92ff21cd
2017-03-15 20:51:59 +00:00
Roshan Pius
530d75965d Merge "WiFi: Wifi service get configured networks use ParceledListSlice."
am: 8b549c9539

Change-Id: I9ccfbfcf17590284aedd4449022b107c37e5aef2
2017-03-15 20:43:52 +00:00
Roshan Pius
8b549c9539 Merge "WiFi: Wifi service get configured networks use ParceledListSlice." 2017-03-15 20:34:33 +00:00
Peter Qiu
0b404b49a0 Merge "hotspot2: update documentation for WifiManager#queryPasspointIcon" am: 6493f3df6b am: 7a3fd84b1e
am: 8ff8b498ca

Change-Id: Ia0c5c1876c2220b02f1e795700b07cf1088b531c
2017-03-14 23:21:43 +00:00
Peter Qiu
7a3fd84b1e Merge "hotspot2: update documentation for WifiManager#queryPasspointIcon"
am: 6493f3df6b

Change-Id: I40fc13a08425f2ada7e648342db92d83c4d59cba
2017-03-14 23:07:28 +00:00
Treehugger Robot
6493f3df6b Merge "hotspot2: update documentation for WifiManager#queryPasspointIcon" 2017-03-14 22:45:57 +00:00
Peter Qiu
39df78ecc7 Merge changes from topics 'Passpoint API update', 'Passpoint intent update'
am: 5df03b3d74

Change-Id: Ic1822a3203da5522a5a103c34fb45a6498cd6428
2017-03-14 16:24:11 +00:00
Peter Qiu
9c0f6f3db7 hotspot2: hide validate method for Passpoint configuration
am: b5ca6f36b5

Change-Id: I268b0db6c844ec1746b6374c87768f233b719b3f
2017-03-14 16:22:28 +00:00
Peter Qiu
c4d5850d3e hotspot2: update Passpoint intent definitions
am: 5679145d9a

Change-Id: I4e59efbcd9a9d33ceac8cc359155770c2de5a0fd
2017-03-14 16:19:19 +00:00
Peter Qiu
3efd531e2f hotspot2: update Passpoint configuration management APIs
Address API Councils comment to update both
WifiManager#addOrUpdatePasspointConfiguration and
WifiManager#removePasspointConfiguration to return void and throw
exception on failure instead of returning a boolean.

Bug: 35858311,35856174
Test: make -j32
Change-Id: Iac421eba7aa90e8bc3ffaf5d81210302c7557e95
Merged-In: Iac421eba7aa90e8bc3ffaf5d81210302c7557e95
2017-03-13 11:21:14 -07:00
Peter Qiu
b5ca6f36b5 hotspot2: hide validate method for Passpoint configuration
The validate method is used by Framework only, no need to expose
to app developers. So hide it.

Bug: 35756298
Test: make -j32
Change-Id: I15ccae472f30d7ae968816479f6ea35d90248fe0
Merged-In: I15ccae472f30d7ae968816479f6ea35d90248fe0
2017-03-13 11:21:13 -07:00
Peter Qiu
5679145d9a hotspot2: update Passpoint intent definitions
Address API Councils comment on the newly added intent definitions
for Passpoint events:
- Use a Parcelable class to represent icon info
- Document all extras that are included for an action
- Document that the new intents will only be sent to registered
  receivers, and not manifest receivers
- Rename extras to be more generic

While there, removed the deprecated hidden Passpoint intent
definitions.

Bug: 35857805
Test: frameworks/base/wifi/tests/runtests.sh
Change-Id: I22de2d52fce3ed1adc8d72bf1580d3337bc747c5
Merged-In: I22de2d52fce3ed1adc8d72bf1580d3337bc747c5
2017-03-13 10:39:04 -07:00
TreeHugger Robot
764edd7627 Merge changes from topics 'Passpoint API update', 'Passpoint intent update'
* changes:
  hotspot2: update Passpoint configuration management APIs
  hotspot2: hide validate method for Passpoint configuration
  Osu: temporarily comment out the usage of deprecated intent definitions
  hotspot2: update Passpoint intent definitions
2017-03-13 17:30:36 +00:00