Commit graph

5537 commits

Author SHA1 Message Date
Scott Randolph
968b355572 Update service name targeted by VTS test
Use the standard driver rather than the "mock" driver for testing.
Test:  Run the test.

Change-Id: I706eabaf33f6879a22359250ce02daaf4a7fe15f
2017-06-29 18:59:40 -07:00
Yahan Zhou
eafb6c3685 Merge "Fix ICryptoFactory service" into oc-dev am: 2c57b00b17 am: bd0c79c262
am: 4bcac22181

Change-Id: I5a1574f05d6af8c7c2ed81ab80d42db594fce252
2017-06-28 17:45:04 +00:00
Yahan Zhou
4687fd1d7f Merge "Fix ICryptoFactory service" into oc-dev am: 2c57b00b17 am: ef38715ba3
am: b95c8638c1

Change-Id: If2a03ecb43bf8880b87e89ff251780ac82a174c0
2017-06-28 17:44:47 +00:00
Yahan Zhou
4bcac22181 Merge "Fix ICryptoFactory service" into oc-dev am: 2c57b00b17
am: bd0c79c262

Change-Id: Ieaa270136b316cda710331f4afe4dd74639fdbdd
2017-06-28 17:37:11 +00:00
Yahan Zhou
b95c8638c1 Merge "Fix ICryptoFactory service" into oc-dev am: 2c57b00b17
am: ef38715ba3

Change-Id: Iebc7405f6603c2838ecaa917357eb81a977f140c
2017-06-28 17:33:39 +00:00
Yahan Zhou
bd0c79c262 Merge "Fix ICryptoFactory service" into oc-dev
am: 2c57b00b17

Change-Id: If739ab2d5a5c93ddd2bb8720305311ee49a5503d
2017-06-28 17:30:40 +00:00
Yahan Zhou
ef38715ba3 Merge "Fix ICryptoFactory service" into oc-dev
am: 2c57b00b17

Change-Id: I81cb1a353e63fea48f69e2fc522f70b63a1e8532
2017-06-28 17:30:40 +00:00
Yahan Zhou
2c57b00b17 Merge "Fix ICryptoFactory service" into oc-dev 2017-06-28 17:27:20 +00:00
Emilian Peev
81ac4074fe Merge "Camera: Try to test additional types of camera providers" into oc-dr1-dev am: c68231d171
am: 6d600e571c

Change-Id: I22e29abfa964c0448b39987e92b0173c49d59a49
2017-06-28 16:51:59 +00:00
Emilian Peev
6d600e571c Merge "Camera: Try to test additional types of camera providers" into oc-dr1-dev
am: c68231d171

Change-Id: I123b8b3f5be22b72401cc609d9bb2da8875b9897
2017-06-28 16:48:07 +00:00
TreeHugger Robot
c68231d171 Merge "Camera: Try to test additional types of camera providers" into oc-dr1-dev 2017-06-28 16:44:24 +00:00
pkanwar
84091d58ec 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
2017-06-28 05:25:06 +00:00
pkanwar
f8d86f66ac Radio Interface changes to allow the modem to query the framework for the key.
am: fc5f3558fe  -s ours

Change-Id: I115c93bb5523f112cd35870d4b6db3d5d5c65b0c
2017-06-28 05:18:42 +00:00
pkanwar
fc5f3558fe 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
2017-06-27 19:45:46 -07:00
Tomasz Wasilczyk
154c459128 Merge "Fix Broadcast radio 1.0 VTS to not fail on other radio types than AM/FM." 2017-06-27 21:28:07 +00:00
TreeHugger Robot
22aa41a3b1 Merge "Fix missing includes in camera.common" 2017-06-27 20:58:49 +00:00
Yifan Hong
a04a913c77 Fix missing includes in camera.common
Test: mma -j BOARD_VNDK_VERSION=current
Bug: 33241851
Change-Id: I471f05cf66e4c8532c428f9894fa4642139e03e2
2017-06-27 11:34:02 -07:00
TreeHugger Robot
2969289c1d Merge "OemLock functional VTS test." 2017-06-27 18:17:59 +00:00
Nathan Harold
295ef84a45 Merge commit 'bf7dcd2a' into oc-dr1-dev-plus-aosp
am: 2b6bf9c26d

