Commit graph

3596 commits

Author SHA1 Message Date
TreeHugger Robot
04a9f9abd6 Merge "Camera: Add doc for combined stream usage flags" 2017-03-23 03:44:35 +00:00
Jaesoo Lee
f54419bb54 removed unused function (HIDL_FETCH_ISurfaceFlingerConfigs)
HIDL_FETCH_... is required only for passthrough mode, but Configstore
does not provide passthrough mode.

Bug: 35325577
Test: build and check configstore works
Change-Id: Iac3ed57568f18c3a8a7f7423a361b0fe45aa54ab
2017-03-23 10:09:02 +09:00
TreeHugger Robot
326bdaa550 Merge "Add logic for VHAL versions > 2.0 to forward property information to 2.0 Use this infrastructure to move OBD2_LIVE_FRAME support over to the Vehicle HAL 2.0 layer." 2017-03-23 00:58:36 +00:00
TreeHugger Robot
d4762a75b4 Merge "audiohal: Remove stale TODOs" 2017-03-23 00:57:16 +00:00
Etan Cohen
d4f097088e Merge "[AWARE] Add Passphrase data-path security" am: 9e71d7d44f am: 5a05398da8
am: e3ee58a4e7

Change-Id: I86680b7dc7285658d5b71a8e8bc5fbf504522b96
2017-03-23 00:31:04 +00:00
Myles Watson
f89c914b60 Merge "Bluetooth: Protect pointers and callbacks" am: 54906b6ccf am: ce78f9faab
am: 4cfd84a049

Change-Id: I6325f5c93c1edd58c7813c5ab7bec9bb8b3f6aef
2017-03-23 00:30:50 +00:00
Etan Cohen
e3ee58a4e7 Merge "[AWARE] Add Passphrase data-path security" am: 9e71d7d44f
am: 5a05398da8

Change-Id: I5ae40c7077410ad34c3face4aa1fad62dfe5887c
2017-03-23 00:29:01 +00:00
Myles Watson
4cfd84a049 Merge "Bluetooth: Protect pointers and callbacks" am: 54906b6ccf
am: ce78f9faab

Change-Id: I6500b50c6158a2f2d577e223e598748f80d8a0c4
2017-03-23 00:28:48 +00:00
Etan Cohen
5a05398da8 Merge "[AWARE] Add Passphrase data-path security"
am: 9e71d7d44f

Change-Id: I4f0e514d2f49156942c6818379347c369c79889b
2017-03-23 00:26:21 +00:00
Myles Watson
ce78f9faab Merge "Bluetooth: Protect pointers and callbacks"
am: 54906b6ccf

Change-Id: Idb2e6f6fc796c95552b112060b9866a81073dc37
2017-03-23 00:26:03 +00:00
Etan Cohen
9e71d7d44f Merge "[AWARE] Add Passphrase data-path security" 2017-03-23 00:10:34 +00:00
TreeHugger Robot
dc039363d9 Merge "Add manufacturer and model to device ID attestation" 2017-03-23 00:01:46 +00:00
Treehugger Robot
54906b6ccf Merge "Bluetooth: Protect pointers and callbacks" 2017-03-22 23:59:58 +00:00
Hridya Valsaraju
3eebe248e5 Merge "use toString instead of to_string" am: 6a73f61b96 am: a1b886fd90
am: 35937ab9fa

Change-Id: I0cb0cbff94b206655061c078848c0ff95147fcfc
2017-03-22 23:04:42 +00:00
Hridya Valsaraju
35937ab9fa Merge "use toString instead of to_string" am: 6a73f61b96
am: a1b886fd90

Change-Id: I5dda7824fcd2988f349a5d1c9df680f9be6700cb
2017-03-22 23:02:07 +00:00
Hridya Valsaraju
a1b886fd90 Merge "use toString instead of to_string"
am: 6a73f61b96

Change-Id: Ia28bfdf70b7a79c96822aa3f0402bc0290ad7b3d
2017-03-22 22:59:50 +00:00
Treehugger Robot
6a73f61b96 Merge "use toString instead of to_string" 2017-03-22 22:49:38 +00:00
Sanket Padawe
cae250ad67 Merge "Add VTS for couple of missing APIs and some cleanup for earlier APIs." am: 60449e68d1 am: 516a71e295
am: 0f8a067a04

Change-Id: Ifbdbf6c739e140eb10c8fafdeaa31b92f281a41b
2017-03-22 21:44:37 +00:00
Sanket Padawe
0f8a067a04 Merge "Add VTS for couple of missing APIs and some cleanup for earlier APIs." am: 60449e68d1
am: 516a71e295

