Commit Graph

660 Commits

Author SHA1 Message Date
Justin Yun
608d773ef8 Update make file for vndk enabled.
Update the Android.bp generated with hidl-gen.

Test: build with and without BOARD_VNDK_VERSION=current
Bug: 63866913
Change-Id: I1a9db1df49e0f13c5790da2b118ae9ec63ba34a7
2017-08-04 14:12:23 +09:00
Tri Vo
f5d136c231 Update Android.bp HIDL makefiles
Allow HAL definition libs to be static.

Bug: 32920003
Bug: 64040096
Test: update-all-google-makefiles.sh
Change-Id: I1483d572bea6799717d1614fb7d52fe225e31104
2017-08-03 00:30:01 +00:00
Yin-Chia Yeh
e31ea3ab65 Merge "Camera: reset callback after test done" into oc-dev
am: 72ff9a1e38

Change-Id: I194688afcf1143f7ac40416150986cd8e4ad02aa
2017-08-01 22:05:24 +00:00
TreeHugger Robot
72ff9a1e38 Merge "Camera: reset callback after test done" into oc-dev 2017-08-01 21:40:35 +00:00
Emilian Peev
39e2d42dcb Merge "NO PARTIAL RERUN Camera: Update stream consumer usage flag" into oc-dev
am: 456dc6cc86

Change-Id: I2101aa5931f85f78f19e35922bdecfabd4687c65
2017-07-31 16:28:17 +00:00
TreeHugger Robot
456dc6cc86 Merge "NO PARTIAL RERUN Camera: Update stream consumer usage flag" into oc-dev 2017-07-31 16:22:23 +00:00
TreeHugger Robot
48e25765d1 Merge "Camera: Update stream consumer usage flag" into oc-dr1-dev 2017-07-31 16:21:44 +00:00
Yin-Chia Yeh
d42258ea80 Camera: fix various VTS issues
am: a0dd95d45d

Change-Id: I1fe7b8e4e17af70776f197ea25ecdd4281c34e5c
2017-07-31 08:55:46 +00:00
Emilian Peev
d9a7d3cd95 NO PARTIAL RERUN Camera: Update stream consumer usage flag
It is possible that the current default consumer usage
flag may not be supported by some provider implementations.
Use either HW composer or some other flag that is appropriate
for the specific use case.

Merged-In: I04f89bf67166805191d6d40e5bd93c15ebc97ea6
Bug: 63913159
Test: vts-tradefed run commandAndExit vts --skip-all-system-status-check
--skip-preconditions --primary-abi-only --module
VtsHalCameraProviderV2_4Target -l INFO

Change-Id: I04f89bf67166805191d6d40e5bd93c15ebc97ea6
2017-07-31 09:36:56 +01:00
Yin-Chia Yeh
a0dd95d45d Camera: fix various VTS issues
Also fix wrong return values for processCaptureRequest in default
wrapper.

Test: running camera VTS
Bug: 64041692
Change-Id: I397390af7c85a776713f6287bef1c4d11c721c9a
Merged-In: I397390af7c85a776713f6287bef1c4d11c721c9a
2017-07-28 13:22:42 -07:00
Emilian Peev
bba0a5498a Camera: Update stream consumer usage flag
It is possible that the current default consumer usage
flag may not be supported by some provider implementations.
Use either HW composer or some other flag that is appropriate
for the specific use case.

Bug: 63913159
Test: vts-tradefed run commandAndExit vts --skip-all-system-status-check
--skip-preconditions --primary-abi-only --module
VtsHalCameraProviderV2_4Target -l INFO

Change-Id: I04f89bf67166805191d6d40e5bd93c15ebc97ea6
2017-07-28 10:07:50 +01:00
Yin-Chia Yeh
5311547c05 Merge "Camera: fix various VTS issues" into oc-dr1-dev 2017-07-27 23:08:56 +00:00
Yin-Chia Yeh
d17bb31a0d Merge "Camera: reset callback after test done" into oc-mr1-dev 2017-07-27 22:09:12 +00:00
TreeHugger Robot
34c5caaa9f Merge "Camera: fix various VTS issues" into oc-mr1-dev 2017-07-27 22:04:59 +00:00
Yin-Chia Yeh
fafbc479db Camera: fix various VTS issues
Also fix wrong return values for processCaptureRequest in default
wrapper.

Test: running camera VTS
Bug: 64041692
Change-Id: I397390af7c85a776713f6287bef1c4d11c721c9a
Merged-In: I397390af7c85a776713f6287bef1c4d11c721c9a
2017-07-27 18:45:30 +00:00
Yin-Chia Yeh
e9ab8227ae Camera: fix various VTS issues
Also fix wrong return values for processCaptureRequest in default
wrapper.

Test: running camera VTS
Bug: 64041692
Change-Id: I397390af7c85a776713f6287bef1c4d11c721c9a
2017-07-27 11:43:24 -07:00
Yin-Chia Yeh
feb0ddde26 Camera: add camera owners
Test: none
Change-Id: I1a221feea480139d78c9b10dcd6c7c88955901bd
Merged-In: I1a221feea480139d78c9b10dcd6c7c88955901bd
(cherry picked from commit 14a5810a2e)
2017-07-27 18:21:51 +00:00
Yin-Chia Yeh
557cce559a Camera: reset callback after test done
Back port from master

