Commit graph

263 commits

Author SHA1 Message Date
Steven Moreland
70bfb9d250 Merge "Update for hidl adapter module defaults." am: 988c977079 am: 861651985f am: b53e6ad535
am: 9a17f41f6f

Change-Id: I78d9292068b372238554fd9d35128e69f5b5f9d2
2017-10-04 21:54:11 +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
da67f485d1 Camera: Update VTS for new camera@3.3 interfaces am: e224f065b8
am: 6e7079328f

Change-Id: Ic41a248e723a35071b75d58317c9c481d26508e1
2017-10-03 19:40:37 +00:00
Emilian Peev
56cf04f628 Camera: Enable VTS tests for 3.3 camera devices am: 5eb1aa3f2b
am: 316ef90e24

Change-Id: I4e4178744c719e334d9d488b7224987b7a4f8fdc
2017-10-03 19:39:27 +00: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
21e87ff129 Update makefiles for transitive interfaces.
am: fe46a35243

Change-Id: I4cbfc3fdf2889cde31784b819ae984ae301da5bd
2017-09-27 22:02:23 +00:00
Steven Moreland
3788a7321f Update makefiles for hidl-adapter (2/2).
Bug: 37518178
Test: none
Change-Id: I77fe67964f89da8b66aeb8df6d424de0f8689f8d
2017-09-27 08:55:47 -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
91799c6cc7 Merge "Fix typo in update makefiles." am: 9960148420 am: f07e364ce3 am: 71a193a425
am: 9fdd241905

Change-Id: I1c852fa6600fecc44d5afd1a65a5f51c43ecf71c
2017-09-27 00:02:52 +00: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
7741c0e17b Update makefiles for hidl adapter. am: 26a0bb2762 am: 73949c1d7e am: b94d0c7290
am: 97228c0b7d

Change-Id: Ic4b459b7c1a4325453945b0b00db8f44e4e77c26
2017-09-26 13:36:09 +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
7fccf50db2 Merge "Camera: Add default implementation of camera.device@3.3" into oc-mr1-dev am: 3f55d8735e
am: d69e27a115

Change-Id: If3fe372f0574c318fb194dcab0ea2cee4fc827ff
2017-09-19 16:01:04 +00:00
Eino-Ville Talvala
d69e27a115 Merge "Camera: Add default implementation of camera.device@3.3" into oc-mr1-dev
am: 3f55d8735e

Change-Id: Ib621684a43181bfbf8fdf020128215d326fc4fbd
2017-09-19 15:57:03 +00:00
Eino-Ville Talvala
3f55d8735e Merge "Camera: Add default implementation of camera.device@3.3" into oc-mr1-dev 2017-09-19 15:53:43 +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
Yin-Chia Yeh
56a8fc8807 Merge "Camera: synchronize access to mMemoryMap" into oc-mr1-dev am: e79124c62b
am: 5df4db2e87

Change-Id: I17d8daf2c7d51cfe541d1b2364baa2cf2029340c
2017-09-15 09:20:33 +00:00
Yin-Chia Yeh
623ddbb528 Merge "Camera: synchronize access to mMemoryMap"
am: 2b888b349f

Change-Id: If68840c461ce96a8ff3749ae3d6628e9f548505d
2017-09-14 22:02:48 +00:00
Yin-Chia Yeh
5df4db2e87 Merge "Camera: synchronize access to mMemoryMap" into oc-mr1-dev
am: e79124c62b

Change-Id: I351da89fa72d626b2ec2ea580637ea531fa3010b
2017-09-14 21:54:51 +00:00
Yin-Chia Yeh
308f5b6e15 Camera: synchronize access to mMemoryMap
Test: stress test on partner device
Bug: 64831570
Change-Id: Ib9ece2f876ccb309c4f1bb8f90242a3e91081f47
Merged-In: Ib9ece2f876ccb309c4f1bb8f90242a3e91081f47
2017-09-14 12:18:05 -07:00
Yin-Chia Yeh
6550022dba Camera: synchronize access to mMemoryMap
Test: stress test on partner device
Bug: 64831570
Change-Id: Ib9ece2f876ccb309c4f1bb8f90242a3e91081f47
2017-09-12 16:35:29 -07:00
Jaekyun Seok
81104ae5ef Add 'vendor.' prefix to a vendor HAL service name
To prevent property name collisions between properties of system and
vendor, 'vendor.' prefix must be added to a vendor HAL service name.
You can see the details in http://go/treble-sysprop-compatibility.