Change-Id: Icbc44391fc6a010c16ca31a1c0a1b690dd4bb8d9
2017-06-27 10:38:13 +00:00
Andrew Scull
3aee4e9e3f OemLock functional VTS test.
Bug: 37530310
Test: VtsHalOemLockV1_0TargetTest
Change-Id: I07adb187f9bde236e2c92f423936089f4cb37b24
2017-06-27 10:36:11 +01:00
Nathan Harold
2b6bf9c26d Merge commit 'bf7dcd2a' into oc-dr1-dev-plus-aosp
Change-Id: Ic64fbf4782e129e15f0edbe2db810e81b04acd82
2017-06-27 01:35:04 -07:00
TreeHugger Robot
bf7dcd2adb Merge "Radio Keepalive HAL" into oc-dr1-dev 2017-06-27 08:13:36 +00:00
Emilian Peev
a37b73598b 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
2017-06-26 16:35:41 -07:00
TreeHugger Robot
5e463f12c5 Merge "Revert "EVS: Android.bp -> Android.mk"" 2017-06-26 23:26:57 +00:00
Tomasz Wasilczyk
da72d37770 Fix Broadcast radio 1.0 VTS to not fail on other radio types than AM/FM.
Bug: b/36864090
Test: VTS
Change-Id: I402f2fb00a553af2118e8a7595f5b377befcaa01
2017-06-26 16:22:51 -07:00
Steven Moreland
731531d87f Revert "EVS: Android.bp -> Android.mk"
This reverts commit ee4f923b31.

Change-Id: I8b8490b3e828a9a31af8f6f823d9c70e1c11c9c5
2017-06-26 19:22:03 +00:00
Emilian Peev
4f8ed9c082 Merge "Camera: Add support for testing partial results" into oc-dr1-dev am: c60ec1c2ac
am: f4a37fcdff

Change-Id: I14bb66c67e703dfe7f1d83aeaacaefbb7fb1baff
2017-06-26 18:56:29 +00:00
Emilian Peev
f4a37fcdff Merge "Camera: Add support for testing partial results" into oc-dr1-dev
am: c60ec1c2ac

Change-Id: I6fac06fbe7f60712877933dc05fe10e256f705b1
2017-06-26 18:50:43 +00:00
TreeHugger Robot
c60ec1c2ac Merge "Camera: Add support for testing partial results" into oc-dr1-dev 2017-06-26 18:42:48 +00:00
Steven Moreland
e728667b4e Merge "Use vendor variant of libstagefright_foundation." into oc-dr1-dev am: 424a4be6b1
am: 778576ffdc

Change-Id: I8fa6f4b21d632f76fcb56efc774d0bddfad7f323
2017-06-26 18:04:58 +00:00
Steven Moreland
778576ffdc Merge "Use vendor variant of libstagefright_foundation." into oc-dr1-dev
am: 424a4be6b1

Change-Id: Iea3484f0926f9792744e552b39976992111260ab
2017-06-26 17:59:20 +00:00
TreeHugger Robot
424a4be6b1 Merge "Use vendor variant of libstagefright_foundation." into oc-dr1-dev 2017-06-26 17:54:15 +00:00
bohu
2d4b941fae vts: fix TryDifferentGovernors in Power hal test am: ae96eee82b am: 9165643690
am: b808408f69

Change-Id: Id23d3643840e703a8689b0cb665ab83aed467565
2017-06-24 02:36:44 +00:00
bohu
b808408f69 vts: fix TryDifferentGovernors in Power hal test am: ae96eee82b
am: 9165643690

