1962 Commits

Author SHA1 Message Date
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
Peter Qiu
92f685a98d 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
2017-03-13 09:46:24 -07:00
Peter Qiu
fbc605ca06 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
2017-03-13 09:46:22 -07:00
zhangshuxiao
ec19db6bd4 WiFi: Wifi service get configured networks use ParceledListSlice.
The number of configurations will be more and more, some
users configured more than 600KB or even 1M, It will cause
the binder failed. Therefore, we use ParceledListSlice
to splits into multiple transactions when more than 64K.

binder: 1885: binder_alloc_buf size 1058080 failed, no address space

Test: more than 500 configurations.

Change-Id: I35b8bac478c6d9efa2fb8572fdc7ca22eb910609
Signed-off-by: zhangshuxiao <zhangshuxiao@xiaomi.com>
2017-03-13 14:38:37 +00:00
Peter Qiu
580a1bdfbc wifi: add a flag indicating legacy Passpoint configuration
Bug: 36101691
Test: make -j32
Change-Id: I42df3160be9b2b863fededc1641482e5a39084e5
2017-03-10 13:56:33 -08:00
Etan Cohen
5fec44183c Merge "[AWARE] Update network API: make open/encrypted explicit" am: 3dee29581e am: 652aa82d7e
am: dff2c71b86

Change-Id: I0069a17cd38d628a53de46c42b3a0adb82b577b5
2017-03-10 17:28:49 +00:00
Etan Cohen
652aa82d7e Merge "[AWARE] Update network API: make open/encrypted explicit"
am: 3dee29581e

Change-Id: Ia77ef6835da6497a1641e1fda3e8de67f86b6690
2017-03-10 17:13:42 +00:00
Peter Qiu
b91d7deb96 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
2017-03-09 20:46:59 -08:00
Etan Cohen
3a764c19d1 [AWARE] Update network API: make open/encrypted explicit
Replace the older (implicitly) open network with 3 network
creation APIs:
- Open
- Passphrase-based
- PMK (SystemApi only)

Bug: 26564544
Bug: 35702875
Test: unit tests and integration (sl4a) tests
Change-Id: I29a1d668d245853755cd2dfaaa6c65fbb43989f7
2017-03-08 09:11:21 -08:00
Etan Cohen
9fbff5b5d9 Merge "[AWARE] Add data-path security configuration (Passphrase)" am: 769fa0c881 am: 0501c50040
am: 08e9d52817

Change-Id: I9e2cae82179316a6768fa43a7f313c32470fd40a
2017-03-08 15:15:48 +00:00
Etan Cohen
0501c50040 Merge "[AWARE] Add data-path security configuration (Passphrase)"
am: 769fa0c881

Change-Id: If38fa15ce7c6606f081b86dad1ecbe0cac453ed5
2017-03-08 15:05:18 +00:00
Etan Cohen
62a2f9f6ab [AWARE] Add data-path security configuration (Passphrase)
Add API to optionally provide a passphrase to
configure security on a data-path.

Bug: 33552694
Test: unit tests and integration (sl4a) tests
Change-Id: Ie011345348a3918a412957e38610cabe147c35fa
2017-03-07 19:07:14 -08:00
Peter Qiu
16034c6903 hotspot2: update documentation for WifiManager#queryPasspointIcon
Address API Councils comment on documentation for
WifiManager#queryPasspointIcon.

Bug: 35845899
Test: None
Change-Id: Ia8fe0f8203482f8b8f410081f06b580e8fdbac46
2017-03-06 09:55:41 -08:00
Peter Qiu
fa308f3257 Merge "wifi: WifiConfiguration: update documentation for isHomeProviderNetwork" am: 6ac19c0d23 am: be39334afb
am: 8cf05dfe92

Change-Id: Iecbe5a8d084302a2fa8ca49495ef93df78607428
2017-03-03 19:22:10 +00:00
Peter Qiu
be39334afb Merge "wifi: WifiConfiguration: update documentation for isHomeProviderNetwork"
am: 6ac19c0d23

Change-Id: Ia4966b2d8109a85a94f59d7ec57b387a8f6f612e
2017-03-03 19:10:46 +00:00
Treehugger Robot
6ac19c0d23 Merge "wifi: WifiConfiguration: update documentation for isHomeProviderNetwork" 2017-03-03 19:02:28 +00:00
Peter Qiu
eea3e49b44 Merge "hotspot2: expose string constants for cert type and auth methods" am: 603fb2ef56 am: d919593b9d
am: 19df6d208e