Test: succeeded building and tested on a walleye device
Bug: 36796459
Change-Id: I4e8fbee791ec917a8f627a1366f4d44ec7e6febc
2017-09-12 08:01:42 +09:00
Martijn Coenen
567cbf1148 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-09-06 10:45:14 -07:00
Zhuoyao Zhang
4cf8cc0348 Merge "Update vts test to use the updated test template." into oc-mr1-dev
am: 69270ce30f

Change-Id: I6c34ee4d363c3d485abc8e71d938c1e3a98e6f51
2017-08-30 22:19:55 +00: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
Zhuoyao Zhang
a983b8fe62 Revert "Revert "Update vts test to use the updated test template.""
This reverts commit 43d7498d52.

Change-Id: If365ab2ed9a91eb4013d71769804b9d4bf089d66
2017-08-29 17:25:46 +00:00
Tony Mak
43d7498d52 Revert "Update vts test to use the updated test template."
This reverts commit d71b654d6d.

Reason for revert: It breaks some targets in master
                   Example error: https://android-build.googleplex.com/builds/submitted/4303994/sailfish-userdebug_fastbuild3_linux/latest/view/logs/build_error.log

Change-Id: I63a90318bde8869972a8fc4b9a2cc36db26037f5
2017-08-29 10:14:32 +00:00
Zhuoyao Zhang
d71b654d6d 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

Change-Id: Id0bddbc2949337147557f45cc60dbfaa114ce25e
2017-08-28 18:45:12 +00:00
Eino-Ville Talvala
cba87937e9 Merge "Camera: Add new minor revision camera.device@3.3" into oc-mr1-dev
am: a2c5f9365c

Change-Id: I30c3252db3b202377f37ddc480b45ae172e28c87
2017-08-24 18:38:39 +00:00
Eino-Ville Talvala
d09e5651ed Camera: Add new minor revision camera.device@3.3
This adds a single new member to the HalStream structure, used by
camera.device@3.2::ICameraDeviceSession.configureStreams, for
HALs to override the requested stream dataSpace.

This override may be used when the requested format is
IMPLEMENTATION_DEFINED.

Test: Builds
Bug: 62358514
Change-Id: Ie43e6cfd2ac52657c9366ff5297daa22c0bfa46c
2017-08-23 11:31:40 -07:00
Tri Vo
17962db268 Merge "Camera test statically links to dependencies." into oc-mr1-dev
am: 1f789fc39c

Change-Id: Ie35ffcc8fa8ba403d7805765d2d4d19a924211bd
2017-08-21 18:43:27 +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
d20434bfac Merge "Camera: Switch 'cancelPictureFail' to 'cancelPictureNOP'" into oc-mr1-dev
am: fc371311ad

Change-Id: If8cb5a802d75353e116b4debd3a4b7f304fd8eea
2017-08-15 22:31:44 +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
4f25c2a143 Revert "Revert "Updating all makefiles.""
Relanding without automotive/vehicle/2.0+2.1 changes.

This reverts commit 1020ebedfb.

Merged-In: I8608c8f636c35f21e4246a805a9eff6d14124e0a
Change-Id: Icc49df42c2bedf443d878d5d8fbaa53441ea65db
2017-08-11 23:02:01 +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
Steven Moreland
1020ebedfb Revert "Updating all makefiles."
This reverts commit 8ac1971678.

Reason for revert: Didn't remove automotive changes from this CL.

Merged-In: I8608c8f636c35f21e4246a805a9eff6d14124e0a
Change-Id: I1c660cffc8817ad0b33da9f6eceb3d88e7c48416
2017-08-11 22:56:56 +00:00