Test: VTS test pass
Bug: 63570734
Change-Id: Ic0eecaf843b5c2e78f60325090ea652d43a74a0b
Merged-In: Ic0eecaf843b5c2e78f60325090ea652d43a74a0b
2017-07-26 17:13:30 -07:00
TreeHugger Robot
eba1407b55 Merge "Camera: reset callback after test done" into oc-dr1-dev 2017-07-26 21:28:45 +00:00
Emilian Peev
7596b25bf9 Camera: Update stream consumer usage flag
It is possible that the current default consumer usage
flag may not be supported by some provider implementations.
Use either HW composer or some other flag that is appropriate
for the specific use case.

Merged-In: I04f89bf67166805191d6d40e5bd93c15ebc97ea6
Bug: 63913159
Test: vts-tradefed run commandAndExit vts --skip-all-system-status-check
--skip-preconditions --primary-abi-only --module
VtsHalCameraProviderV2_4Target -l INFO

Change-Id: I04f89bf67166805191d6d40e5bd93c15ebc97ea6
2017-07-26 11:15:38 +01:00
Eino-Ville Talvala
4c652d5639 Merge "Camera: Don't enforce result metadata queue support" into oc-dev
am: 1d1b503b77

Change-Id: I701fc97cde2dab420b84a7c9ba0afaa36a91754e
2017-07-25 21:09:04 +00:00
Emilian Peev
bec2968e51 Camera: Don't enforce result metadata queue support
Some provider implementations could still be using direct
transfer of the result metadata through hw binder.

Merged-In: Ib2adaff005af77385767a32c1ed069371a6e9b7a
Bug: 63970723
Test: vts-tradefed run commandAndExit vts --skip-all-system-status-check
--skip-preconditions --module VtsHalCameraProviderV2_4Target -l INFO
Change-Id: Ib2adaff005af77385767a32c1ed069371a6e9b7a
2017-07-25 18:06:58 +01:00
Emilian Peev
3b740fa689 Camera: Don't enforce result metadata queue support
Some provider implementations could still be using direct
transfer of the result metadata through hw binder.

Bug: 63970723
Test: vts-tradefed run commandAndExit vts --skip-all-system-status-check
--skip-preconditions --module VtsHalCameraProviderV2_4Target -l INFO
Change-Id: Ib2adaff005af77385767a32c1ed069371a6e9b7a
2017-07-25 15:09:41 +01:00
Emilian Peev
fa3a98bb28 Camera: Don't enforce result metadata queue support
Some provider implementations could still be using direct
transfer of the result metadata through hw binder.

Merged-In: Ib2adaff005af77385767a32c1ed069371a6e9b7a
Bug: 63970723
Test: vts-tradefed run commandAndExit vts --skip-all-system-status-check
--skip-preconditions --module VtsHalCameraProviderV2_4Target -l INFO
Change-Id: Ib2adaff005af77385767a32c1ed069371a6e9b7a
2017-07-25 15:06:06 +01:00
Yin-Chia Yeh
83f4904d51 Camera: reset callback after test done
Test: VTS test pass
Bug: 63570734
Change-Id: Ia7b1e8e9baae2885d9c43821fe2933df883f7892
Merged-In: Ic0eecaf843b5c2e78f60325090ea652d43a74a0b
2017-07-20 12:05:21 -07:00
Zhuoyao Zhang
6e87e4c864 Update VtsHalCameraProviderV2_4TargetTest
* Use VtsHalHidlTargetTestEnvBase to run test against different service name

Bug:62946472
Test: make vts
      vts-tradefed run vts -m VtsHalCameraProviderV2_4Target

Change-Id: I12edce57c237cb6674e0aff437c3389e5ad9e028
2017-07-14 16:48:52 -07:00
Yin-Chia Yeh
719d3fceb3 Camera: reset callback after test done
Test: VTS test pass
Bug: 63570734
Change-Id: Ia7b1e8e9baae2885d9c43821fe2933df883f7892
Merged-In: Ia7b1e8e9baae2885d9c43821fe2933df883f7892
2017-07-11 23:46:16 +00:00
Jiyong Park
ec648686db Build camera.device@1.0-impl with BOARD_VNDK_VERSION
Add the dependency to media_plugin_headers since global include path is
not provided when building with BOARD_VNDK_VERSION

Bug: 37342627
Test: BOARD_VNDK_VERSION=current m -j camera.device@1.0-impl.vendor

(cherry picked from commit ef25b10aeb5134046c9acc3fbddbda1783fd32f0)

Change-Id: I506ad4d70b708d129cdc7842cc772c20d9b4197b
2017-07-10 12:37:00 +09:00
Emilian Peev
2fe705b726 Merge "Camera: Try adding a passthrough legacy service" into oc-dr1-dev am: efe973102a
am: 3518e360ca

