Commit graph

56 commits

Author SHA1 Message Date
Kenny Root
a4cef69367 Use canonical UniquePtr.h header
Change-Id: I0487bd53fc946e1a488d7109eebd402d1ecc5a0a
2013-09-11 14:51:09 -07:00
Kenny Root
36ab8ed76f keymaster: use new version fields in hw_module
The original version of this HAL used a field in keymaster_module to
represent the module's version number, but a later revision of the HAL
interface added a distinguisher between HAL module and device versions.
This is needed to support upgrade code in keystore.

(cherry picked from commit c124b23f94)

Bug: 10600582
Change-Id: Ia2b0cbeca5c507600228c39ec7a8402f819f8804
2013-09-10 18:14:49 +00:00
Kenny Root
6e1683f5d5 Add support for DSA and ECDSA key types
Change-Id: I4b7d11c0915c716a0f1be65f5933f33a36e0fb4b
2013-09-03 00:09:18 -07:00
Eino-Ville Talvala
4c543a1456 Enable native HAL tests to work for camera3 devices
Change-Id: Ie11270cc8cf301ec94795b595f0517ee3bad2817
2013-06-27 18:02:24 -07:00
Brian Carlstrom
63b64337fb Add larger RSA key sizes
Bug: 8734191
Change-Id: I82413505b32d5cdd2c4330c63d5f66e6b7e34634
2013-05-14 15:32:33 -07:00
Kenny Root
eca8b3cdf0 keymaster_test: simulate binder pages
Make sure pages we use in the unit tests are read-only maps from
/dev/zero

Bug: 8736730
Change-Id: I15d816a8fd3dd7313277c9f5c44c4a102a899d03
2013-04-27 09:01:19 -07:00
Igor Murashkin
3d991c8e85 Make raw tests optional, add sanity checks for format/resolutions static info.
Bug: 8654456
Change-Id: Iadd0d3c326d595dce2822a9bd3ff33ce8e8f6a36
2013-04-18 11:00:16 -07:00
Yu Shan Emily Lau
827e137bb1 Merge "Update the test output path." into jb-mr2-dev 2013-04-15 01:30:02 +00:00
Yu Shan Emily Lau
b7c4e1c40f Update the test output path.
In order for the automated test to pick up the test.
The output must be in /data/nativetest.

Change-Id: I453805a1d186fec014e34b3d37a1e8bc62b2a5ac
2013-04-12 14:53:58 -07:00
Ying Wang
9003b113d1 Add liblog
Bug: 8580410
Change-Id: I24645233148f70c57d2f2b3a46952cb2a1aea9ba
2013-04-09 21:57:28 -07:00
Igor Murashkin
fb40d5de36 camera2_test: Allow for HAL2 version >= 2.0 (i.e. 2.1, 3.0, etc)
Change-Id: If9004d2a6d5fc581b8f63814f2f115bcd7fa5a34
2013-03-26 18:07:31 -07:00
Igor Murashkin
7ed10fbdc8 Tests: Camera: Refactor CameraMetadata into frameworks/av
Change-Id: Ibc2917a18163f07b5e37eb83abb3d1ef919a5766
2013-02-21 17:11:32 -08:00
Igor Murashkin
7a7f357509 Tests: Camera2: Add Y8/Y16 to Stream create/delete tests
Change-Id: I7e066569edcab84c0d61fe7a4ae5c3e2683f63eb
2013-02-21 17:11:27 -08:00
Mathias Agopian
b4f1e62430 fix build: SurfaceTextureClient to Surface rename
Change-Id: I8b4bbccc570ddfaaad6f7eeaa72edde05a720b35
2013-02-15 14:27:15 -08:00
Mathias Agopian
cc50111825 Refactoring: Rename SurfaceTextureClient to Surface
Change-Id: Iff197c557c06673a1ad85a9bbd36caa38efb88b7
2013-02-15 12:47:52 -08:00
Igor Murashkin
e9b0eaaec6 Camera2: Tests: ModuleTests should not return OK for bad indices
Change-Id: Ia7a199d091edb4054dcd2d7164e57b3b653c5a64
2012-12-20 17:11:56 -08:00
Igor Murashkin
599b76fec7 Camera2: Tests: Fix Camera2Test to be correct.
- Requests were missing control type (capture vs reprocess)
- Not waiting for streams to be drained before disconnecting (sporadic fails)

