Commit graph

166 commits

Author SHA1 Message Date
Steven Moreland
c2f829a1d2 Updating makefiles for hidl_interface.
Bug: 64487114
Test: manual
Merged-In: Ie13d9e014cf2b81c18c67f551b4644fb9f0ba812
Change-Id: Ie13d9e014cf2b81c18c67f551b4644fb9f0ba812
2017-11-13 11:39:07 -08:00
Steven Moreland
116161d94e Update for Soong java makefiles. am: c3e80fa01e am: 0fff75dee1
am: 6c811964a1

Change-Id: I85ccbb4a15cd18938607f5bca4e065b9d7e0182b
2017-10-11 16:31:07 +00:00
Steven Moreland
0fff75dee1 Update for Soong java makefiles.
am: c3e80fa01e

Change-Id: Ia8835f9c95bd98a96f5fd3aff11191e7d3726fb9
2017-10-11 16:23:54 +00:00
Steven Moreland
c3e80fa01e Update for Soong java makefiles.
Test: pass
Bug: 33420795
Change-Id: Id9b1919a19b8ff682738cfb0869a479b4dbb4293
2017-10-10 23:07:20 +00:00
Steven Moreland
9a17f41f6f Merge "Update for hidl adapter module defaults." am: 988c977079 am: 861651985f
am: b53e6ad535

Change-Id: I23269fb7a9bdd352e670a80f390527d9eef31412
2017-10-04 21:51:00 +00:00
Steven Moreland
861651985f Merge "Update for hidl adapter module defaults."
am: 988c977079

Change-Id: I289818be1b30397391847ba1c532d1014fdbed27
2017-10-04 21:45:09 +00:00
Steven Moreland
527fd76a0e Update for hidl adapter module defaults.
Test: pass
Change-Id: Idc6a943149a279bf17cfcfd0f2571473e53bbbbf
2017-10-04 12:47:03 -07:00
Eino-Ville Talvala
6e7079328f Camera: Update VTS for new camera@3.3 interfaces
am: e224f065b8

Change-Id: I9f2f442528306cc53eef23901cb65e9c8029855d
2017-10-03 19:23:03 +00:00
Emilian Peev
316ef90e24 Camera: Enable VTS tests for 3.3 camera devices
am: 5eb1aa3f2b

Change-Id: I7094bc338c603265a25dcc19831f9cb931cd30e1
2017-10-03 19:22:58 +00:00
Eino-Ville Talvala
e224f065b8 Camera: Update VTS for new camera@3.3 interfaces
- Cross check device version in name with ICameraDeviceSession version
- Switch all calls to configureStreams to configureStreams_3_3 when
  a v3.3 ICameraDeviceSession is available

Test: Test passes on v3.3 devices, doesn't regress on v3.2
Bug: 62358514
Change-Id: I7450e5d5119c5ec1fe9f1360bfc99fc8a47d0936
2017-10-02 12:35:32 -07:00
Emilian Peev
5eb1aa3f2b Camera: Enable VTS tests for 3.3 camera devices
A new 3.3 Camera device API is available and devices supporting it
need to be tested as well.

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

For passthrough devices: run commandAndExit vts
--skip-all-system-status-check --skip-preconditions --abi armeabi-v7a
--module VtsHalCameraProviderV2_4Target -l INFO

Change-Id: I91adb3c1867cdd8f8f810a2bd5b0a8ba2b0c1fcf
2017-10-02 11:02:16 -07:00
Steven Moreland
fe46a35243 Update makefiles for transitive interfaces.
Transitive includes accidentally added by hidl-gen
were getting added to import lists. This import isn't
actually required and is now properly excluded from
hidl-gen update makefiles.

Bug: 65055216
Test: none
Change-Id: I4fb4de8ef5547a3081cd55b3c75f6288cc518ba6
2017-09-26 18:00:30 -07:00
Steven Moreland
9fdd241905 Merge "Fix typo in update makefiles." am: 9960148420 am: f07e364ce3
am: 71a193a425

Change-Id: I45ae43f07323254212532acbf0f891d11143b05f
2017-09-26 23:58:51 +00:00
Steven Moreland
f07e364ce3 Merge "Fix typo in update makefiles."
am: 9960148420

Change-Id: I949634e72f817f3a5411130e968acd8efd1d7725
2017-09-26 23:51:07 +00:00
Steven Moreland
a5299ee739 Fix typo in update makefiles.
Bug: 37518178
Test: pass
Change-Id: Ic401b3a473f15ca4c01e58b3072e19db7c31b653
2017-09-26 21:59:43 +00:00
Steven Moreland
97228c0b7d Update makefiles for hidl adapter. am: 26a0bb2762 am: 73949c1d7e
am: b94d0c7290

Change-Id: If766cffbcc003cc0cc5eb98969b924aa918fff44
2017-09-26 12:53:13 +00:00
Steven Moreland
73949c1d7e Update makefiles for hidl adapter.
am: 26a0bb2762