Change-Id: I184f1a40a9dc854071915609dc13322d0fc86a97
2017-03-02 22:30:40 +00:00
Peter Qiu
d919593b9d Merge "hotspot2: expose string constants for cert type and auth methods"
am: 603fb2ef56

Change-Id: I6ae4811e97a99c04a423c1390d87a8c21f4ae416
2017-03-02 22:21:27 +00:00
Treehugger Robot
603fb2ef56 Merge "hotspot2: expose string constants for cert type and auth methods" 2017-03-02 22:11:01 +00:00
Paul Stewart
b26979f14e Merge "Fix up EAP-SIM documentation" am: 2142b14a88 am: 32655dfa19
am: 5e10f3d8e3

Change-Id: Idecbc5f6e85c35c8f648dda005d701bf4ebdec82
2017-03-02 00:27:33 +00:00
Paul Stewart
32655dfa19 Merge "Fix up EAP-SIM documentation"
am: 2142b14a88

Change-Id: I944734796ea97fded5cc818899ddf7b41cbeca00
2017-03-02 00:12:43 +00:00
Peter Qiu
f7303ba18e wifi: WifiConfiguration: update documentation for isHomeProviderNetwork
Address API Councils comment on documentation for isHomeProviderNetwork
field.  Specifically, the expected value for this field for non-Passpoint
network configuration.

Bug: 35855359
Test: make -j32
Change-Id: Ie6cdcc39c5156dccc14ed144e58a6d2f201aef17
2017-03-01 16:06:55 -08:00
Peter Qiu
f8dbd216c8 hotspot2: expose string constants for cert type and auth methods
So that we can use these constants in WifiService and the apps
as well in the future.

While there, remove auth method "CHAP" from the supported list,
since it is currenlty not supported by WifiService.

Bug: 34206769
Test: make -j32
Change-Id: Icadc3b13f2b135d51445d336116fbba86e96b70f
2017-03-01 16:05:52 -08:00
Treehugger Robot
2142b14a88 Merge "Fix up EAP-SIM documentation" 2017-03-02 00:01:33 +00:00
Paul Stewart
906a077cf8 Fix up EAP-SIM documentation
Address API Council comments on doucmentation for the method calls
and constants related to EAP-SIM.  While here, improve unit tests
to ensure that passing a null certificate (chain) causes the config
to forget any existing client certificates.

Bug: 35847887
Test: Unit tests

Change-Id: I1c4e18e1a7cfb61aa4764e32778793368938e70b
2017-03-01 14:02:28 -08:00
Etan Cohen
22b1dce10e Merge "[AWARE] Add data-path security configuration (PMK)" am: eff6f4fc43 am: b50d958c4a
am: 756216fdf9

Change-Id: I5cdfbac3dafeecde732ea641cfcfee34c5e376ed
2017-03-01 17:54:35 +00:00
Etan Cohen
b50d958c4a Merge "[AWARE] Add data-path security configuration (PMK)"
am: eff6f4fc43

Change-Id: I90b6324a903b6307c084c891d7eba75957e13886
2017-03-01 17:45:42 +00:00
Etan Cohen
954111a252 [AWARE] Add data-path security configuration (PMK)
Add API to optionally provide a pairwise master key (PMK)
to configure security on a data-path.

Clarify the default API to mean open (unencrypted) data-path.

Bug: 33552694
Test: unit tests and integration (sl4a) tests
Change-Id: I43fe704547f2921b3207f215e42d253837aa04e9
2017-03-01 07:35:35 -08:00
Etan Cohen
fbad632f12 Merge "[AWARE] Remove (hide) sendMessage with retryCount API" am: f81911bcd2 am: 97bf0f5e9b
am: 07864e35c8

Change-Id: Ic53ad1fed518057d75a59fd7d91dd7f4882700ce
2017-02-27 18:51:46 +00:00
Etan Cohen
97bf0f5e9b Merge "[AWARE] Remove (hide) sendMessage with retryCount API"
am: f81911bcd2

Change-Id: I3791ee5fbd0c16de6156b0ad36e50091eea498f9
2017-02-27 18:42:05 +00:00
Etan Cohen
7c9c4785fc [AWARE] Remove (hide) sendMessage with retryCount API
Remove the sendMessage(..., retryCount) API (the version
without retryCount) remains. Baseline API already retries
transmissions (at the PHY/MAC layers) - no reason to add
framework-layer retries.

Bug: 35755823
Test: unit tests and integration (sl4a) tests
Change-Id: I49d8bd1e836c09d56f3a9343313f5647eac5c32d
2017-02-24 14:17:51 -08:00