OSDN Git Service
Tomasz Wasilczyk [Thu, 29 Jun 2017 14:31:37 +0000 (14:31 +0000)]
Merge "Initial Broadcast Radio HAL 1.1 default implementation."
TreeHugger Robot [Thu, 29 Jun 2017 05:49:39 +0000 (05:49 +0000)]
Merge "Assert getService does not return nullptr"
Steven Moreland [Thu, 29 Jun 2017 04:37:07 +0000 (04:37 +0000)]
Resolve differences in IRadio
am:
990a5f1145
Change-Id: I711c7f3e6f2f414a6c4e40ddb1125863ffdd53cb
Steven Moreland [Wed, 28 Jun 2017 20:35:28 +0000 (13:35 -0700)]
Resolve differences in IRadio
Test: branches are the same
Bug:
62999900
Change-Id: I67fe8b95ab81638563faba6fff43e5f60dc2aca5
(cherry picked from commit
0255501b335ae660a7b68f9152e6b9bb8d72a56e)
Steven Moreland [Thu, 29 Jun 2017 03:54:57 +0000 (03:54 +0000)]
Merge "Freeze first batch of HALs for O-MR1" into oc-dr1-dev am:
cb4ac8559d
am:
5f8cc4e6c9
Change-Id: Iaeb60bdbf7f315e94f31497d05f88c4b1080fc5d
Steven Moreland [Thu, 29 Jun 2017 03:50:48 +0000 (03:50 +0000)]
Merge "Freeze first batch of HALs for O-MR1" into oc-dr1-dev
am:
cb4ac8559d
Change-Id: I09615782d8c709610408ac3da78385b8b134a530
TreeHugger Robot [Thu, 29 Jun 2017 03:46:35 +0000 (03:46 +0000)]
Merge "Freeze first batch of HALs for O-MR1" into oc-dr1-dev
Shuo Qian [Thu, 29 Jun 2017 03:38:28 +0000 (03:38 +0000)]
Merge "Update .hal file for radio 1.0 hal" into oc-dr1-dev am:
c631963d4b
am:
fd5c82b017
Change-Id: Idec7f8308e166491b524883e5473d996c89f4e2a
Shuo Qian [Thu, 29 Jun 2017 03:38:25 +0000 (03:38 +0000)]
Merge "Fix failure vts tests:" into oc-dr1-dev am:
55967b136e
am:
6c63af4146 -s ours
Change-Id: I1929b00c5da15ffbd6f1b25f5535782ce04b26e3
Shuo Qian [Thu, 29 Jun 2017 03:34:00 +0000 (03:34 +0000)]
Merge "Update .hal file for radio 1.0 hal" into oc-dr1-dev
am:
c631963d4b
Change-Id: I0728099eb19f838f927cc5788e335d855fc276a0
Shuo Qian [Thu, 29 Jun 2017 03:33:56 +0000 (03:33 +0000)]
Merge "Fix failure vts tests:" into oc-dr1-dev
am:
55967b136e
Change-Id: Ie4131520b9d5915cccd7ef57b3063c7b5e3bf1c5
Shuo Qian [Thu, 29 Jun 2017 03:28:46 +0000 (03:28 +0000)]
Merge "Update .hal file for radio 1.0 hal" into oc-dr1-dev
Shuo Qian [Thu, 29 Jun 2017 03:28:46 +0000 (03:28 +0000)]
Merge "Fix failure vts tests:" into oc-dr1-dev
Shuo Qian [Thu, 29 Jun 2017 03:00:46 +0000 (03:00 +0000)]
Merge "Add a new vts directory under 1.1 for radio 1.1 APIs vts tests." into oc-dr1-dev am:
00eb34b57a
am:
79762563bc
Change-Id: Ic2f2f0062e6e4f1733528700ab9abcbf2a60073c
Connor O'Brien [Thu, 29 Jun 2017 03:00:25 +0000 (03:00 +0000)]
Merge "Fix consumerir test bugs" into oc-dev am:
9f0b8369e9 am:
989bd639b2
am:
3812fd4542
Change-Id: Ia75e1923e7cf6fa7f660d6cff2bf8e91dd85257a
Jae Shin [Thu, 29 Jun 2017 02:42:25 +0000 (11:42 +0900)]
Assert getService does not return nullptr
Make sure getService return value is not null before running
testcase
Test: make vts -j40 && vts-tradefed run commandAndExit vts -m
VtsHalConfigstoreV1_0Target
Bug:
62931371
Change-Id: I432e07c0c61a308b814d88cab9027a95ff24d8b5
Shuo Qian [Thu, 29 Jun 2017 02:53:23 +0000 (02:53 +0000)]
Merge "Add a new vts directory under 1.1 for radio 1.1 APIs vts tests." into oc-dr1-dev
am:
00eb34b57a
Change-Id: I491d9ce3eb219ae2bd8b9988b0ca5d20b1d80144
Shuo Qian [Thu, 29 Jun 2017 02:41:57 +0000 (02:41 +0000)]
Merge "Add a new vts directory under 1.1 for radio 1.1 APIs vts tests." into oc-dr1-dev
Connor O'Brien [Thu, 29 Jun 2017 02:29:16 +0000 (02:29 +0000)]
Merge "Fix consumerir test bugs" into oc-dev am:
9f0b8369e9
am:
989bd639b2
Change-Id: I700a2f280fea76a480c16a6f2ff40fc15a8c362e
Connor O'Brien [Thu, 29 Jun 2017 02:25:17 +0000 (02:25 +0000)]
Merge "Fix consumerir test bugs" into oc-dev am:
9f0b8369e9 am:
601ae82ebc
am:
1ec32fd2e7
Change-Id: I1e46b63551d6726ef20a7dcaad52ea7e466aa278
Connor O'Brien [Thu, 29 Jun 2017 02:21:17 +0000 (02:21 +0000)]
Merge "Fix consumerir test bugs" into oc-dev
am:
9f0b8369e9
Change-Id: Ib8949fe95c3f02cc951f357e0f6cbae154e31d95
Connor O'Brien [Thu, 29 Jun 2017 02:17:46 +0000 (02:17 +0000)]
Merge "Fix consumerir test bugs" into oc-dev am:
9f0b8369e9
am:
601ae82ebc
Change-Id: I2853357573153e2a0af5b3a61b9b7042cb950219
Connor O'Brien [Thu, 29 Jun 2017 02:15:16 +0000 (02:15 +0000)]
Merge "Fix consumerir test bugs" into oc-dev
am:
9f0b8369e9
Change-Id: I6e28e41595743e614a4f10f6e014673edc4c4bad
Connor O'Brien [Thu, 29 Jun 2017 02:06:23 +0000 (02:06 +0000)]
Merge "Fix consumerir test bugs" into oc-dev
Emilian Peev [Thu, 29 Jun 2017 01:57:06 +0000 (01:57 +0000)]
Merge "Camera: Add support for testing partial results" into oc-dev am:
98b7dd57dc -s ours am:
a69d5bbc4e -s ours
am:
f39dc3ed84 -s ours
Change-Id: Ie985760e6069ac369198ef3eb79fa3d53bd0e720
Emilian Peev [Thu, 29 Jun 2017 01:56:50 +0000 (01:56 +0000)]
Merge "Camera: Add support for testing partial results" into oc-dev am:
98b7dd57dc am:
ed0a5d2eba -s ours
am:
b489ec0a7e -s ours
Change-Id: I02e28c82e2af6476b4dd02b87fd0011aa36e73ae
Emilian Peev [Thu, 29 Jun 2017 01:56:03 +0000 (01:56 +0000)]
Merge "Camera: Add support for testing partial results" into oc-dev am:
98b7dd57dc -s ours
am:
a69d5bbc4e -s ours
Change-Id: Ibf2f84e9b869ac21d76fa0abcfb066c43dbd309b
Emilian Peev [Thu, 29 Jun 2017 01:52:18 +0000 (01:52 +0000)]
Merge "Camera: Add support for testing partial results" into oc-dev am:
98b7dd57dc
am:
ed0a5d2eba -s ours
Change-Id: I64e388601fd728d452153bdcb29533e3b5e1458d
Emilian Peev [Thu, 29 Jun 2017 01:48:49 +0000 (01:48 +0000)]
Merge "Camera: Add support for testing partial results" into oc-dev
am:
98b7dd57dc
Change-Id: If210f365f31053c718aee550d1a3e8d6432ff97b
Emilian Peev [Thu, 29 Jun 2017 01:48:47 +0000 (01:48 +0000)]
Merge "Camera: Add support for testing partial results" into oc-dev
am:
98b7dd57dc -s ours
Change-Id: I8301d4bb4ec160018865bab5109013809202af80
TreeHugger Robot [Thu, 29 Jun 2017 01:46:13 +0000 (01:46 +0000)]
Merge "Camera: Add support for testing partial results" into oc-dev
TreeHugger Robot [Thu, 29 Jun 2017 01:39:19 +0000 (01:39 +0000)]
Merge "Resolve differences in IRadio"
Connor O'Brien [Wed, 28 Jun 2017 23:46:43 +0000 (16:46 -0700)]
Fix consumerir test bugs
The tests currently fail for some correct implementations; revise them
so this no longer occurs.
Bug:
63081607
Test: built & ran revised test
Change-Id: I21b72fd864de57272bd6eb42dca238f661137b93
Signed-off-by: Connor O'Brien <connoro@google.com>
sqian [Tue, 27 Jun 2017 19:40:10 +0000 (12:40 -0700)]
Update .hal file for radio 1.0 hal
Test: compile, treehugger
Bug:
62584347
Change-Id: Ic595d9934d3d4e059cfa40c5f6da3f4cc97b3352
sqian [Wed, 28 Jun 2017 00:24:59 +0000 (17:24 -0700)]
Fix failure vts tests:
- setCdmaBroadcastConfig
- getCdmaBroadcastConfig
- setCdmaBroadcastActivation
- pullLceData
- setAllowedCarriers
- setAllowedCarriers
- sendEnvelope
- sendEnvelopeWithStatus
- cancelPendingUssd
- sendCDMAFeatureCode
Test: mma -j30; adb shell binary
Bug:
62960543,
62584347
Change-Id: Ie907cdb464a44d92be47d898151d71eb2d83a11c
sqian [Fri, 23 Jun 2017 23:37:32 +0000 (16:37 -0700)]
Fix failure vts tests:
- setCdmaBroadcastConfig
- getCdmaBroadcastConfig
- setCdmaBroadcastActivation
- pullLceData
- setAllowedCarriers
- setAllowedCarriers
- sendEnvelope
- sendEnvelopeWithStatus
- cancelPendingUssd
- sendCDMAFeatureCode
Test: mma -j30; adb shell binary
Bug:
62960543,
62584347
Change-Id: Ie907cdb464a44d92be47d898151d71eb2d83a11c
Merged-In: Ie907cdb464a44d92be47d898151d71eb2d83a11c
Tomasz Wasilczyk [Thu, 22 Jun 2017 17:45:33 +0000 (10:45 -0700)]
Initial Broadcast Radio HAL 1.1 default implementation.
The new implementation does not rely on legacy HAL, it implements
HAL 1.1 directly instead.
This is not a full implementation yet, but passes all existing tests.
Bug: b/
36864090
Test: VTS, instrumentalization, Unit
Change-Id: Ic8eddd19d0bf6777b4086d099183d71e05d7da0e
TreeHugger Robot [Wed, 28 Jun 2017 20:37:25 +0000 (20:37 +0000)]
Merge "cas: add CAS hal"
Steven Moreland [Wed, 28 Jun 2017 20:35:28 +0000 (13:35 -0700)]
Resolve differences in IRadio
Test: branches are the same
Bug:
62999900
Change-Id: I67fe8b95ab81638563faba6fff43e5f60dc2aca5
sqian [Wed, 24 May 2017 22:08:25 +0000 (15:08 -0700)]
Add a new vts directory under 1.1 for radio 1.1 APIs vts tests.
Bug:
38034125
Test: compile; adb shell compiled_vts_binary
Change-Id: I05d4f03db40ac712f120ac0e3e52301a6252f041
Steven Moreland [Fri, 23 Jun 2017 22:53:53 +0000 (15:53 -0700)]
Freeze first batch of HALs for O-MR1
These HALs are being used, so they are frozen
in MR1.
Test: none
Bug:
62421345
Change-Id: I9e739be751efdc6fc263325346d0c81dd113e630
Yahan Zhou [Wed, 28 Jun 2017 17:45:04 +0000 (17:45 +0000)]
Merge "Fix ICryptoFactory service" into oc-dev am:
2c57b00b17 am:
bd0c79c262
am:
4bcac22181
Change-Id: I5a1574f05d6af8c7c2ed81ab80d42db594fce252
Yahan Zhou [Wed, 28 Jun 2017 17:44:47 +0000 (17:44 +0000)]
Merge "Fix ICryptoFactory service" into oc-dev am:
2c57b00b17 am:
ef38715ba3
am:
b95c8638c1
Change-Id: If2a03ecb43bf8880b87e89ff251780ac82a174c0
Yahan Zhou [Wed, 28 Jun 2017 17:37:11 +0000 (17:37 +0000)]
Merge "Fix ICryptoFactory service" into oc-dev am:
2c57b00b17
am:
bd0c79c262
Change-Id: Ieaa270136b316cda710331f4afe4dd74639fdbdd
Yahan Zhou [Wed, 28 Jun 2017 17:33:39 +0000 (17:33 +0000)]
Merge "Fix ICryptoFactory service" into oc-dev am:
2c57b00b17
am:
ef38715ba3
Change-Id: Iebc7405f6603c2838ecaa917357eb81a977f140c
Yahan Zhou [Wed, 28 Jun 2017 17:30:40 +0000 (17:30 +0000)]
Merge "Fix ICryptoFactory service" into oc-dev
am:
2c57b00b17
Change-Id: I81cb1a353e63fea48f69e2fc522f70b63a1e8532
Yahan Zhou [Wed, 28 Jun 2017 17:30:40 +0000 (17:30 +0000)]
Merge "Fix ICryptoFactory service" into oc-dev
am:
2c57b00b17
Change-Id: If739ab2d5a5c93ddd2bb8720305311ee49a5503d
Yahan Zhou [Wed, 28 Jun 2017 17:27:20 +0000 (17:27 +0000)]
Merge "Fix ICryptoFactory service" into oc-dev
Emilian Peev [Wed, 28 Jun 2017 16:51:59 +0000 (16:51 +0000)]
Merge "Camera: Try to test additional types of camera providers" into oc-dr1-dev am:
c68231d171
am:
6d600e571c
Change-Id: I22e29abfa964c0448b39987e92b0173c49d59a49
Emilian Peev [Wed, 28 Jun 2017 16:48:07 +0000 (16:48 +0000)]
Merge "Camera: Try to test additional types of camera providers" into oc-dr1-dev
am:
c68231d171
Change-Id: I123b8b3f5be22b72401cc609d9bb2da8875b9897
TreeHugger Robot [Wed, 28 Jun 2017 16:44:24 +0000 (16:44 +0000)]
Merge "Camera: Try to test additional types of camera providers" into oc-dr1-dev
pkanwar [Wed, 28 Jun 2017 05:25:06 +0000 (05:25 +0000)]
Radio Interface changes to allow the modem to query the framework for the key. am:
fc5f3558fe -s ours
am:
f8d86f66ac -s ours
Change-Id: I2527d69ba1005422e200cf9ba376971af6c90c7c
pkanwar [Wed, 28 Jun 2017 05:18:42 +0000 (05:18 +0000)]
Radio Interface changes to allow the modem to query the framework for the key.
am:
fc5f3558fe -s ours
Change-Id: I115c93bb5523f112cd35870d4b6db3d5d5c65b0c
pkanwar [Sun, 21 May 2017 17:22:02 +0000 (10:22 -0700)]
Radio Interface changes to allow the modem to query the framework
for the key.
We will now pass the ImsiEncryptionInfo object which includes mnc/mcc.
BUG:
35606429
Test: manual
Merged-In: Iae18382f1f244be6a756a47753f0345e1925ca4a
Change-Id: Iae18382f1f244be6a756a47753f0345e1925ca4a
Tomasz Wasilczyk [Tue, 27 Jun 2017 21:28:05 +0000 (21:28 +0000)]
Merge "Fix Broadcast radio 1.0 VTS to not fail on other radio types than AM/FM."
TreeHugger Robot [Tue, 27 Jun 2017 20:58:46 +0000 (20:58 +0000)]
Merge "Fix missing includes in camera.common"
Yifan Hong [Tue, 27 Jun 2017 17:54:54 +0000 (10:54 -0700)]
Fix missing includes in camera.common
Test: mma -j BOARD_VNDK_VERSION=current
Bug:
33241851
Change-Id: I471f05cf66e4c8532c428f9894fa4642139e03e2
TreeHugger Robot [Tue, 27 Jun 2017 18:17:57 +0000 (18:17 +0000)]
Merge "OemLock functional VTS test."
Nathan Harold [Tue, 27 Jun 2017 10:38:13 +0000 (10:38 +0000)]
Merge commit '
bf7dcd2a' into oc-dr1-dev-plus-aosp
am:
2b6bf9c26d
Change-Id: Icbc44391fc6a010c16ca31a1c0a1b690dd4bb8d9
Andrew Scull [Tue, 13 Jun 2017 09:44:55 +0000 (10:44 +0100)]
OemLock functional VTS test.
Bug:
37530310
Test: VtsHalOemLockV1_0TargetTest
Change-Id: I07adb187f9bde236e2c92f423936089f4cb37b24
Nathan Harold [Tue, 27 Jun 2017 08:35:04 +0000 (01:35 -0700)]
Merge commit '
bf7dcd2a' into oc-dr1-dev-plus-aosp
Change-Id: Ic64fbf4782e129e15f0edbe2db810e81b04acd82
TreeHugger Robot [Tue, 27 Jun 2017 08:13:34 +0000 (08:13 +0000)]
Merge "Radio Keepalive HAL" into oc-dr1-dev
Emilian Peev [Wed, 21 Jun 2017 13:52:54 +0000 (14:52 +0100)]
Camera: Try to test additional types of camera providers
Check whether different types of camera providers got
registered and try to test them if present.
Bug:
62835396
Test: vts-tradefed run commandAndExit vts --skip-all-system-status-check
--skip-preconditions --module VtsHalCameraProviderV2_4Target -l INFO
Change-Id: I5c0c678e74d56cd8307d2f4e63b7c6dfa95d210d
TreeHugger Robot [Mon, 26 Jun 2017 23:26:54 +0000 (23:26 +0000)]
Merge "Revert "EVS: Android.bp -> Android.mk""
Tomasz Wasilczyk [Mon, 26 Jun 2017 23:08:51 +0000 (16:08 -0700)]
Fix Broadcast radio 1.0 VTS to not fail on other radio types than AM/FM.
Bug: b/
36864090
Test: VTS
Change-Id: I402f2fb00a553af2118e8a7595f5b377befcaa01
Steven Moreland [Mon, 26 Jun 2017 19:22:03 +0000 (19:22 +0000)]
Revert "EVS: Android.bp -> Android.mk"
This reverts commit
ee4f923b319180579c96161c1e23f673bebfed85.
Change-Id: I8b8490b3e828a9a31af8f6f823d9c70e1c11c9c5
Emilian Peev [Tue, 23 May 2017 15:37:11 +0000 (16:37 +0100)]
Camera: Add support for testing partial results
Currently the result handling is very basic. Partial
results and inflight queues are not supported. More
elaborate test cases like burst or streaming will
require such functionality to be present.
Merged-In: I3769d4ccc0047dc4eda173ea3bca538b026be8d2
Bug:
62550376
Bug:
37533777
Test: adb shell
/data/nativetest/VtsHalCameraProviderV2_4TargetTest/VtsHalCameraProviderV2_4TargetTest
Change-Id: I3769d4ccc0047dc4eda173ea3bca538b026be8d2
Emilian Peev [Mon, 26 Jun 2017 18:56:29 +0000 (18:56 +0000)]
Merge "Camera: Add support for testing partial results" into oc-dr1-dev am:
c60ec1c2ac
am:
f4a37fcdff
Change-Id: I14bb66c67e703dfe7f1d83aeaacaefbb7fb1baff
Emilian Peev [Mon, 26 Jun 2017 18:50:43 +0000 (18:50 +0000)]
Merge "Camera: Add support for testing partial results" into oc-dr1-dev
am:
c60ec1c2ac
Change-Id: I6fac06fbe7f60712877933dc05fe10e256f705b1
TreeHugger Robot [Mon, 26 Jun 2017 18:42:46 +0000 (18:42 +0000)]
Merge "Camera: Add support for testing partial results" into oc-dr1-dev
Steven Moreland [Mon, 26 Jun 2017 18:04:58 +0000 (18:04 +0000)]
Merge "Use vendor variant of libstagefright_foundation." into oc-dr1-dev am:
424a4be6b1
am:
778576ffdc
Change-Id: I8fa6f4b21d632f76fcb56efc774d0bddfad7f323
Steven Moreland [Mon, 26 Jun 2017 17:59:20 +0000 (17:59 +0000)]
Merge "Use vendor variant of libstagefright_foundation." into oc-dr1-dev
am:
424a4be6b1
Change-Id: Iea3484f0926f9792744e552b39976992111260ab
TreeHugger Robot [Mon, 26 Jun 2017 17:54:11 +0000 (17:54 +0000)]
Merge "Use vendor variant of libstagefright_foundation." into oc-dr1-dev
bohu [Sat, 24 Jun 2017 02:36:44 +0000 (02:36 +0000)]
vts: fix TryDifferentGovernors in Power hal test am:
ae96eee82b am:
9165643690
am:
b808408f69
Change-Id: Id23d3643840e703a8689b0cb665ab83aed467565
bohu [Sat, 24 Jun 2017 02:33:44 +0000 (02:33 +0000)]
vts: fix TryDifferentGovernors in Power hal test am:
ae96eee82b
am:
9165643690
Change-Id: I74bcbf7a7cae58c7b3b120ed8ae75fe300506edc
bohu [Sat, 24 Jun 2017 02:23:15 +0000 (02:23 +0000)]
vts: fix TryDifferentGovernors in Power hal test am:
ae96eee82b am:
69dc5c836f
am:
26181331a6
Change-Id: Ib1dbfe93fc3e4c79937495a9b3d64585077b7387
bohu [Sat, 24 Jun 2017 02:17:15 +0000 (02:17 +0000)]
vts: fix TryDifferentGovernors in Power hal test am:
ae96eee82b
am:
69dc5c836f
Change-Id: Id006b7a46d42d87091aed336d19e2aa3ff7f3f45
bohu [Sat, 24 Jun 2017 02:10:23 +0000 (02:10 +0000)]
vts: fix TryDifferentGovernors in Power hal test
am:
ae96eee82b
Change-Id: Iaa383d8d150b8b633c3d238c52622fddc0d3ec09
bohu [Sat, 24 Jun 2017 02:09:26 +0000 (02:09 +0000)]
vts: fix TryDifferentGovernors in Power hal test
am:
ae96eee82b
Change-Id: I700de5db71fb60b33983309d8d71a672dd2f98a3
Chong Zhang [Tue, 25 Apr 2017 00:18:25 +0000 (17:18 -0700)]
cas: add CAS hal
Add CAS hal definitions and default service implementation.
bug:
22804304
Change-Id: I0a89608fe75c5f3c5e6888f9b771305742760707
bohu [Fri, 23 Jun 2017 19:31:42 +0000 (12:31 -0700)]
vts: fix TryDifferentGovernors in Power hal test
The test should return when it cannot open cpu governor files
BUG:
62138092
Test: build sdk_gphone_x86-userdebug, launch emulator,
run test: run vts -m VtsHalPowerV1_0Target
The test should all pass.
Change-Id: I3b47261e9525b6a04e995dac1ad63d9cc088b004
Yahan Zhou [Fri, 23 Jun 2017 18:10:15 +0000 (18:10 +0000)]
Merge "Merge "Camera: fix recursive lock in CameraDevice 1.0" into oc-dev am:
eed6653f2a am:
2ff1f7e687" into oc-dr1-dev-plus-aosp
am:
ac1a3ad5e1
Change-Id: I8b3f099472428b615f511ece4b4ba3da0627ae3b
Yahan Zhou [Fri, 23 Jun 2017 18:09:56 +0000 (18:09 +0000)]
Merge "Camera: fix recursive lock in CameraDevice 1.0" into oc-dev am:
eed6653f2a am:
a61c24c091
am:
b4f9d09da8
Change-Id: I747db72205b2c01b3a328d752b02e3cb272bfc15
Android Build Merger (Role) [Fri, 23 Jun 2017 18:05:11 +0000 (18:05 +0000)]
Merge "Merge "Camera: fix recursive lock in CameraDevice 1.0" into oc-dev am:
eed6653f2a am:
2ff1f7e687" into oc-dr1-dev-plus-aosp
Yahan Zhou [Fri, 23 Jun 2017 18:04:56 +0000 (18:04 +0000)]
Merge "Camera: fix recursive lock in CameraDevice 1.0" into oc-dev am:
eed6653f2a
am:
2ff1f7e687
Change-Id: I0cf1590eadb4965c03474ded10898a40af344755
Yahan Zhou [Fri, 23 Jun 2017 18:04:55 +0000 (18:04 +0000)]
Merge "Camera: fix recursive lock in CameraDevice 1.0" into oc-dev am:
eed6653f2a
am:
a61c24c091
Change-Id: I3144fd4dd59d909fb503b2accce70719f6c150b2
Yahan Zhou [Fri, 23 Jun 2017 17:59:26 +0000 (17:59 +0000)]
Merge "Camera: fix recursive lock in CameraDevice 1.0" into oc-dev
am:
eed6653f2a
Change-Id: Ia962664983096059da8ecbffa7f13ef525e4a6e4
Yahan Zhou [Fri, 23 Jun 2017 17:59:25 +0000 (17:59 +0000)]
Merge "Camera: fix recursive lock in CameraDevice 1.0" into oc-dev
am:
eed6653f2a
Change-Id: I66f434944d2a00bee6c06d0883b916c5c87d1243
TreeHugger Robot [Fri, 23 Jun 2017 17:51:15 +0000 (17:51 +0000)]
Merge "Camera: fix recursive lock in CameraDevice 1.0" into oc-dev
Steven Moreland [Fri, 23 Jun 2017 17:28:55 +0000 (17:28 +0000)]
Merge "Remove toString methods in Vehicle HAL." into oc-dev-plus-aosp am:
990b076833
am:
5e2d6e2959 -s ours
Change-Id: I1226e5fc9d2f545398413edddd669f51c605b442
Steven Moreland [Fri, 23 Jun 2017 17:23:57 +0000 (17:23 +0000)]
Merge "Remove toString methods in Vehicle HAL." into oc-dev-plus-aosp
am:
990b076833
Change-Id: If04916713fd01e6b0b98f24d72ce684e83a3dfd0
Steven Moreland [Fri, 23 Jun 2017 17:14:01 +0000 (17:14 +0000)]
Merge "Remove toString methods in Vehicle HAL." into oc-dev-plus-aosp
Shawn Willden [Fri, 23 Jun 2017 15:58:57 +0000 (15:58 +0000)]
Merge "Merge "Test import of a EC P-521 key." into oc-dev am:
ad40c6ccd7 -s ours am:
3ac476c241 -s ours" into oc-dr1-dev-plus-aosp
am:
a539931f3f -s ours
Change-Id: I13d9989226e2c0a727f5cc9c35520b4ed59d9122
Shawn Willden [Fri, 23 Jun 2017 15:58:34 +0000 (15:58 +0000)]
Merge "Test import of a EC P-521 key." into oc-dev am:
ad40c6ccd7 am:
6715433ca7 -s ours
am:
a36cf1c6a0 -s ours
Change-Id: I0e32b4709737dd4acb49e3fd33782a2cc046e2fe
Android Build Merger (Role) [Fri, 23 Jun 2017 15:44:31 +0000 (15:44 +0000)]
Merge "Merge "Test import of a EC P-521 key." into oc-dev am:
ad40c6ccd7 -s ours am:
3ac476c241 -s ours" into oc-dr1-dev-plus-aosp
Shawn Willden [Fri, 23 Jun 2017 15:44:17 +0000 (15:44 +0000)]
Merge "Test import of a EC P-521 key." into oc-dev am:
ad40c6ccd7
am:
6715433ca7 -s ours
Change-Id: Ia83c6188b1cec97b442016c156e4550a0254604e
Shawn Willden [Fri, 23 Jun 2017 15:44:17 +0000 (15:44 +0000)]
Merge "Test import of a EC P-521 key." into oc-dev am:
ad40c6ccd7 -s ours
am:
3ac476c241 -s ours
Change-Id: I276e2a9e81425f93ab2ce1f9115b4863f6930049
Shawn Willden [Fri, 23 Jun 2017 15:39:19 +0000 (15:39 +0000)]
Merge "Test import of a EC P-521 key." into oc-dev
am:
ad40c6ccd7
Change-Id: I42bd0035153a5312b4654ec8b27f6ad6589d56e1
Shawn Willden [Fri, 23 Jun 2017 15:39:17 +0000 (15:39 +0000)]
Merge "Test import of a EC P-521 key." into oc-dev
am:
ad40c6ccd7 -s ours
Change-Id: I725a855d206b47df230529fefb9ff99197ac23c8
TreeHugger Robot [Fri, 23 Jun 2017 15:32:14 +0000 (15:32 +0000)]
Merge "Test import of a EC P-521 key." into oc-dev
OSDN Git Service