Change-Id: Iab218b89a663db6dc26d791a390d0e11667f6889
2012-12-20 16:39:44 -08:00
Igor Murashkin
0a7a430a81 Camera2: Tests: Ignore V1 device initialization failures.
This allows CameraModuleTests.LoadModule and GetCameraInfo to pass.

Change-Id: Id6e38afc6d9c5d45933d3117c7895775a30ee679
2012-12-20 16:39:38 -08:00
Igor Murashkin
981c903c31 Camera2: Tests: Fix CameraFrameTests to pass instead of failing and hanging.
Producer would wait for buffers to be released so it could dequeue into them.
Since the test never acquired/released buffers, it would run out, and then
the HAL would deadlock when trying to shutdown since the producing thread
would never finish.

Change-Id: I4222feeec7a3ffab4c243e12b7d9bd56364ad983
2012-12-20 16:35:47 -08:00
Igor Murashkin
7acb21a65c Camera2: Tests: Release streams after HAL is unloaded
This fixes a segfault in the HAL where it was trying to write to a locked buffer
that disappeared from underneath it.

Any users of CameraModuleFixture should now call SetUp/TearDown explicitly.
Other classes remain unchanged until we need a custom TearDown order for them.

Change-Id: I9aa8c2d86492a76f2c01c1ad4cbe0cf91e5c7916
2012-12-20 16:35:47 -08:00
Andy McFadden
1da4d3e377 Merge "Rename ISurfaceTexture and SurfaceTexture" 2012-12-18 15:21:32 -08:00
Igor Murashkin
02f3ac0189 Camera2: Tests: Skip stream tests /w formats that are not available.
Change-Id: I187ca983010483d1cb3ac951da2aa8b886828ef7
2012-12-18 11:30:09 -08:00
Igor Murashkin
00b597f428 Camera2: Tests: Add CLI arguments for disabling forking and changing camera ID
Change-Id: I0adfda42e861d7e5a85801f7e0c3f0b3950b6e0e
2012-12-18 11:30:04 -08:00
Andy McFadden
eda79df3c7 Rename ISurfaceTexture and SurfaceTexture
The C++ class names don't match what the classes do, so rename
ISurfaceTexture to IGraphicBufferProducer, and SurfaceTexture to
GLConsumer.

Bug 7736700

Change-Id: I7fc8474c1d0d95658609b69cdb0af412d69a42c4
2012-12-18 09:50:24 -08:00
Igor Murashkin
f1b9ae7033 Camera2: Add a test for bursting 10 frames at a time /w manual exp controls
Change-Id: Idc1a3ebb26d0e189a543435f7f9be5f6376963d6
2012-12-10 15:01:59 -08:00
Kenny Root
39e03be075 am 1769442f: am e847651d: Merge "All tests should fail immediate to avoid SEGV"
* commit '1769442facb751a00a80959d492bc7f4797da4f2':
  All tests should fail immediate to avoid SEGV
2012-12-05 08:25:36 -08:00
Igor Murashkin
bb39e1769e Merge "Camera2: Fix metadata symbols" 2012-12-04 16:54:52 -08:00
Kenny Root
139d44f26d All tests should fail immediate to avoid SEGV
Change-Id: I7ec2861c079357b708cb6242f0171672afd55e02
2012-12-04 14:36:50 -08:00
Igor Murashkin
09ad0a3edb Camera2: Fix metadata symbols
Change-Id: I5d7c8416b8ed8effca699aa9e51068f5678927ea
2012-12-03 13:33:08 -08:00
Igor Murashkin
eab33fc589 Camera2: Tests -- Fork each test before executing it
Use CAMERA2_TEST_FORKING_DISABLED=1 environment variable to override this
behavior (e.g. when wanting to attach gdb to the test app).

