Shuo Qian
af59bc0e76
Merge "Remove GENERIC_FAILURE and INVALID_ARGUMENT for Api documentation" am: 2d0b636b29
am: 0efe019342
...
am: 56fc4104b9
Change-Id: Ia37f47663ce7932c9d294512b7af011849e27c97
2017-03-24 17:30:27 +00:00
Shuo Qian
56fc4104b9
Merge "Remove GENERIC_FAILURE and INVALID_ARGUMENT for Api documentation" am: 2d0b636b29
...
am: 0efe019342
Change-Id: I6a2cc30754413eccb59ba775c14863852a89fefc
2017-03-24 17:27:54 +00:00
Shuo Qian
0efe019342
Merge "Remove GENERIC_FAILURE and INVALID_ARGUMENT for Api documentation"
...
am: 2d0b636b29
Change-Id: I342068f8bbcf6a97c322bcf0049fed83b519bcda
2017-03-24 17:26:26 +00:00
Shuo Qian
2d0b636b29
Merge "Remove GENERIC_FAILURE and INVALID_ARGUMENT for Api documentation"
2017-03-24 17:21:18 +00:00
Etan Cohen
b0c0035d25
Merge "[WIFI] Restore initialization code" am: 8f4416aabb
am: 3ae14f0ead
...
am: 058ed46d36
Change-Id: I8c2a70819cf1acf8b6edd8743f7c536a580ce66a
2017-03-24 16:17:14 +00:00
Etan Cohen
058ed46d36
Merge "[WIFI] Restore initialization code" am: 8f4416aabb
...
am: 3ae14f0ead
Change-Id: I96f5c77e7f9ee3b84f4a6cf7973638d3d4bba68d
2017-03-24 16:15:13 +00:00
Tomasz Wasilczyk
094c1d9de8
Merge "Add background scan routines and callbacks to broadcast radio HAL."
2017-03-24 16:14:21 +00:00
Wyatt Riley
fdfe21bf9a
Merge "Improved GNSS HAL VTS test coverage"
2017-03-24 16:13:25 +00:00
Etan Cohen
3ae14f0ead
Merge "[WIFI] Restore initialization code"
...
am: 8f4416aabb
Change-Id: I9f0f828d542e337f185c4a423748f57ef53a00ce
2017-03-24 16:12:43 +00:00
Etan Cohen
8f4416aabb
Merge "[WIFI] Restore initialization code"
2017-03-24 16:08:56 +00:00
TreeHugger Robot
5306597978
Merge "Handle hidl transaction errors in ConfigStore"
2017-03-24 05:50:23 +00:00
Jaesoo Lee
ad11f288e5
Merge "removed unused function (HIDL_FETCH_ISurfaceFlingerConfigs)" am: d5934d06f1
am: 1d5ccbd5ea
...
am: a0032e3990
-s ours
Change-Id: I9281cd8f52e698505d921d4f1094c823ab102b1d
2017-03-24 03:32:06 +00:00
Jaesoo Lee
a0032e3990
Merge "removed unused function (HIDL_FETCH_ISurfaceFlingerConfigs)" am: d5934d06f1
...
am: 1d5ccbd5ea
Change-Id: Idccb5e03b143ec2462479e32d0bd20555d32cd63
2017-03-24 03:29:34 +00:00
Jaesoo Lee
1d5ccbd5ea
Merge "removed unused function (HIDL_FETCH_ISurfaceFlingerConfigs)"
...
am: d5934d06f1
Change-Id: I958c1285dbb5e3c6db8145ac743cedfb61cd544c
2017-03-24 03:27:35 +00:00
Jaesoo Lee
d5934d06f1
Merge "removed unused function (HIDL_FETCH_ISurfaceFlingerConfigs)"
2017-03-24 03:23:27 +00:00
Etan Cohen
2d523c012e
[WIFI] Restore initialization code
...
Restore the usage of WIFI-specific main function. The main
function was inadvertantly disabled by moving it into a static
library - which caused the default main to be used.
Need a custom main since need to stop WIFI before tests start
to enforce a clean starting point.
Bug: 35276551
Test: confirms custom main routine is called
Change-Id: I978827bc0f0f16d9ca4f159fbf42d0bc53f5df99
2017-03-23 17:37:42 -07:00
Tomasz Wasilczyk
7410c72d30
Merge "Verify all radio classes, instead of FM only."
2017-03-23 23:15:03 +00:00
Wyatt Riley
c139959874
Improved GNSS HAL VTS test coverage
...
Calling all extension APIs, and checking some exist
Calling delete and inject methods
Checking measurement capabilties
Bug:32022567
Test: Passes on Pixel XL with O
Change-Id: I86d5416b08c91e4d96eff6ba8f88e50e0544540b
2017-03-23 15:34:45 -07:00
Tomasz Wasilczyk
803301a2ed
Add background scan routines and callbacks to broadcast radio HAL.
...
Bug: b/34054813
Test: existing VTS pass, none added.
Change-Id: I2009e73a9e5edc4752366fd84f67b5a745856441
2017-03-23 14:59:41 -07:00
Ruchi Kandoi
97cf2b754b
Merge "Nfc: Null ptr checks in HAL" am: 3b4d423d42
am: 0ee41f6f8c
...
am: 87e7c64385
Change-Id: I8706702a3f55ecb6c034e8aa02b3ab4011c2c006
2017-03-23 19:29:57 +00:00
Ruchi Kandoi
87e7c64385
Merge "Nfc: Null ptr checks in HAL" am: 3b4d423d42
...
am: 0ee41f6f8c
Change-Id: Ifc05d12c32e646ceb0f2e810a23d205cdfe7cdc7
2017-03-23 19:27:20 +00:00
Ruchi Kandoi
0ee41f6f8c
Merge "Nfc: Null ptr checks in HAL"
...
am: 3b4d423d42
Change-Id: Icede34b74cd253d6921ce38c5abb0d3f80ee1bd7
2017-03-23 19:24:19 +00:00
Treehugger Robot
3b4d423d42
Merge "Nfc: Null ptr checks in HAL"
2017-03-23 19:20:26 +00:00
Pavel Maltsev
a3e24b557c
Handle hidl transaction errors in ConfigStore
...
Test: surface flinger not failing, android now bootsup
Bug: b/36445794
Change-Id: I22fa7aab9fa92bc04333aaa0eef45891ebeba8e7
2017-03-23 10:24:14 -07:00
Tomasz Wasilczyk
2f46101660
Verify all radio classes, instead of FM only.
...
Also, a bit of code cleanup.
Bug: b/33382424, b/32022455
Test: VTS
Change-Id: Ib314027b256a6ca4bfa75e9de2ba70990a00b4da
2017-03-23 09:59:23 -07:00
TreeHugger Robot
04a9f9abd6
Merge "Camera: Add doc for combined stream usage flags"
2017-03-23 03:44:35 +00:00
Jaesoo Lee
00e7509c03
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: I35e916ad4a6c321303a3888dabb4884b17146e16
Merged-In: Iac3ed57568f18c3a8a7f7423a361b0fe45aa54ab
2017-03-23 10:13:15 +09: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
Ruchi Kandoi
ee8314cd7a
Nfc: Null ptr checks in HAL
...
Adds null pointer checks in the default implementation.
Test: compiles
Bug: 36149477
Change-Id: I6195ce92f5cefd4b82874866d08014830f400192
Signed-off-by: Ruchi Kandoi <kandoiruchi@google.com>
2017-03-22 16:47:48 -07: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