OSDN Git Service
Etan Cohen [Tue, 28 Feb 2017 14:13:32 +0000 (14:13 +0000)]
Merge "[AWARE] Data-path cipher API correction" am:
4ba6a7d3dd
am:
fad3b31234
Change-Id: I16d9887f2c82cdcff3dde282bd129232d456dc5a
Etan Cohen [Tue, 28 Feb 2017 14:11:02 +0000 (14:11 +0000)]
Merge "[AWARE] Data-path cipher API correction"
am:
4ba6a7d3dd
Change-Id: Ie9b3a5be561bd2f7db0218d4d5914527f1384c47
Etan Cohen [Tue, 28 Feb 2017 14:08:31 +0000 (14:08 +0000)]
Merge "[AWARE] Data-path cipher API correction"
Steven Moreland [Tue, 28 Feb 2017 04:06:03 +0000 (04:06 +0000)]
Bluetooth: move to vendor partition. am:
6ca34f1bf5
am:
677a7b30ce
Change-Id: I7c19abc6f7cc3d38128c4321403a79d0ca1d5a44
Steven Moreland [Tue, 28 Feb 2017 04:04:08 +0000 (04:04 +0000)]
Bluetooth: move to vendor partition.
am:
6ca34f1bf5
Change-Id: I7d34a8f43cced04d4359e0d8d6f0ed72cee71eb3
Steven Moreland [Mon, 27 Feb 2017 16:58:08 +0000 (08:58 -0800)]
Bluetooth: move to vendor partition.
Bug:
35328775
Test: works in both binderized and passthrough modes
Merged-In: I18f21b53c2282e27342a58716475ae213a2837d4
Change-Id: I18f21b53c2282e27342a58716475ae213a2837d4
Yifan Hong [Mon, 27 Feb 2017 18:52:28 +0000 (18:52 +0000)]
Merge "Add tests for .equals and toString" am:
7128746a9f
am:
cc51d3b2ae
Change-Id: I6d9393a4822eab544d6cf97e63691090e4f31e94
Yifan Hong [Mon, 27 Feb 2017 18:49:42 +0000 (18:49 +0000)]
Merge "Add tests for .equals and toString"
am:
7128746a9f
Change-Id: If5641d750e89f01408eb31dee18cef0aa115d5b3
Treehugger Robot [Mon, 27 Feb 2017 18:43:27 +0000 (18:43 +0000)]
Merge "Add tests for .equals and toString"
Steven Moreland [Sat, 25 Feb 2017 02:52:42 +0000 (02:52 +0000)]
Remove viral dependency on libhwbinder. am:
d28a3dce40
am:
444d759920
Change-Id: I33ed3e5e4ff9718aedbaddc9ac27b176d89e66d9
Steven Moreland [Sat, 25 Feb 2017 02:50:15 +0000 (02:50 +0000)]
Remove viral dependency on libhwbinder.
am:
d28a3dce40
Change-Id: I9d8e8c7c380cc0abc41370da3853ae288cada9f0
Etan Cohen [Wed, 22 Feb 2017 20:54:20 +0000 (12:54 -0800)]
[AWARE] Data-path cipher API correction
Data-path security is configured using a specific cipher
type - corrected error which specified a set of cipher
types.
Bug:
33552694
Test: unit tests and integration (sl4a) tests
Change-Id: I2f2d21ebf68bd63906e60b5af76c8808864a1b46
Steven Moreland [Fri, 24 Feb 2017 19:20:04 +0000 (11:20 -0800)]
Remove viral dependency on libhwbinder.
find hardware/interfaces -name Android.mk -exec sed -i -e '/libhwbinder
\\/d' {} \;
find hardware/interfaces -name Android.bp -exec sed -i -e
'/"libhwbinder"/d' {} \;
./hardware/interfaces/update-makefiles.sh
Test: everything links
Test: (sanity) booted marlin on internal master with these changes
Bug:
35710429
Change-Id: I6b0b5ae318422b7a9be17a19a79e039ffc0f9272
Myles Watson [Fri, 24 Feb 2017 01:50:11 +0000 (01:50 +0000)]
Merge "Bluetooth: Make HciPacketizer reusable" am:
c4c2793b01
am:
97603b7a9b
Change-Id: I473a94f925e15e507a5ca7c64d71a529d37709e8
Myles Watson [Fri, 24 Feb 2017 01:47:42 +0000 (01:47 +0000)]
Merge "Bluetooth: Make HciPacketizer reusable"
am:
c4c2793b01
Change-Id: I9612e7b5743ca0ce8e8271c6eb07e362ba0364a8
Treehugger Robot [Fri, 24 Feb 2017 01:44:15 +0000 (01:44 +0000)]
Merge "Bluetooth: Make HciPacketizer reusable"
Myles Watson [Thu, 23 Feb 2017 14:29:08 +0000 (06:29 -0800)]
Bluetooth: Make HciPacketizer reusable
Test: VtsHalBluetoothV1_0TargetTest passes
Change-Id: I480d156225af2a5dd879f47a897af0b01dab5663
Martijn Coenen [Thu, 23 Feb 2017 19:41:28 +0000 (19:41 +0000)]
Merge "Bluetooth: deal with framework going away." am:
09e49b0871
am:
a936e673d0
Change-Id: Id6134dd11869978d2f2f485ba3758873c47098dc
Martijn Coenen [Thu, 23 Feb 2017 19:41:18 +0000 (19:41 +0000)]
Merge "Nfc: deal with the framework going away." am:
26d788b376
am:
74f327f970
Change-Id: I4a79addd60fd26ce79a016853a5661ebeca31722
Amit Mahajan [Thu, 23 Feb 2017 19:40:45 +0000 (19:40 +0000)]
Create separate interface for oem hook. am:
3e68341169
am:
1fc7ce0f3b
Change-Id: I83b4df58e3f7809451fbee916ae645ecee98fec6
Martijn Coenen [Thu, 23 Feb 2017 19:39:00 +0000 (19:39 +0000)]
Merge "Bluetooth: deal with framework going away."
am:
09e49b0871
Change-Id: Ifbd4ba885725bcfde993667e1aebc4c33ddba51c
Martijn Coenen [Thu, 23 Feb 2017 19:38:50 +0000 (19:38 +0000)]
Merge "Nfc: deal with the framework going away."
am:
26d788b376
Change-Id: I8a14067da0500e47d8940288e0733d48b6fbae4d
Amit Mahajan [Thu, 23 Feb 2017 19:38:14 +0000 (19:38 +0000)]
Create separate interface for oem hook.
am:
3e68341169
Change-Id: Iaebf8274db7e91928db0dcd8bbc1597376fa14b7
Martijn Coenen [Thu, 23 Feb 2017 19:35:29 +0000 (19:35 +0000)]
Merge "Bluetooth: deal with framework going away."
Treehugger Robot [Thu, 23 Feb 2017 19:35:02 +0000 (19:35 +0000)]
Merge "Nfc: deal with the framework going away."
Amit Mahajan [Mon, 13 Feb 2017 23:04:36 +0000 (15:04 -0800)]
Create separate interface for oem hook.
Test: Basic telephony sanity
Bug:
32020264
Bug:
34344851
Merged-in: I8908ce0c6b380c8f4260703fa43125dc03d24dbc
Change-Id: I8908ce0c6b380c8f4260703fa43125dc03d24dbc
Martijn Coenen [Thu, 23 Feb 2017 16:24:20 +0000 (17:24 +0100)]
Nfc: deal with the framework going away.
By calling close() when the framework client dies.
Bug:
35624326
Test: NFC HAL stays alive and works after com.android.nfc is killed
Change-Id: I91fcf6685783cd630a44d19b4cb99127a2c0e89b
Martijn Coenen [Thu, 23 Feb 2017 16:25:18 +0000 (17:25 +0100)]
Bluetooth: deal with framework going away.
Bug:
35624326
Test: Bluetooth HAL stays alive and works after com.android.bluetooth
is killed.
Change-Id: Id5b5a5b88cd35202e5737a0c99d28db9bebb4250
Etan Cohen [Thu, 23 Feb 2017 16:48:01 +0000 (16:48 +0000)]
[AWARE] Correct ranging specification documentation am:
9dabc7cefe
am:
75b9cb715d
Change-Id: I4d716c10e33c01533e9287fc27143cb440e72f9a
Etan Cohen [Thu, 23 Feb 2017 16:46:02 +0000 (16:46 +0000)]
[AWARE] Correct ranging specification documentation
am:
9dabc7cefe
Change-Id: I8f23825a6d2561d0ab067162c3b7d5c8d0d376f7
Etan Cohen [Tue, 21 Feb 2017 22:31:06 +0000 (14:31 -0800)]
[AWARE] Correct ranging specification documentation
Bug:
33821639
Test: none - comment change
Change-Id: Ib2ba907a46c6cb34d37ca5eb6d3a22508fb7f17a
Roshan Pius [Thu, 23 Feb 2017 06:19:29 +0000 (06:19 +0000)]
Merge "wifi: Duplicate getValidChannelsForBand in AP iface" am:
d8328b6860
am:
d1ae25e423
Change-Id: I10268d2fa7fac6e6f55aa34535f60b60eaa0d415
Roshan Pius [Thu, 23 Feb 2017 06:17:28 +0000 (06:17 +0000)]
Merge "wifi: Duplicate getValidChannelsForBand in AP iface"
am:
d8328b6860
Change-Id: I619184ede20560f8f2209c95d948cd0e33066302
Treehugger Robot [Thu, 23 Feb 2017 06:15:07 +0000 (06:15 +0000)]
Merge "wifi: Duplicate getValidChannelsForBand in AP iface"
Roshan Pius [Thu, 23 Feb 2017 03:19:28 +0000 (03:19 +0000)]
Merge "supplicant(interface): Add set/get for eap private key id" am:
af0fb871c6
am:
d570e59b60
Change-Id: I62c6e9e3f3bc0b080b40bc0e7980872d142b025f
Roshan Pius [Thu, 23 Feb 2017 03:17:31 +0000 (03:17 +0000)]
Merge "supplicant(interface): Add set/get for eap private key id"
am:
af0fb871c6
Change-Id: If93b708b83f962426c3efcd4260216705e569ec5
Roshan Pius [Thu, 23 Feb 2017 03:13:54 +0000 (03:13 +0000)]
Merge "supplicant(interface): Add set/get for eap private key id"
Roshan Pius [Wed, 22 Feb 2017 17:48:03 +0000 (09:48 -0800)]
wifi: Duplicate getValidChannelsForBand in AP iface
This functionality is needed even for AP iface. So, duplicate this
method.
Changes in the CL:
1. Add getValidChannelsForBand() in IWifiApIface.
2. Rename StaBackgroundScanBan to WifiBand to make it a more generic
name.
3. Change the existing method name in IWifiStaIface to match with the
one in IWifiApIface.
While there,
Fix indentation in hidl_callback_util.h
Bug:
35663149
Test: Compiles
Change-Id: Iaeb6c323e13eedf2f98de92fea77e327c76ffa5b
Yifan Hong [Thu, 23 Feb 2017 00:07:33 +0000 (16:07 -0800)]
Add tests for .equals and toString
Test: hidl_test
Test: hidl_test_java
Bug:
32834072
Bug:
33459772
Change-Id: Ic1a87529fe5f8c12f7bfbdc2fa668e66922e075f
Tri Vo [Wed, 22 Feb 2017 20:49:00 +0000 (20:49 +0000)]
Remove .vts files. am:
7c04478044
am:
4ebeac1ee2
Change-Id: I0349740594499950da416a823b061cf1d174c171
Tri Vo [Wed, 22 Feb 2017 20:46:31 +0000 (20:46 +0000)]
Remove .vts files.
am:
7c04478044
Change-Id: Ia6ce31c3cc2d5ecb28fc7bc74447f937fdf7c5e1
Tri Vo [Wed, 22 Feb 2017 20:35:32 +0000 (20:35 +0000)]
Update makefiles. am:
69fa1faddd
am:
78cefb9454
Change-Id: I864adc8c149fa1d611e99bd8abf279047903304d
Tri Vo [Wed, 22 Feb 2017 20:33:30 +0000 (20:33 +0000)]
Update makefiles.
am:
69fa1faddd
Change-Id: If236c6a553cdcf0a0ae09e2e1fa1cc25a0c0b356
Tri Vo [Wed, 22 Feb 2017 18:50:57 +0000 (10:50 -0800)]
Remove .vts files.
Test: mmma hardware/interfaces
Change-Id: I583aced174d4295cccfdf48b76502077fb16f9db
Tri Vo [Wed, 22 Feb 2017 18:46:43 +0000 (10:46 -0800)]
Update makefiles.
Test: mmma hardware/interfaces
Change-Id: I501524fa3fbbaed9b71e5b9c3bbc8aa3c8c25896
Roshan Pius [Wed, 22 Feb 2017 16:56:23 +0000 (08:56 -0800)]
supplicant(interface): Add set/get for eap private key id
"private_key" field is not used in Android, we instead use the "key_id"
field. So, change the setter to reflect that.
Bug:
35663125
Test: Compiles
Change-Id: I3c01365fd90fd79cac2b99f9b9fe0bbea2226b59
Myles Watson [Wed, 22 Feb 2017 14:51:59 +0000 (14:51 +0000)]
Bluetooth: Simplify started check am:
5ea487bdce
am:
ffa6a38a42
Change-Id: Id1c7c08c929a96b531732177da9252822474bc6b
Myles Watson [Wed, 22 Feb 2017 14:49:59 +0000 (14:49 +0000)]
Bluetooth: Simplify started check
am:
5ea487bdce
Change-Id: I8d4ae4b5c1fc96809600a32c1b91ebfee8a23e8e
Myles Watson [Wed, 22 Feb 2017 00:53:34 +0000 (16:53 -0800)]
Bluetooth: Simplify started check
Test: Bluetooth starts/stops
Change-Id: Ib1777ac31d4a13d4221045fa3fa7d817a795f6f9
Myles Watson [Wed, 22 Feb 2017 04:12:57 +0000 (04:12 +0000)]
Merge "Bluetooth: Export AsyncFdWatcher for reuse" am:
4b9692ae04
am:
139cafe642
Change-Id: Ia11bbc412c6838e9ead06fd3a8ff7418665ec717
Myles Watson [Wed, 22 Feb 2017 04:10:56 +0000 (04:10 +0000)]
Merge "Bluetooth: Export AsyncFdWatcher for reuse"
am:
4b9692ae04
Change-Id: I5934277a3a48ccf32c44c244c68436207195fe3a
Treehugger Robot [Wed, 22 Feb 2017 04:06:51 +0000 (04:06 +0000)]
Merge "Bluetooth: Export AsyncFdWatcher for reuse"
Myles Watson [Wed, 22 Feb 2017 03:43:24 +0000 (03:43 +0000)]
Merge "Bluetooth: Check the return value of initialize()" am:
f570fedcd4
am:
e3bbdea832
Change-Id: Ic6d277f251bb8194330581a47896faa46f621911
Myles Watson [Wed, 22 Feb 2017 03:41:54 +0000 (03:41 +0000)]
Merge "Bluetooth: Check the return value of initialize()"
am:
f570fedcd4
Change-Id: I4451755b0d9994d96d78452bc51b0f0af6ab7ebd
Treehugger Robot [Wed, 22 Feb 2017 03:36:45 +0000 (03:36 +0000)]
Merge "Bluetooth: Check the return value of initialize()"
Tri Vo [Wed, 22 Feb 2017 03:07:55 +0000 (03:07 +0000)]
Remove .vts spec files. am:
81f9968c71
am:
bf4702ff68
Change-Id: Iec12e3ccdda062997c3cab6e3705a405a9d2dbf7
Tri Vo [Wed, 22 Feb 2017 03:06:24 +0000 (03:06 +0000)]
Remove .vts spec files.
am:
81f9968c71
Change-Id: I1f63ab0f3a60f9935807a2e5580a0593501e90d3
Myles Watson [Tue, 21 Feb 2017 21:27:01 +0000 (13:27 -0800)]
Bluetooth: Export AsyncFdWatcher for reuse
Test: Bluetooth starts/stops
Change-Id: I1dcd8684fd150b5eb27c75e5d7803070009e0bf5
Tri Vo [Fri, 17 Feb 2017 23:00:22 +0000 (15:00 -0800)]
Remove .vts spec files.
Test: mmma hardware/interfaces
Change-Id: Iabbcd336d37ceb58ea4cc649ee5c104424494513
Tri Vo [Tue, 21 Feb 2017 23:40:08 +0000 (23:40 +0000)]
Merge "Update .vts files." am:
5fcb802c84
am:
46481011b0
Change-Id: I3c260fd8f2b430c4c163f6fd2109e6493cd9e810
Tri Vo [Tue, 21 Feb 2017 23:36:37 +0000 (23:36 +0000)]
Merge "Update .vts files."
am:
5fcb802c84
Change-Id: Ia405e371738c66d166c4838a7953fd7beb9353ca
Treehugger Robot [Tue, 21 Feb 2017 23:28:42 +0000 (23:28 +0000)]
Merge "Update .vts files."
Etan Cohen [Tue, 21 Feb 2017 22:52:03 +0000 (22:52 +0000)]
Merge "[AWARE] Add service support for SDEA service info" am:
c8b34b1c2c
am:
aac3de67d3
Change-Id: I581633ef0b6393a281b2ca3c47ba85b0743760c2
Etan Cohen [Tue, 21 Feb 2017 22:50:03 +0000 (22:50 +0000)]
Merge "[AWARE] Add service support for SDEA service info"
am:
c8b34b1c2c
Change-Id: I433a08ac78cbf565f7c82d70dda0461f4fb2d67d
Etan Cohen [Tue, 21 Feb 2017 22:47:25 +0000 (22:47 +0000)]
Merge "[AWARE] Add service support for SDEA service info"
Tri Vo [Tue, 21 Feb 2017 21:53:03 +0000 (13:53 -0800)]
Update .vts files.
Test: make vts
Change-Id: Ie8526df051b631797b9f9b75acbeab8807f904d7
Miao Wang [Tue, 21 Feb 2017 21:14:03 +0000 (21:14 +0000)]
Merge changes from topic 'rs_hidl_impl' am:
e43d46f059
am:
a77e9c6399
Change-Id: Iac7c22c33979ec5b2881af9f03f91b6fef8c950b
Miao Wang [Tue, 21 Feb 2017 21:14:01 +0000 (21:14 +0000)]
RenderScript HIDL HAL definition and server-side implementation. am:
b78b2f4ee6
am:
14368080be
Change-Id: I88d58f5832e1aa5d8d6be0815224d0eccb455672
Miao Wang [Tue, 21 Feb 2017 21:12:06 +0000 (21:12 +0000)]
Merge changes from topic 'rs_hidl_impl'
am:
e43d46f059
Change-Id: Ie5c9182f95644013ed452ee0c485b9db9d927453
Miao Wang [Tue, 21 Feb 2017 21:12:02 +0000 (21:12 +0000)]
RenderScript HIDL HAL definition and server-side implementation.
am:
b78b2f4ee6
Change-Id: I4f8e553b08e8a3d86c13d9b2704cf93bb44d9ef7
Miao Wang [Tue, 21 Feb 2017 21:07:29 +0000 (21:07 +0000)]
Merge changes from topic 'rs_hidl_impl'
* changes:
Fix mips-related build breakage.
RenderScript HIDL HAL definition and server-side implementation.
Etan Cohen [Fri, 17 Feb 2017 21:46:19 +0000 (13:46 -0800)]
[AWARE] Add service support for SDEA service info
Wire-up the SDEA service info (aka Extended Service Specific
Info) to the newly available legacy HAL.
Bug:
35193423
Test: integration (sl4a) tests
Change-Id: I2cbd82ecc4274c5137693dde34370f2b68646e19
Stephen Hines [Fri, 17 Feb 2017 12:10:11 +0000 (04:10 -0800)]
Fix mips-related build breakage.
Bug: http://b/
34396220
Test: Builds successfully.
MIPS targets predefine _mips to 1, which will conflict with the _mips
variable name that was being used in the HAL here. Rename it to _amips
instead, so that it won't conflict.
Merged-In: Id13f34b740959852dff600259e3405eb72d0983a
Change-Id: Id13f34b740959852dff600259e3405eb72d0983a
Miao Wang [Fri, 20 Jan 2017 18:30:38 +0000 (10:30 -0800)]
RenderScript HIDL HAL definition and server-side implementation.
Contains the definition and implementation of the HAL.
Bug:
34396220
Test: mm, all cts tests pass on bullhead and sailfish
Merged-In: Ic560efef34f647f441c32ba01ca29d83a3d98b69
Change-Id: Ic560efef34f647f441c32ba01ca29d83a3d98b69
Etan Cohen [Tue, 21 Feb 2017 17:58:55 +0000 (17:58 +0000)]
[AWARE] Ranging as a service discovery constraint am:
c190f93111
am:
352cd441ae
Change-Id: I510c4ab3174a815914e9b58458fe698bb1b9903f
Etan Cohen [Tue, 21 Feb 2017 17:58:45 +0000 (17:58 +0000)]
Merge "[AWARE] Add capability info: max subscribe addresses" am:
2bfad0cf82
am:
1265f81d3d
Change-Id: Ieeee69556c5d4462cc1b721075498d6cbf6721f9
Etan Cohen [Tue, 21 Feb 2017 17:56:35 +0000 (17:56 +0000)]
[AWARE] Ranging as a service discovery constraint
am:
c190f93111
Change-Id: Id3efd99d3f7846c1a13cda30608b8818df656337
Etan Cohen [Tue, 21 Feb 2017 17:56:23 +0000 (17:56 +0000)]
Merge "[AWARE] Add capability info: max subscribe addresses"
am:
2bfad0cf82
Change-Id: I8516b98c1c989d11b45e4f3058d217fd22c5dff5
Myles Watson [Fri, 17 Feb 2017 17:14:21 +0000 (09:14 -0800)]
Bluetooth: Check the return value of initialize()
Test: Test fails gracefully when initialize() fails
Change-Id: Iff7737ba911635e9974612d8d192b783cf3e213d
Etan Cohen [Fri, 17 Feb 2017 21:06:55 +0000 (13:06 -0800)]
[AWARE] Ranging as a service discovery constraint
Ranging configuration modification: change from an
overall Aware configuration (remove from Enable/Config
structures) to a discovery session-specific configuration.
Bug:
33821639
Test: integrated (sl4a) tests
Change-Id: Ie5a8bb3701a5dd6186c15d2be16bca3ec7202f04
Etan Cohen [Tue, 21 Feb 2017 05:47:02 +0000 (05:47 +0000)]
Merge "[AWARE] Add capability info: max subscribe addresses"
Roshan Pius [Sat, 18 Feb 2017 16:43:29 +0000 (16:43 +0000)]
Merge "wifi(implementation): Callback death handler" am:
10b0e0880c
am:
00176aff3d
Change-Id: I9bc0ed731b2e87c54105371da422c6f0a669bc28
Roshan Pius [Sat, 18 Feb 2017 16:39:59 +0000 (16:39 +0000)]
Merge "wifi(implementation): Callback death handler"
am:
10b0e0880c
Change-Id: I4b997550a6307cd13d79a4627b0725b22b65b0e6
Treehugger Robot [Sat, 18 Feb 2017 16:36:34 +0000 (16:36 +0000)]
Merge "wifi(implementation): Callback death handler"
Roshan Pius [Sat, 18 Feb 2017 03:49:06 +0000 (03:49 +0000)]
Merge "wpa_supplicant(interface): Add bssid to WNM callbacs" am:
7748aa1f5d
am:
8c24a719d2
Change-Id: I57f8b3ae837e8d2d3abdb5d03d6e174dd099a255
Roshan Pius [Sat, 18 Feb 2017 03:47:07 +0000 (03:47 +0000)]
Merge "wpa_supplicant(interface): Add bssid to WNM callbacs"
am:
7748aa1f5d
Change-Id: Ibe549f938b4293e299fa8ddf02ac9a7037d6cdec
Treehugger Robot [Sat, 18 Feb 2017 03:43:52 +0000 (03:43 +0000)]
Merge "wpa_supplicant(interface): Add bssid to WNM callbacs"
Zhuoyao Zhang [Sat, 18 Feb 2017 00:13:14 +0000 (00:13 +0000)]
Update the test binary and source file name. am:
f7693eed97
am:
a266d7bdeb
Change-Id: Ie6aba9314dca831fd80d022cfa79c38ac25a6544
Zhuoyao Zhang [Sat, 18 Feb 2017 00:09:24 +0000 (00:09 +0000)]
Update the test binary and source file name.
am:
f7693eed97
Change-Id: If5289d134a396eba76c5ac8ade133ae3576bf506
Zhuoyao Zhang [Thu, 16 Feb 2017 22:58:55 +0000 (14:58 -0800)]
Update the test binary and source file name.
* To confirm with Vts naming convention.
Bug:
35273456
Test: mma
Change-Id: Ide6d9d15618e65d8cb74363f3a8acd52609cd0dd
Sanket Padawe [Fri, 17 Feb 2017 02:41:32 +0000 (02:41 +0000)]
Merge "Fix build because of addition of new Radio API to VTS." am:
801f78cc05 am:
c75e2f8d6b
am:
cde49bb624
Change-Id: I35601ea85ab1afdd254ecc0ba1ac1b3c2094bba2
Etan Cohen [Thu, 16 Feb 2017 21:02:43 +0000 (13:02 -0800)]
[AWARE] Add capability info: max subscribe addresses
Add capability to provide maximum number of subscribe
addresses that can be specified in a discovery session
configuration.
Bug:
34059183
Test: integration (sl4a) tests pass
Change-Id: I5aa875cf8f43a7ad215b52e2cf917dfbbb3b1195
Sanket Padawe [Fri, 17 Feb 2017 02:37:01 +0000 (02:37 +0000)]
Merge "Fix build because of addition of new Radio API to VTS." am:
801f78cc05
am:
c75e2f8d6b
Change-Id: I543eabe7db997a0cba87b250fbcd4566455351a7
Sanket Padawe [Fri, 17 Feb 2017 02:32:32 +0000 (02:32 +0000)]
Merge "Fix build because of addition of new Radio API to VTS."
am:
801f78cc05
Change-Id: Ia15071f76ea9a39088029dc9610a4d9aa780e0d7
Sanket Padawe [Fri, 17 Feb 2017 02:26:01 +0000 (02:26 +0000)]
Merge "Fix build because of addition of new Radio API to VTS."
Roshan Pius [Fri, 17 Feb 2017 02:02:42 +0000 (18:02 -0800)]
wpa_supplicant(interface): Add bssid to WNM callbacs
Also,
Renamed the other HS2.0 callback param to |bssid|.
Bug:
35444886
Test: Compiles
Change-Id: Ic1b3f7c92fe2a9d25651c682534270e527506d88
Etan Cohen [Fri, 17 Feb 2017 02:15:41 +0000 (02:15 +0000)]
Merge "[AWARE] Update comments on transmit followup status codes" am:
2eff5c85fe am:
6083ae3a53
am:
9d54798e4b
Change-Id: If1785ca58a770e5554cbc6b18d744c914478225e
Sanket Padawe [Fri, 17 Feb 2017 02:11:34 +0000 (18:11 -0800)]
Fix build because of addition of new Radio API to VTS.
Test: Tested build success. mma over hardware/interfaces/radio/1.0/vts
Change-Id: Ie4258573367c7448b1689010492c34e03124384d
Etan Cohen [Fri, 17 Feb 2017 02:11:09 +0000 (02:11 +0000)]
Merge "[AWARE] Update comments on transmit followup status codes" am:
2eff5c85fe
am:
6083ae3a53
Change-Id: Ia3e184832465c0a476307ab4dc4d2cbb37d8aa61
Etan Cohen [Fri, 17 Feb 2017 02:07:08 +0000 (02:07 +0000)]
Merge "[AWARE] Update comments on transmit followup status codes"
am:
2eff5c85fe
Change-Id: If40151454a51d0b41bfaa0adb74f291a98fb2770