Change-Id: Ib639885bdb827fc2415c878cbcb1b2d84dff687b
2012-11-27 11:38:06 -08:00
Igor Murashkin
e302ee3dd3 Camera2: Automated tests for testing HAL2.0 interface
Change-Id: I1f1afd5afc346d5493d5019af35c3026efcf19b5
2012-11-06 11:31:01 -08:00
Eino-Ville Talvala
2388a2dc91 Camera2: Use HAL_PIXEL_FORMAT_IMPLEMENTATION_DEFINED
Align camera2's management of platform-opaque formats with rest of
framework. Instead of using CAMERA2_PIXEL_FORMAT_OPAQUE, use
HAL_PIXEL_FORMAT_IMPLEMENTATION_DEFINED as the format for both the
camera HAL and for gralloc, and depend on the gralloc usage flags to
let the gralloc module select the appropriate real format for specific
stream endpoints.

Add a new gralloc usage for ZSL mode, where the camera service will
hold a streaming circular buffer of opaque full-resolution images
during camera preview. Since this is an opaque format that needs to be
optimized for 30fps operation, need gralloc to be aware of this use
case.

Bug: 6243944
Change-Id: If7f2516649381ce9bcffe4e319b63cbc068f643f
2012-08-28 14:22:53 -07:00
Eino-Ville Talvala
b8b6439598 Camera2: Make static_camera_characteristics const.
Disallow modification to static characteristics structure, and clarify
ownership and lifetime of the structure.

Also update test code accordingly.

Bug: 6243944
Change-Id: I6921d6889937212867efb99aa3881ab3ffc4f6f9
2012-08-27 10:30:04 -07:00
Eino-Ville Talvala
dde2a9d4b5 Revert "Camera2: Make static_camera_characteristics const."
Needs a third change that's not yet done with review.

This reverts commit c9ec8a656b59912f496880d3a63c0decd490f09d

Change-Id: Ic3e465e1308cbf107a250ec17b73a59a35e52f9f
2012-08-26 14:44:38 -07:00
Eino-Ville Talvala
d959ec5297 Camera2: Make static_camera_characteristics const.
Disallow modification to static characteristics structure, and clarify
ownership and lifetime of the structure.

Also update test code accordingly.

Bug: 6243944
Change-Id: Ib8de5e9d6580187b21a5ae9a28a3d24f1d083f7b
2012-08-24 14:28:54 -07:00
Kenny Root
8467a6d291 Enhance keymaster tests
Check the key values of successful attempts.

For imported keys, the key values should match the
input values when they're returned.

For generated keys, the modulus size should be correct and the public
exponent should be correct.

Bug: 6736252
Bug: http://code.google.com/p/android/issues/detail?id=34212
Change-Id: I37ed97d36ebfbe4301b43426129928bcb53c39f8
2012-08-09 12:12:28 -07:00
Eino-Ville Talvala
5d64b230dc Camera2: Test logging changes
Change-Id: Idcde83d46da438726c5186cbcf8109a22aef997f
2012-07-31 14:11:02 -07:00
Jamie Gennis
bd85f47ae7 Update ANativeWindow clients for sync
This change updates uses of ANativeWindow to use the new ANW functions that
accept and return Sync HAL fence file descriptors.

Change-Id: I8ea699ba0a9b5c4b4316f9428cbd565976899991
2012-06-18 15:53:25 -07:00
Eino-Ville Talvala
fa7a91d3d2 Camera2: Add JPEG capture test.
Bug: 6243944
Change-Id: Ifdf16f34b13df1e5bfe501eb7e6083862c71240a
2012-06-13 12:02:00 -07:00
Eino-Ville Talvala
895ed341ba Camera2: Update test code for metadata changes
- New resolution handling
- Don't do long exposures in tests