Change-Id: I55111cddfd5101bfdccc82bdfa07013187d6f95f
2017-03-22 21:42:01 +00:00
Sanket Padawe
516a71e295 Merge "Add VTS for couple of missing APIs and some cleanup for earlier APIs."
am: 60449e68d1

Change-Id: I0bcc97f30baf408e6eb6b96f7f37b3b536953fc7
2017-03-22 21:39:42 +00:00
Myles Watson
9cec0e331a Bluetooth: Protect pointers and callbacks
Test: kill com.android.bluetooth
Bug: 36150800
Change-Id: I9533731c9ce3776c84e6c1d3fdf3e266b328a084
2017-03-22 21:30:40 +00:00
Sanket Padawe
60449e68d1 Merge "Add VTS for couple of missing APIs and some cleanup for earlier APIs." 2017-03-22 21:29:13 +00:00
Janis Danisevskis
58b0f06556 Merge "Check for unimplemented keymaster function delete_key" 2017-03-22 20:46:43 +00:00
Hridya Valsaraju
1b019d5a6c use toString instead of to_string
Bug: 35703683
Test: hidl_test_java passes

Change-Id: Ib7d6807f6b9ddcd7b0271b17a0a52be0ee07ec6c
2017-03-22 13:19:54 -07:00
TreeHugger Robot
8f991deed1 Merge "Audio HAL VTS: test leftover calls" 2017-03-22 19:25:55 +00:00
TreeHugger Robot
565a418fba Merge "Create max acquired buffer for framebuffer for SF" 2017-03-22 18:51:31 +00:00
Janis Danisevskis
b77dbe37c1 Check for unimplemented keymaster function delete_key
delete_key is optional and may not be implemented by
a legacy hal. So the function pointer must be checked for
nullptr prior to being used.

Bug: 36500704
Test: run VTS tests with legacy hal that does not implement delete_key
Change-Id: Ie51dd173314826ef260319153c7df96d88b8a42f
2017-03-22 10:46:41 -07:00
Mikhail Naganov
b0dd076c60 audiohal: Remove stale TODOs
Bug: 34109709
Change-Id: I9b30ffa2ed06be8cf31cdbfbcc0f4cb0dac7be54
Test: make
2017-03-22 10:36:14 -07:00
Jaesoo Lee
a43c1d3160 Merge "disabled passthrough mode for Configstore" am: 7f8b76a322 am: 37b5d80abf
am: 7af7140958

Change-Id: I98bb865ed1b5a28a4e57a4da849ef2db685f032c
2017-03-22 01:07:52 +00:00
Jaesoo Lee
7af7140958 Merge "disabled passthrough mode for Configstore" am: 7f8b76a322
am: 37b5d80abf

Change-Id: I46c7e5876f3def55489ff5103eca8a22bfcd9b6d
2017-03-22 01:05:48 +00:00
Jaesoo Lee
37b5d80abf Merge "disabled passthrough mode for Configstore"
am: 7f8b76a322

Change-Id: Ib7e37189c90752d8c536cb2e5bdf0a2518865981
2017-03-22 01:04:17 +00:00
Jaesoo Lee
7f8b76a322 Merge "disabled passthrough mode for Configstore" 2017-03-22 00:42:33 +00:00
Etan Cohen
c58619e8d9 [AWARE] Add Passphrase data-path security
Add mechanism to configure data-path security using Passphrase
(as an alternative to PMK).

Bug: 35866810
Test: integration (sl4a) tests passing.
Change-Id: If7094a44af1996d3caf5b776d492797f14a7be11
2017-03-21 16:49:40 -07:00
Eric Laurent
be47eaf8cf Merge "audio: fix mistake in AudioDevice enum" 2017-03-21 23:41:09 +00:00
Steven Moreland
65a629583f Merge "Revert "Make setResponseFunctions() and setCallback() oneway."" 2017-03-21 23:12:16 +00:00
Steven Moreland
32a8a98b3f Revert "Make setResponseFunctions() and setCallback() oneway."
This reverts commit 08b949450e.