Change-Id: I52e70a41a8e74f6cbb7ec4be041417da6089d2a2
2017-06-30 18:14:01 +00:00
Emilian Peev
48a0992dd4 Camera: Try adding a passthrough legacy service
Listing by interface on passthrough only devices doesn't
return the legacy implementation that might be present.
For this case try to connect to the legacy provider and
check whether such implementation does in fact exist.

Bug: 62835396
Test: vts-tradefed run commandAndExit vts --skip-all-system-status-check
--skip-preconditions --module VtsHalCameraProviderV2_4Target -l INFO

Change-Id: Ifdc1b15392f5418fd0d949953bb6bdb1f3612ee8
2017-06-30 08:19:19 -07:00
Emilian Peev
e6522390bb Camera: Try to test additional types of camera providers NO PARTIAL RERUN
Check whether different types of camera providers got
registered and try to test them if present.

Merged-In: I5c0c678e74d56cd8307d2f4e63b7c6dfa95d210d
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-29 16:21:44 -07:00
Emilian Peev
1af9528966 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.

Merged-In: I5c0c678e74d56cd8307d2f4e63b7c6dfa95d210d
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-29 08:02:08 -07:00
Emilian Peev
ed0a5d2eba Merge "Camera: Add support for testing partial results" into oc-dev
am: 98b7dd57dc

Change-Id: If210f365f31053c718aee550d1a3e8d6432ff97b
2017-06-29 01:48:49 +00:00
TreeHugger Robot
98b7dd57dc Merge "Camera: Add support for testing partial results" into oc-dev 2017-06-29 01:46:13 +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
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
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
Emilian Peev
74b543d565 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
2017-06-26 11:58:15 -07:00
TreeHugger Robot
c60ec1c2ac Merge "Camera: Add support for testing partial results" into oc-dr1-dev 2017-06-26 18:42:48 +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
Yahan Zhou
77dd4aaad3 Camera: fix recursive lock in CameraDevice 1.0
Several functions call close() while they are holding a lock, which
results in recursive locking. This CL implements close_locked() to avoid
such behavior.

Bug: 62919192
Test: run vts -m VtsHalCameraProviderV2_4Target, and camera should still
work after it

Change-Id: Ib38e1de19ed3c927bfb645c0c777c04f157f2b88
2017-06-23 00:28:11 +00:00
Emilian Peev
9af635c564 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.

Bug: 62550376
Bug: 37533777
Test: adb shell
/data/nativetest/VtsHalCameraProviderV2_4TargetTest/VtsHalCameraProviderV2_4TargetTest

Change-Id: I3769d4ccc0047dc4eda173ea3bca538b026be8d2
2017-06-21 15:00:12 +01:00
Martijn Coenen
14adc6ebc0 Make camera/drm helper classes available to system.
As VTS tests are considered system and link against these.

Bug: 38302533
Bug: 62523241
Test: builds
Change-Id: Iac5c872c58ec9646d6d6974aacceb930daad7e5e
2017-06-20 08:57:46 -07:00
TreeHugger Robot
e599e41a1e Merge "Move CameraParameters class to android.hardware.camera.common@1.0-helper" into oc-dr1-dev 2017-06-20 07:17:47 +00:00
Yin-Chia Yeh
1ea71cc4f2 Merge "Camera: fix camera_metadata address expectation" into oc-dev
am: e812feb56f

Change-Id: I9142f4bb7a55f9c1e6547a038b21f7cbb4e5adba
2017-06-16 19:40:12 +00:00
Yin-Chia Yeh
8bc10783a9 Merge "Camera: fix camera_metadata address expectation" into oc-dev
am: e812feb56f

Change-Id: Id3e433048cf25e8c50aa20e97dca6e3112f0fb57
2017-06-16 19:37:00 +00:00
Yin-Chia Yeh
92d885b558 Camera: fix camera_metadata address expectation
On 32bits architecture, binder driver might allocate
non-8 bytes aligned buffers.

Test: compile (problem not reproducible on 64bit SOCs)
Bug: 62637461
Change-Id: I8ef2b3ecba783a8d189ebe18733082d32cff4899
2017-06-15 14:27:13 -07:00
Jiyong Park
b9b59bdca4 Move CameraParameters class to android.hardware.camera.common@1.0-helper
The CameraParamters class is widely used by many of the camera-related
vendor libs. However, they have been using the class from the
libcamera_client.so which is not a VNDK library.

By moving the class to the common@1.0-helper, which is available to
vendors, we can eliminate the dependency to libcamera_client.so from the
vendor libs.

Bug: 62523241
Test: 2016/2017 Pixel devices build and boots. Camera functionalities
work.

Change-Id: I3f69f1591663390c050d1e75ac2957d3ecc38ba7
2017-06-12 22:45:10 +09:00
Chih-Hung Hsieh
d3bc681f26 Remove unused lambda capture
New clang compiler gives warning to unused lambda captures.
Apply clang-format.

Bug: 37423073
Test: Build

Change-Id: Icdf019df1a6c9dcadeb35551377d7afa09eebb3e
(cherry picked from commit 7eb57b60ab)
2017-06-07 12:57:20 -07:00