Bug: 6243944
Change-Id: Ia8362a50c8c4a2230d892e571b31e513c67ab84d
2012-05-20 17:25:53 -07:00
Eino-Ville Talvala
08a6e5e374 I am a HAL of constant structure.
Bug: 6243944
Change-Id: I126313f75f5f7165d3ca96f52054866c4fb6bee0
2012-05-17 17:54:56 -07:00
Eino-Ville Talvala
6adfd6b8ce Camera2: Add test for construct_default_request.
Bug: 6243944
Change-Id: I59b03d7ebece2a4b7672b265bd9f960b3faea621
2012-05-14 15:27:00 -07:00
Eino-Ville Talvala
e6a3c3c113 Camera2: Match updated camera_metadata methods.
Bug: 6243944

Change-Id: Ib691ef513b4811ca1290f0a9a4e3c1ce1e3f0945
2012-05-14 15:26:44 -07:00
Eino-Ville Talvala
567b4a24fa Substantial cleanup of camera2 HAL, and some initial unit tests
- Clean up const/struct usage in HAL
- Add user pointer to notify callback
- Revamp allocate_stream, now it picks its own ID.
- Much simpler stream interface
- Merged request/reprocess input queues
- Frame queue interface no longer a mirror of request queue
- Added triggers/notifications
- Added default request creation
- Lots of comments

Unit tests added:

- Lots of utility code to speed up test writing
- Basic open/close
- Capturing 1 raw buffer (request input, frame output, buffer output)
- Capturing a burst of 10 raw buffers

Bug: 6243944
Change-Id: I490bd5df81079a44c43d87b02c9a7f7ca251f531
2012-05-08 17:30:56 -07:00
Eino-Ville Talvala
fed0c0244b Revise camera HAL 2, and add unit test skeleton.
- Add missing method in stream_ops (set_buffers_geometry)

- Remove extra method in stream_ops (set_swap_interval)

- Document metadata queue protocol

- Change metadata queue methods to be set/get through function calls
  only, instead of a struct member in the HAL device ops.

- Change vendor extension tag query methods to be retrieved by a get
  call, instead of a struct member in the HAL device ops.

- Add basic gtest unit test skeleton, which currently just returns
  static info from all camera devices.

Change-Id: I94117097b0243023ad60638070cc7f0cefec18e6
2012-04-11 11:23:31 -07:00
Kenny Root
8ae65e7199 Add delete_all to keymaster API
In order to aid keymasters erase their memory efficiently, introduce new
delete_all API to tell keymasters to forget everything. This will be
triggered when keystore itself is told to reset.

Change-Id: I730375f1f32cd1ea0bf1fa38d5b1bec2f81ba492
2012-03-26 13:26:05 -07:00
Kenny Root
caf62bd7fb Use frameworks/native copy of UniquePtr.h
Change-Id: Idfe46c057699b5f019f84e588bb8a9697e48236c
2012-03-22 16:33:37 -07:00
Kenny Root
4fd0db7cd1 Add tests for keymaster API
This adds unit tests for implementors of the keymaster API. It can be
compiled and run as a stand-alone executable.

Change-Id: Id5bb8f4533b744c254b52e07df66a8d158dfda0d
2012-03-19 10:58:27 -07:00
Mathias Agopian
cc3f6a345b improve sensor HAL test
Change-Id: Id5e22ae2b9cb3bf71ec235a2ec6bb4319d0389da
2011-09-18 15:21:33 -07:00
Brian Carlstrom
03cb00b7b3 Fix sim-eng build.
Missing a <string.h> header.

git cherry-pick -e d0019991

Change-Id: I7a3dc7cb7d2855fde56512b3dcb181a092055497
2010-08-24 17:57:25 -07:00