Change-Id: I74bcbf7a7cae58c7b3b120ed8ae75fe300506edc
2017-06-24 02:33:44 +00:00
bohu
dc0a5ddc4e vts: fix TryDifferentGovernors in Power hal test am: ae96eee82b am: 69dc5c836f
am: 26181331a6

Change-Id: Ib1dbfe93fc3e4c79937495a9b3d64585077b7387
2017-06-24 02:23:15 +00:00
bohu
26181331a6 vts: fix TryDifferentGovernors in Power hal test am: ae96eee82b
am: 69dc5c836f

Change-Id: Id006b7a46d42d87091aed336d19e2aa3ff7f3f45
2017-06-24 02:17:15 +00:00
bohu
69dc5c836f vts: fix TryDifferentGovernors in Power hal test
am: ae96eee82b

Change-Id: Iaa383d8d150b8b633c3d238c52622fddc0d3ec09
2017-06-24 02:10:23 +00:00
bohu
9165643690 vts: fix TryDifferentGovernors in Power hal test
am: ae96eee82b

Change-Id: I700de5db71fb60b33983309d8d71a672dd2f98a3
2017-06-24 02:09:26 +00:00
bohu
ae96eee82b 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
2017-06-23 19:39:43 +00:00
Yahan Zhou
938a0a92b3 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
2017-06-23 18:10:15 +00:00
Yahan Zhou
db5e858c8c Merge "Camera: fix recursive lock in CameraDevice 1.0" into oc-dev am: eed6653f2a am: a61c24c091
am: b4f9d09da8

Change-Id: I747db72205b2c01b3a328d752b02e3cb272bfc15
2017-06-23 18:09:56 +00:00
Android Build Merger (Role)
ac1a3ad5e1 Merge "Merge "Camera: fix recursive lock in CameraDevice 1.0" into oc-dev am: eed6653f2a am: 2ff1f7e687" into oc-dr1-dev-plus-aosp 2017-06-23 18:05:12 +00:00
Yahan Zhou
883bb1be80 Merge "Camera: fix recursive lock in CameraDevice 1.0" into oc-dev am: eed6653f2a
am: 2ff1f7e687

Change-Id: I0cf1590eadb4965c03474ded10898a40af344755
2017-06-23 18:04:56 +00:00
Yahan Zhou
b4f9d09da8 Merge "Camera: fix recursive lock in CameraDevice 1.0" into oc-dev am: eed6653f2a
am: a61c24c091

Change-Id: I3144fd4dd59d909fb503b2accce70719f6c150b2
2017-06-23 18:04:55 +00:00
Yahan Zhou
a61c24c091 Merge "Camera: fix recursive lock in CameraDevice 1.0" into oc-dev
am: eed6653f2a

Change-Id: Ia962664983096059da8ecbffa7f13ef525e4a6e4
2017-06-23 17:59:26 +00:00
Yahan Zhou
2ff1f7e687 Merge "Camera: fix recursive lock in CameraDevice 1.0" into oc-dev
am: eed6653f2a

Change-Id: I66f434944d2a00bee6c06d0883b916c5c87d1243
2017-06-23 17:59:25 +00:00
TreeHugger Robot
eed6653f2a Merge "Camera: fix recursive lock in CameraDevice 1.0" into oc-dev 2017-06-23 17:51:16 +00:00
Steven Moreland
ae3e6288d1 Merge "Remove toString methods in Vehicle HAL." into oc-dev-plus-aosp am: 990b076833
am: 5e2d6e2959  -s ours

Change-Id: I1226e5fc9d2f545398413edddd669f51c605b442
2017-06-23 17:28:55 +00:00
Steven Moreland
5e2d6e2959 Merge "Remove toString methods in Vehicle HAL." into oc-dev-plus-aosp
am: 990b076833

Change-Id: If04916713fd01e6b0b98f24d72ce684e83a3dfd0
2017-06-23 17:23:57 +00:00
Steven Moreland
990b076833 Merge "Remove toString methods in Vehicle HAL." into oc-dev-plus-aosp 2017-06-23 17:14:02 +00:00