OSDN Git Service
TreeHugger Robot [Wed, 15 Feb 2017 18:47:47 +0000 (18:47 +0000)]
Merge "Remove coverage flags from tests."
Etan Cohen [Wed, 15 Feb 2017 15:09:01 +0000 (15:09 +0000)]
Merge "[AWARE] Correct comment on Discovery Window usage" am:
751dc694a4 am:
224d83b432 am:
a0e225ec89
am:
00536359a3
Change-Id: Ie971d01fc5b4201aad51f2943fcd4a165b2eb26a
Etan Cohen [Wed, 15 Feb 2017 15:05:07 +0000 (15:05 +0000)]
Merge "[AWARE] Correct comment on Discovery Window usage" am:
751dc694a4 am:
224d83b432
am:
a0e225ec89
Change-Id: Ic43f3be2129e6e6da66850486123a39e48bee571
Etan Cohen [Wed, 15 Feb 2017 15:01:36 +0000 (15:01 +0000)]
Merge "[AWARE] Correct comment on Discovery Window usage" am:
751dc694a4
am:
224d83b432
Change-Id: I59901d50215f7362f5769b4c9ae8225921e6d643
Etan Cohen [Wed, 15 Feb 2017 14:58:06 +0000 (14:58 +0000)]
Merge "[AWARE] Correct comment on Discovery Window usage"
am:
751dc694a4
Change-Id: I96a0b00713d01cb4a587a8ba44833c2a5f1a2cf0
Etan Cohen [Wed, 15 Feb 2017 14:52:51 +0000 (14:52 +0000)]
Merge "[AWARE] Correct comment on Discovery Window usage"
Dan Willemsen [Wed, 15 Feb 2017 05:20:54 +0000 (05:20 +0000)]
Merge "Remove --coverage in Android.bp" am:
8cd0125d2e am:
6439f344ad am:
b7046d211d
am:
bca7f2db08
Change-Id: I2d78476add5792361f6d1e786fac80a6c30f0be8
Dan Willemsen [Wed, 15 Feb 2017 05:17:30 +0000 (05:17 +0000)]
Merge "Remove --coverage in Android.bp" am:
8cd0125d2e am:
6439f344ad
am:
b7046d211d
Change-Id: I29044eba5da1c72a5e8a14d97617a1d1db3b0adc
Dan Willemsen [Wed, 15 Feb 2017 05:14:30 +0000 (05:14 +0000)]
Merge "Remove --coverage in Android.bp" am:
8cd0125d2e
am:
6439f344ad
Change-Id: I8a5f2071751984ff0ce400968d49781b247a5977
Dan Willemsen [Wed, 15 Feb 2017 05:11:30 +0000 (05:11 +0000)]
Merge "Remove --coverage in Android.bp"
am:
8cd0125d2e
Change-Id: I64c14bbb96b132b3b26d6d61a11e4c8cf84bd161
Treehugger Robot [Wed, 15 Feb 2017 05:08:16 +0000 (05:08 +0000)]
Merge "Remove --coverage in Android.bp"
Ashutosh Joshi [Wed, 15 Feb 2017 02:51:02 +0000 (02:51 +0000)]
Merge "Fix shim layer bugs for Sensors HIDL wrapper."
Ryan Campbell [Wed, 15 Feb 2017 00:50:34 +0000 (16:50 -0800)]
Remove coverage flags from tests.
Remove unnecessary coverage flags from HAL tests.
Bug:
32749731
Test: none
Change-Id: I7e4e3bce2d9d444bfa8475c140bce2ee7e3b0c0d
Jeff Tinker [Tue, 14 Feb 2017 21:53:14 +0000 (21:53 +0000)]
Merge "Revert "Enable loading of treble-based plugins""
Etan Cohen [Tue, 14 Feb 2017 21:51:11 +0000 (13:51 -0800)]
[AWARE] Correct comment on Discovery Window usage
Clarify that DW period specification on discovery session
does not override the overall system DW period specification
(if one is provided).
Bug:
35040192
Test: none - comment fix
Change-Id: Ia7c495f1cd50a4bce0ffbaf242e52bc4f110eef2
Jeff Tinker [Tue, 14 Feb 2017 21:04:31 +0000 (21:04 +0000)]
Revert "Enable loading of treble-based plugins"
bug:
35329920
Tests: Verfied playback on Ryu with Play Movies in combination with
ag/
1907708, ag/
1909159
This reverts commit
fbf365037014e81711611384aeee9469590210f6.
Change-Id: I4a35a329b24e4cd9efcff4fe84e9d8901c714d57
Ashutosh Joshi [Mon, 13 Feb 2017 20:52:14 +0000 (12:52 -0800)]
Fix shim layer bugs for Sensors HIDL wrapper.
i) Increase the number of default threads to 2.
ii) Handle the flush complete event correctly.
Bug:
35189074
Bug:
35067266
Test: Test that sensors work in both binderized and passthrough modes.
Ensure that camera photosphere works.
Change-Id: Ic8dadf03395b4e96092ae962cf790c93d65a1c8d
Zhuoyao Zhang [Tue, 14 Feb 2017 18:51:26 +0000 (18:51 +0000)]
Merge "Update .vts files on master based on the latest .hal file and hidl-gen"
Yin-Chia Yeh [Tue, 14 Feb 2017 18:17:37 +0000 (18:17 +0000)]
Merge "Camera: Fix ION buffer leaks"
Asaf Rosenfeld [Tue, 14 Feb 2017 16:45:36 +0000 (16:45 +0000)]
Merge "update vms hal index"
TreeHugger Robot [Tue, 14 Feb 2017 13:00:59 +0000 (13:00 +0000)]
Merge "Have generateKey() treat additional entropy as optional"
Bartosz Fabianowski [Mon, 13 Feb 2017 15:50:24 +0000 (16:50 +0100)]
Have generateKey() treat additional entropy as optional
KeyStore.generateKey() takes an entropy parameter. This is optional
and can be null. That is how KeyStore used to work but a recent
refactor made us always feed the entropy to keymaster, even if it
is empty (null or byte[0] on the Java side). This CL makes us ignore
such empty entropy again.
We only noticed this because a recently added GTS test that happens
to set the entropy to null is failing on some hardware (other
keymaster implementations silently ignore this invalid attempt to
set entropy).
Bug:
35156555
Test: gts-tradefed run gts --module GtsGmscoreHostTestCases
--test com.google.android.gts.security.DeviceIdAttestationHostTest
Change-Id: Iadaf40e69350c17dd18e4dc2a1dab97fa911e1bf
Emilian Peev [Mon, 13 Feb 2017 15:26:00 +0000 (15:26 +0000)]
Camera: Fix ION buffer leaks
Native buffer handles should always get closed
and deleted during buffer release.
BUG:
35338606
Test: Manual using application
Change-Id: I5d7a4b02a28b29b872b66843d623166f04207c2e
asafro [Mon, 13 Feb 2017 19:30:10 +0000 (11:30 -0800)]
update vms hal index
Test: tested in VmsServiceHal tests (new test in a separate cl)
Bug:
35313387
Change-Id: I18379fed2b8e59b21cfe732e3a81f63e611cdd36
Myles Watson [Tue, 14 Feb 2017 02:22:13 +0000 (02:22 +0000)]
Merge "Bluetooth: Add CHECK and move ASSERT" am:
b835ea3f11 am:
028ce01354 am:
4bbcb8f41e
am:
93df786d5e
Change-Id: I74bba26880c4f30d869d6f142d4ac83820452594
Myles Watson [Tue, 14 Feb 2017 02:20:43 +0000 (02:20 +0000)]
Merge "Bluetooth: Add CHECK and move ASSERT" am:
b835ea3f11 am:
028ce01354
am:
4bbcb8f41e
Change-Id: Id503d07ba2adeef890882df2f686635abc7749d9
Myles Watson [Tue, 14 Feb 2017 02:18:43 +0000 (02:18 +0000)]
Merge "Bluetooth: Add CHECK and move ASSERT" am:
b835ea3f11
am:
028ce01354
Change-Id: Ia432ecc1676f926a157eb6b978990c19814f2aa4
Myles Watson [Tue, 14 Feb 2017 02:16:43 +0000 (02:16 +0000)]
Merge "Bluetooth: Add CHECK and move ASSERT"
am:
b835ea3f11
Change-Id: I37ab797a98e3b126771de6aa6104b65dd3cab55a
TreeHugger Robot [Tue, 14 Feb 2017 02:16:16 +0000 (02:16 +0000)]
Merge "fix a sign-compare warning and use -Wall"
Treehugger Robot [Tue, 14 Feb 2017 02:09:59 +0000 (02:09 +0000)]
Merge "Bluetooth: Add CHECK and move ASSERT"
Zhuoyao Zhang [Tue, 14 Feb 2017 02:03:06 +0000 (18:03 -0800)]
Update .vts files on master based on the latest .hal file and hidl-gen
Test: mma
Change-Id: I9558f300505db83e26f7c241c5cf729cd005a07b
Steven Moreland [Tue, 14 Feb 2017 01:22:16 +0000 (01:22 +0000)]
Move hidl shims to the vendor partition. am:
46c0b94992 am:
0a9133b271 am:
0c5f363811
am:
88db3fc412 -s ours
Change-Id: I00fecf0cd7eb51d6e5fca57664a70411706996c5
Steven Moreland [Tue, 14 Feb 2017 01:19:15 +0000 (01:19 +0000)]
Move hidl shims to the vendor partition. am:
46c0b94992 am:
0a9133b271
am:
0c5f363811
Change-Id: Icdf33f1473013ecba1d70ebcb1d85641024b3213
Steven Moreland [Tue, 14 Feb 2017 01:17:16 +0000 (01:17 +0000)]
Move hidl shims to the vendor partition. am:
46c0b94992
am:
0a9133b271
Change-Id: Ibe01a4a070c612b86fb31c0543695df5da924624
Steven Moreland [Tue, 14 Feb 2017 01:15:08 +0000 (01:15 +0000)]
Move hidl shims to the vendor partition.
am:
46c0b94992
Change-Id: I9f508ce24e07a1d78eac3bea94a21a45a8b2cd81
Steven Moreland [Thu, 12 Jan 2017 21:33:16 +0000 (13:33 -0800)]
Move hidl shims to the vendor partition.
We need google shims on the vendor partition because they are providing
an implementation of a vendor defined interface. They were written by
google just as a courtesy/to make the transition easier. They're
basically a set for vendors to assemble their hal implementations
from.
Bug:
34135607
Test: marlin persist.hal.binderization on/off
Merged-In: I3f86c77c147514fe470f08088a66de312ae32d4e
Change-Id: I3f86c77c147514fe470f08088a66de312ae32d4e
Steven Moreland [Mon, 13 Feb 2017 17:59:06 +0000 (09:59 -0800)]
Move hidl shims to the vendor partition. (2/2)
We need google shims on the vendor partition because they are providing
an implementation of a vendor defined interface. They were written by
google just as a courtesy/to make the transition easier. They're
basically a set for vendors to assemble their hal implementations
from.
Bug:
34135607
Test: marlin persist.hal.binderization on/off
Change-Id: I2e2af5af39264cf290259755bb9b2eb9827a21f5
Steven Moreland [Thu, 12 Jan 2017 21:33:16 +0000 (13:33 -0800)]
Move hidl shims to the vendor partition.
We need google shims on the vendor partition because they are providing
an implementation of a vendor defined interface. They were written by
google just as a courtesy/to make the transition easier. They're
basically a set for vendors to assemble their hal implementations
from.
Bug:
34135607
Test: marlin persist.hal.binderization on/off
Change-Id: I3f86c77c147514fe470f08088a66de312ae32d4e
Roshan Pius [Mon, 13 Feb 2017 21:41:22 +0000 (21:41 +0000)]
Merge changes Ieee26013,I275bba11,I7e7258e7,I88111181 am:
3646298ab6 am:
b853615e6e am:
f404487631
am:
4ffdf9c3a0
Change-Id: Ib9e28840ac6a6c7b4667ff037e80f0219f8307b8
Roshan Pius [Mon, 13 Feb 2017 21:38:54 +0000 (21:38 +0000)]
Merge changes Ieee26013,I275bba11,I7e7258e7,I88111181 am:
3646298ab6 am:
b853615e6e
am:
f404487631
Change-Id: I29a4bb5ff276182e2864a29daabec396c2df8ee0
Roshan Pius [Mon, 13 Feb 2017 21:36:24 +0000 (21:36 +0000)]
Merge changes Ieee26013,I275bba11,I7e7258e7,I88111181 am:
3646298ab6
am:
b853615e6e
Change-Id: Id42bcb5657613884386b1b978d6931511425c49e
Roshan Pius [Mon, 13 Feb 2017 21:33:59 +0000 (21:33 +0000)]
Merge changes Ieee26013,I275bba11,I7e7258e7,I88111181
am:
3646298ab6
Change-Id: Ica61adc41d15404f2998002f4c950a0b3ddc8296
Roshan Pius [Mon, 13 Feb 2017 21:25:38 +0000 (21:25 +0000)]
Merge changes Ieee26013,I275bba11,I7e7258e7,I88111181
* changes:
supplicant(interface): Remove redundant callbacks
wifi(implementation): Copy the user complete callback by value
wifi(implementation): Add status check for all cb invocation
wifi(implementation): Add global lock
Roshan Pius [Fri, 27 Jan 2017 21:32:03 +0000 (13:32 -0800)]
supplicant(interface): Remove redundant callbacks
The information broadcast via these callbacks are already available via
other callbacks.
1. All of the onProvisionDiscovery* callback data can be retrieved via the
|onProvisionDiscoveryCompleted| callback.
2. OnAssociated & onConnected callbacks data can retrieved via the
onStateChanges callback.
Bug:
34221586
Test: ./hardware/interfaces/update-makefiles.sh
Change-Id: Ieee26013dfda7a9be41a80e98ff1537da16b3466
Roshan Pius [Thu, 2 Feb 2017 17:54:27 +0000 (09:54 -0800)]
wifi(implementation): Copy the user complete callback by value
The callback object may go out of scope by the time it's invoked. So,
make a copy of it. We're doing the same for the other user callbacks
received in this class.
Bug:
34930275
Test: Compiles
Change-Id: I275bba11ae8735a21514d871e8aa473f92f0fd7d
Myles Watson [Mon, 13 Feb 2017 18:57:47 +0000 (10:57 -0800)]
Bluetooth: Add CHECK and move ASSERT
Test: bluetooth_hidl_hal_test passes
Change-Id: Ib857265204d39ffb54afc6f589fdc1b852362a97
Steven Moreland [Mon, 13 Feb 2017 19:22:47 +0000 (19:22 +0000)]
Merge "example-light HAL uses "default" service name"
Zhuoyao Zhang [Mon, 13 Feb 2017 19:21:04 +0000 (19:21 +0000)]
Merge "Update vts files on aosp." am:
248e3932fe am:
848e5db57f am:
832e7bd89a
am:
47497a0536
Change-Id: I2a66a8ef82ce6d93ad8ab274832dd3fdb15a0f95
Zhuoyao Zhang [Mon, 13 Feb 2017 19:17:51 +0000 (19:17 +0000)]
Merge "Update vts files on aosp." am:
248e3932fe am:
848e5db57f
am:
832e7bd89a
Change-Id: If86e71c6f1d99c3a4cd37adf320c2598621c30e9
Zhuoyao Zhang [Mon, 13 Feb 2017 19:15:20 +0000 (19:15 +0000)]
Merge "Update vts files on aosp." am:
248e3932fe
am:
848e5db57f
Change-Id: Ie29071455c9ca3cf1a7293972347cbc6c9a9f9f1
Zhuoyao Zhang [Mon, 13 Feb 2017 19:12:36 +0000 (19:12 +0000)]
Merge "Update vts files on aosp."
am:
248e3932fe
Change-Id: I147799a7b93d100a5340aa0150540f6b6142e72e
Amit Mahajan [Mon, 13 Feb 2017 19:12:25 +0000 (19:12 +0000)]
Merge "Add missing response function." am:
6267062af5 am:
b3e6021641 am:
63ab2b318b
am:
f6f5316460 -s ours
Change-Id: I3dc67d3d85656f768d2acedb24b87a97655c92ba
Amit Mahajan [Mon, 13 Feb 2017 19:09:54 +0000 (19:09 +0000)]
Merge "Add missing response function." am:
6267062af5 am:
b3e6021641
am:
63ab2b318b
Change-Id: I4c499d60c5ac213fe6d351dce98f4d587d6bccdf
Zhuoyao Zhang [Mon, 13 Feb 2017 19:09:47 +0000 (19:09 +0000)]
Merge "Update vts files on aosp."
Amit Mahajan [Mon, 13 Feb 2017 19:06:53 +0000 (19:06 +0000)]
Merge "Add missing response function." am:
6267062af5
am:
b3e6021641
Change-Id: I0ee6a5540ccbd40c6c11b4f42b8d6cae26629da4
Amit Mahajan [Mon, 13 Feb 2017 19:04:24 +0000 (19:04 +0000)]
Merge "Add missing response function."
am:
6267062af5
Change-Id: I47995ad80fe34a54a7346a92957a3d3219842188
Amit Mahajan [Mon, 13 Feb 2017 19:00:19 +0000 (19:00 +0000)]
Merge "Add missing response function."
TreeHugger Robot [Mon, 13 Feb 2017 11:18:28 +0000 (11:18 +0000)]
Merge "Camera: Delete streams after successful configuration"
Zhuoyao Zhang [Tue, 24 Jan 2017 21:33:21 +0000 (13:33 -0800)]
Update vts files on aosp.
* Based on the latest hidl-gen and .hal files.
Test: mma
make vts.
Change-Id: I4765450d985afd552fe720d91b9ab3422f5b7a47
Roshan Pius [Tue, 31 Jan 2017 01:07:42 +0000 (17:07 -0800)]
wifi(implementation): Add status check for all cb invocation
Bug:
34820508
Test: Compiles
Change-Id: I7e7258e782142bae7373fa0543e6c17184b043a9
Roshan Pius [Tue, 31 Jan 2017 00:40:50 +0000 (16:40 -0800)]
wifi(implementation): Add global lock
Add a global lock to address synchronization issues between the main
HIDL method servicing thread and the legacy HAL's event loop thread.
Also, added some documentation for the threading model used.
Bug:
34261034
Test: Compiles
Change-Id: I881111814ff5ebd601d6a4c85cf284b30ae47ed3
Etan Cohen [Sat, 11 Feb 2017 04:49:32 +0000 (04:49 +0000)]
Merge "[WIFI] Update VTS generated file" am:
96518722ee am:
189e70056b am:
7a93784f05
am:
8330ff9553
Change-Id: I9cb8156773d03fa6b0be9af7fad63f9f35c0a551
Etan Cohen [Sat, 11 Feb 2017 04:47:01 +0000 (04:47 +0000)]
Merge "[WIFI] Update VTS generated file" am:
96518722ee am:
189e70056b
am:
7a93784f05
Change-Id: Iee6d5141fd406484b789be5d4387251851ca8312
Etan Cohen [Sat, 11 Feb 2017 04:44:53 +0000 (04:44 +0000)]
Merge "[WIFI] Update VTS generated file" am:
96518722ee
am:
189e70056b
Change-Id: I8e825299c906dc23383bf6ea8d9758aff40a043c
Etan Cohen [Sat, 11 Feb 2017 04:42:01 +0000 (04:42 +0000)]
Merge "[WIFI] Update VTS generated file"
am:
96518722ee
Change-Id: I7b5b59f05b422d8f453fe89162908f4340b211a6
Etan Cohen [Sat, 11 Feb 2017 04:38:05 +0000 (04:38 +0000)]
Merge "[WIFI] Update VTS generated file"
Keun Soo Yim [Sat, 11 Feb 2017 03:36:53 +0000 (19:36 -0800)]
fix a sign-compare warning and use -Wall
Test: mma
Bug:
34901468
Change-Id: If68c1540a88ea28987fb7359a0ee01cf45263579
Etan Cohen [Sat, 11 Feb 2017 02:11:19 +0000 (18:11 -0800)]
[WIFI] Update VTS generated file
Large churn in files - seems to be mostly driven
by changes in generated code as opposed to HAL
changes.
Bug:
33459306
Test: build + vts-tradefed run commandAndExit vts --module=HalWifiHidlTargetTest
Change-Id: I1762a24108f9119dbc9c6807d6a2870f016a26d9
Amit Mahajan [Wed, 1 Feb 2017 01:00:26 +0000 (17:00 -0800)]
Add missing response function.
Test: None; only interface change.
Bug:
32020264
Merged-in: I28638f9371a6b09d72862a13a15d5f7e319d9337
Change-Id: I28638f9371a6b09d72862a13a15d5f7e319d9337
Etan Cohen [Sat, 11 Feb 2017 01:09:53 +0000 (01:09 +0000)]
Merge "[AWARE] Update capabilties" am:
10569b1bb4 am:
dbaff93416 am:
95e7e5a098
am:
a5bc4c820a
Change-Id: I7f29a28fd55af6e2d2d2a45cb8002df597ac0396
Etan Cohen [Sat, 11 Feb 2017 01:07:31 +0000 (01:07 +0000)]
Merge "[AWARE] Update capabilties" am:
10569b1bb4 am:
dbaff93416
am:
95e7e5a098
Change-Id: I6022b5763984280d148804d0364bd4cf89bf45f6
Etan Cohen [Sat, 11 Feb 2017 01:05:02 +0000 (01:05 +0000)]
Merge "[AWARE] Update capabilties" am:
10569b1bb4
am:
dbaff93416
Change-Id: I874de1d8668ea0df50d0c84357469e719841c4f8
Etan Cohen [Sat, 11 Feb 2017 01:02:32 +0000 (01:02 +0000)]
Merge "[AWARE] Update capabilties"
am:
10569b1bb4
Change-Id: Ica1d8beff6fd7063751cc9b22c841038a2cfa510
Etan Cohen [Sat, 11 Feb 2017 00:58:35 +0000 (00:58 +0000)]
Merge "[AWARE] Update capabilties"
Yifan Hong [Fri, 10 Feb 2017 23:47:13 +0000 (23:47 +0000)]
Merge "Add tests for minor version upgrade enforcement." am:
ea8ff054fa am:
af52b48490 am:
2e14b7cc0f
am:
982f85242c
Change-Id: Ie391c983761cd540775abe2e2d72feeeaa2ec5de
Yifan Hong [Fri, 10 Feb 2017 23:44:42 +0000 (23:44 +0000)]
Merge "Add tests for minor version upgrade enforcement." am:
ea8ff054fa am:
af52b48490
am:
2e14b7cc0f
Change-Id: Ia0c520eb080e02b0b51d86b0c8f88da2cbe1c429
Yifan Hong [Fri, 10 Feb 2017 23:42:42 +0000 (23:42 +0000)]
Merge "Add tests for minor version upgrade enforcement." am:
ea8ff054fa
am:
af52b48490
Change-Id: Idad63da1d39457f14bdbf3e087d36d7fd1fe5f6c
Yifan Hong [Fri, 10 Feb 2017 23:40:12 +0000 (23:40 +0000)]
Merge "Add tests for minor version upgrade enforcement."
am:
ea8ff054fa
Change-Id: I6538ac98fa28f6f9c08d45a2cedfb8764acbc9ef
Yifan Hong [Fri, 10 Feb 2017 23:38:01 +0000 (23:38 +0000)]
Merge "Add tests for minor version upgrade enforcement."
Android Build Merger (Role) [Fri, 10 Feb 2017 23:26:04 +0000 (23:26 +0000)]
Merge "Merge "[AWARE] Add support for Subscribe Service ID List Attribute" am:
11cea0d4a3 am:
a80d8de804 am:
98bd5591b6 am:
3b6de6e6db"
TreeHugger Robot [Fri, 10 Feb 2017 23:25:52 +0000 (23:25 +0000)]
Merge "Update makefiles to use filgroup syntax."
Etan Cohen [Fri, 10 Feb 2017 23:25:47 +0000 (23:25 +0000)]
Merge "[AWARE] Add support for Subscribe Service ID List Attribute" am:
11cea0d4a3 am:
a80d8de804 am:
98bd5591b6
am:
3b6de6e6db
Change-Id: I8423eb0194fc5bf17fca4c0fceb7b489c7a9a595
Etan Cohen [Fri, 10 Feb 2017 23:25:36 +0000 (23:25 +0000)]
Merge "[AWARE] Add support for SDEA.ServiceInfo field" am:
97c3540042 am:
d57bae0f76 am:
07d3618832
am:
f8dd4dfcdd
Change-Id: Ifaa64e0a91ff05d13db23845ab6f9b50fd191983
Etan Cohen [Fri, 10 Feb 2017 23:25:14 +0000 (23:25 +0000)]
Merge "[AWARE] Update HIDL to match spec and add comments" am:
66dcae0656 am:
a4cd134e93 am:
bf0091ffef
am:
8fc8e3634c
Change-Id: Ib71d01027902dcf0b485ce0cad28fb6908f3e165
TreeHugger Robot [Fri, 10 Feb 2017 23:24:53 +0000 (23:24 +0000)]
Merge "audio: Remove timeout from waits on event flags in HAL driver threads"
Etan Cohen [Fri, 10 Feb 2017 23:23:17 +0000 (23:23 +0000)]
Merge "[AWARE] Add support for Subscribe Service ID List Attribute" am:
11cea0d4a3 am:
a80d8de804
am:
98bd5591b6
Change-Id: Ibba393e4d34084234e44b667b072338257d61984
Etan Cohen [Fri, 10 Feb 2017 23:23:05 +0000 (23:23 +0000)]
Merge "[AWARE] Add support for SDEA.ServiceInfo field" am:
97c3540042 am:
d57bae0f76
am:
07d3618832
Change-Id: I070cac8b02ff1d6d03c4d8329ca7d2d5f390cda2
Etan Cohen [Fri, 10 Feb 2017 23:22:44 +0000 (23:22 +0000)]
Merge "[AWARE] Update HIDL to match spec and add comments" am:
66dcae0656 am:
a4cd134e93
am:
bf0091ffef
Change-Id: I75f722915a2c7ec367fb0d73e413f7e57081739b
Etan Cohen [Fri, 10 Feb 2017 23:21:16 +0000 (23:21 +0000)]
Merge "[AWARE] Add support for Subscribe Service ID List Attribute" am:
11cea0d4a3
am:
a80d8de804
Change-Id: I103c555c1d9580d056800a1d1e28ef9b27780b2d
Etan Cohen [Fri, 10 Feb 2017 23:21:06 +0000 (23:21 +0000)]
Merge "[AWARE] Add support for SDEA.ServiceInfo field" am:
97c3540042
am:
d57bae0f76
Change-Id: Ib55c7df302c9c3b01ae36ce52dce0470ff4f0cf1
Etan Cohen [Fri, 10 Feb 2017 23:20:41 +0000 (23:20 +0000)]
Merge "[AWARE] Update HIDL to match spec and add comments" am:
66dcae0656
am:
a4cd134e93
Change-Id: Icec27c2da9e2d5facded4db478fa0ef08309457e
Etan Cohen [Fri, 10 Feb 2017 23:19:29 +0000 (23:19 +0000)]
Merge "[AWARE] Add support for Subscribe Service ID List Attribute"
am:
11cea0d4a3
Change-Id: I4ab614028e59c0ae2effab6cc7e1b65172bb3335
Etan Cohen [Fri, 10 Feb 2017 23:19:14 +0000 (23:19 +0000)]
Merge "[AWARE] Add support for SDEA.ServiceInfo field"
am:
97c3540042
Change-Id: Ic47df91fd4e2a8dc72d9a825079a8cfa3f633444
Etan Cohen [Fri, 10 Feb 2017 23:18:42 +0000 (23:18 +0000)]
Merge "[AWARE] Update HIDL to match spec and add comments"
am:
66dcae0656
Change-Id: I2b22e9c2cc879db26eaa85ba3a1e486da609abb8
TreeHugger Robot [Fri, 10 Feb 2017 23:12:53 +0000 (23:12 +0000)]
Merge "Fingerprint VTS"
Etan Cohen [Fri, 10 Feb 2017 23:12:14 +0000 (23:12 +0000)]
Merge "[AWARE] Add support for Subscribe Service ID List Attribute"
Etan Cohen [Fri, 10 Feb 2017 23:11:55 +0000 (23:11 +0000)]
Merge "[AWARE] Add support for SDEA.ServiceInfo field"
Etan Cohen [Fri, 10 Feb 2017 23:11:36 +0000 (23:11 +0000)]
Merge "[AWARE] Update HIDL to match spec and add comments"
TreeHugger Robot [Fri, 10 Feb 2017 23:01:48 +0000 (23:01 +0000)]
Merge "Camera: fix open_legacy crash"
TreeHugger Robot [Fri, 10 Feb 2017 22:47:13 +0000 (22:47 +0000)]
Merge "graphics: use FIFO scheduler in IComposer"
OSDN Git Service