Change-Id: Ie2f6c84e1b9264b109b55432be9b77abb82643fd
2017-03-21 23:09:44 +00:00
Amit Mahajan
a5bc496e2d Merge "Make setResponseFunctions() and setCallback() oneway." 2017-03-21 23:03:48 +00:00
Fabien Sanglard
3d9f5ad284 Create max acquired buffer for framebuffer for SF
Change-Id: I502cfea9e03943c2f2bb353e71cfd860b2797fd5
2017-03-21 15:53:52 -07:00
Steven Thomas
4caea7b92d Merge "Revert "Revert "Add useVrFlinger() method to SurfaceFlinger ConfigStore""" 2017-03-21 22:25:00 +00:00
Enrico Granata
15e12268ff Add logic for VHAL versions > 2.0 to forward property information to 2.0
Use this infrastructure to move OBD2_LIVE_FRAME support over to the Vehicle HAL 2.0 layer.

This is useful in DefaultVehicleHal 2.0 to let the Emulator layer send/receive information about properties defined by later VehicleHal versions.
Additionally, support the notion that a custom property thusly defined might have logic more intricate than simply a property Id and an area Id,
via a custom handler object that supports get() and set() operations. A default handler object simply falls back to a stored VehiclePropValue, but
more complex implementations are possible.

Test: manual testing in Python:
import vhal_consts_2_0 as c
from vhal_emulator import Vhal

v = Vhal(c.vhal_types_2_0)

v.getConfig(c.VEHICLE_PROPERTY_HVAC_TEMPERATURE_SET)
print v.rxMsg()

v.setProperty(c.VEHICLE_PROPERTY_HVAC_TEMPERATURE_SET, c.VEHICLE_ZONE_ROW_1_LEFT, 70)
print v.rxMsg()

v.getProperty(c.VEHICLE_PROPERTY_HVAC_TEMPERATURE_SET, c.VEHICLE_ZONE_ROW_1_LEFT)
print v.rxMsg()

v.getProperty(0x11e00d00, 0)
print v.rxMsg()

plus

runtest Obd2LiveFrame.java

Change-Id: I9c342e6e2c9ff581beacd238a42780ca10f96d9c
2017-03-21 15:11:16 -07:00
Roshan Pius
26eb1b4e7a supplicant(interface): Add an event for bssid changes am: c314841614 am: 995e5b7f13
am: 74d86aadbb

Change-Id: Idcb780f307f26bcd8edae289e895288d92f3b054
2017-03-21 22:00:15 +00:00
Roshan Pius
a76cdcd789 wifi(implementation): Return proper status code on initialize am: a1c76e4d53 am: c51e74d572
am: c8fdd97297

Change-Id: Ib1d40583abb74ad80edd858635ab56aed9f2c2f2
2017-03-21 21:59:53 +00:00
TreeHugger Robot
19c9d8d03d Merge "Fix library dependency, remove undeclarate deps" 2017-03-21 21:57:30 +00:00
Sanket Padawe
6f957ea5c5 Add VTS for couple of missing APIs and some cleanup for earlier APIs.
Bug: 32022332
Test: vts
Change-Id: I361af4a37985e5bc686a2d7302917afa134ebc24
2017-03-21 14:57:22 -07:00
Roshan Pius
74d86aadbb supplicant(interface): Add an event for bssid changes am: c314841614
am: 995e5b7f13

Change-Id: I59746ea376cce74cf0ca452398c588efd67e7d1c
2017-03-21 21:48:42 +00:00
Roshan Pius
c8fdd97297 wifi(implementation): Return proper status code on initialize am: a1c76e4d53
am: c51e74d572

Change-Id: I4bb4c392e3b714417b9823d4a3c5eb6e878e6fec
2017-03-21 21:48:29 +00:00
Roshan Pius
995e5b7f13 supplicant(interface): Add an event for bssid changes
am: c314841614

Change-Id: I587c0c479708448492dce329c267f2b3761911d8
2017-03-21 21:44:09 +00:00
Roshan Pius
c51e74d572 wifi(implementation): Return proper status code on initialize
am: a1c76e4d53

Change-Id: Ia6e18ee9f9543fb4059dd349c8a0f9ef286ad14d
2017-03-21 21:43:57 +00:00
TreeHugger Robot
a70f10b0a4 Merge "GNSS Service handling System death" 2017-03-21 21:23:53 +00:00
Steven Thomas
cb4172a98c Revert "Revert "Add useVrFlinger() method to SurfaceFlinger ConfigStore""
This reverts commit 2877c167ff.

Add useVrFlinger() method to SurfaceFlinger ConfigStore, which is
used to ensure we only start vr flinger on Daydream ready devices.

Bug: 35885165

Test: Checked for "SurfaceFlinger UseVrFlinger" in the logs,
confirmed it only shows up for Daydream ready devices.

Change-Id: I839b650b63cd008de03feb4c771b330374bd0682
2017-03-21 19:56:57 +00:00