Change-Id: I3a811f5cd49bd4e81e8fcd5c8e88922115812539
2017-09-25 23:14:44 +00:00
Steven Moreland
26a0bb2762 Update makefiles for hidl adapter.
Bug: 37518178
Test: manual
Change-Id: I50e999907d3c64d2b039272b823971998da64d1b
2017-09-25 18:35:56 +00:00
Eino-Ville Talvala
50fe430994 Camera: Add default implementation of camera.device@3.3
Inherit as much as possible from camera.device@3.2

- Refactor CameraDeviceSession@3.2 implementation to separate out the
  HIDL session interface from the main implementation object. This
  avoids multiple inheritance issues
- Create CameraDeviceSession@3.3 with support for the new
  overrideDataspace field
- Add virtual factory method for CameraDevice to create the right version
  of Session.
- Create CameraDevice@3.3, which overrides createSession to return a
  CameraDeviceSession@3.3.
- Add system property to override selection of which minor HIDL
  version is used for legal HAL version 3.x; set the default to the
  newest available minor version.

Test: Camera CTS passes on device using @3.3.
Bug: 62358514
Change-Id: I497e4bc0de798b56ecdb2ea6467b79afccaf89f7
2017-09-15 11:08:48 -07:00
Zhuoyao Zhang
6afb992759 Update vts test to use the updated test template.
* For registerTestService/getServiceName, no need to pass
  any hard coded string of HAL service FQName.
* Affect test: VtsHalCameraProviderV2_4TargetTest,
               VtsHalGraphicsComposerV2_1TargetTest,
               VtsHalNeuralnetworksV1_0TargetTest

Bug: 62946472
Bug: 64203181

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

Merged-In: If365ab2ed9a91eb4013d71769804b9d4bf089d66
Change-Id: Id0bddbc2949337147557f45cc60dbfaa114ce25e
(cherry picked from commit d71b654d6d)
2017-08-29 17:44:10 +00:00
TreeHugger Robot
1f789fc39c Merge "Camera test statically links to dependencies." into oc-mr1-dev 2017-08-21 18:34:31 +00:00
Emilian Peev
fe8f3a8e89 Merge "Camera: Switch 'cancelPictureFail' to 'cancelPictureNOP'" into oc-dev am: e2dae8c258
am: 4fa40be5ef

Change-Id: I9a628c55a78651550f663b28eb2ddff0c08cde25
2017-08-15 20:33:44 +00:00
Emilian Peev
4fa40be5ef Merge "Camera: Switch 'cancelPictureFail' to 'cancelPictureNOP'" into oc-dev
am: e2dae8c258

Change-Id: If093cdfdb9ea0a327a5e67dc0dd40facc466de5c
2017-08-15 20:27:50 +00:00
Emilian Peev
e2ecbe00f0 Camera: Switch 'cancelPictureFail' to 'cancelPictureNOP'
Calls to 'cancelPicture' should be no-ops in case image capture
is not active.

Bug: 64569316
Test: vts-tradefed run commandAndExit vts --skip-all-system-status-check
--skip-preconditions --primary-abi-only --module
VtsHalCameraProviderV2_4Target -l INFO
Change-Id: I5fad0a5b7aafd208c3a1b2f62a2b9046cde858d1
2017-08-15 18:22:08 +00:00
Steven Moreland
f5da927e19 Updating all makefiles.
am: dfd8287506

Change-Id: I915b69ab3a46f25b9abeb525066d6ea89d162176
2017-08-14 21:05:52 +00:00
Steven Moreland
dfd8287506 Updating all makefiles.
Bug: 64487114
Test: none
Merged-In: I8608c8f636c35f21e4246a805a9eff6d14124e0a
Merged-In: I2fa89b6661c39859ec4fb62c4bb0a05a35e645f0
Merged-In: Ifdc3c17cb2b85c18b37dac2d03bb5c8935c23180
Change-Id: I170fa1c4fe39f8109b1670db58ef99bb11afc0be
2017-08-14 20:25:09 +00:00
Steven Moreland
ff308ea6ba Updating all makefiles.
Bug: 64487114
Test: none
Merged-In: I8608c8f636c35f21e4246a805a9eff6d14124e0a
Merged-In: I2fa89b6661c39859ec4fb62c4bb0a05a35e645f0
Change-Id: Ifdc3c17cb2b85c18b37dac2d03bb5c8935c23180
2017-08-11 22:58:47 +00:00
Emilian Peev
be959695e3 Camera: Switch 'cancelPictureFail' to 'cancelPictureNOP'
Calls to 'cancelPicture' should be no-ops in case image capture
is not active.

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

Change-Id: I5fad0a5b7aafd208c3a1b2f62a2b9046cde858d1
2017-08-11 10:42:05 +01:00
Tri Vo
7a998e53bc Camera test statically links to dependencies.
This test now statically links to HAL def libs which
are not guaranteed to be on the device.

Bug: 64040096
Test: vts-tradefed run commandAndExit vts --skip-all-system-status-check
--skip-preconditions --module VtsHalCameraProviderV2_4Target
Change-Id: Ib33fdfd45b10840cce363fcda291a62e56b1d4c8
2017-08-07 16:29:28 -07:00
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