Commit graph

122 commits

Author SHA1 Message Date
Paul McLean
f899cc1c93 Merge "Added enumeration of legitimate sample rates for input and output." into lmp-dev 2014-07-15 20:39:52 +00:00
Glenn Kasten
6c2a68d081 Fix warnings
Change-Id: I1ba5c871a1cb44df8c383f595cbe6d75fef02aa3
2014-07-15 11:17:19 -07:00
Dan Stoza
e83d10c1fc hwcomposer: Allow display configuration selection
Adds two functions to the HWC interface: one for querying the current
display configuration, and one for setting a new configuration. This
will enable DisplayManager to change the mode on demand.

Bug: 14320401
Change-Id: I556c509192b877b38b2103a78f937b3687f35546
2014-07-14 14:09:13 -07:00
Greg Hackmann
16c19a2c4a update struct-offset.cpp test for camera API 2.3
Change-Id: I2f63f9f5e567099ea9d0005317f7a745c5a63ca6
Signed-off-by: Greg Hackmann <ghackmann@google.com>
2014-06-13 13:52:48 -07:00
Zhijun He
32282973ba Camera2: Build both 32 and 64 bit test binaries
Change-Id: I6efd201a52bb546efa59ff0a5178a25a040654b4
2014-05-30 10:02:59 -07:00
Greg Hackmann
1b8191186e update struct-offset.cpp test for gralloc API 0.3
Change-Id: I6509ea0fda3a3d9b4aea83c5342a491993dc9c26
Signed-off-by: Greg Hackmann <ghackmann@google.com>
2014-05-12 13:49:42 -07:00
Aravind Akella
4fa0f418a3 Merge "Define new wake_up sensors in sensors.h" 2014-04-24 00:41:18 +00:00
Aravind Akella
6242f32a22 Define new wake_up sensors in sensors.h
i) Define WAKE_UP sensors.
     ii) Deprecate flags DRY_RUN and WAKE_UPON_FIFO_FULL.
    iii) Define maxDelay and isWakeUpSensor flag in sensor_t.

Bug: 13251067
Change-Id: Ic474d90d05459b06e93094856423f6645b4bf58e
2014-04-23 16:09:24 -07:00
Sasha Levitskiy
449ebdd70f Merge "Hardware: Fingerprint: Move the HAL to an async model, add some vendor requested functionality." 2014-04-22 21:35:51 +00:00
Sasha Levitskiy
7308284e4e Hardware: Fingerprint: Move the HAL to an async model, add some vendor requested functionality.
Change-Id: Ib99e3edb99579ac4495918eb57d1022d75dccb57
Signed-off-by: Sasha Levitskiy <sanek@google.com>
2014-04-22 10:50:50 -07:00
Sasha Levitskiy
0ab4c96ab8 Camera2: Tests: 64-bit warning fixit
Change-Id: Idb761d2bfd8f07838a194f986f7c0a06429f4049
Signed-off-by: Sasha Levitskiy <sanek@google.com>
2014-04-21 14:50:01 -07:00
Aravind Akella
04c1521d1e Merge "Remove offset checks for reserved fields in sensor_t and sensors_event_t." 2014-04-11 21:06:22 +00:00
Aravind Akella
54770a5d8a Remove offset checks for reserved fields in sensor_t and sensors_event_t.
This reverts commit ea676f9ae6.

Change-Id: I4c69b46f20fa3505e062363643711991e65d6cb4
2014-04-11 20:45:49 +00:00
Jianing Wei
f816eea8f1 Camera2 test: fix build break due to change in camera service.
Change-Id: If8785df9209c83ccd1454b89b46d5e885f897cae
2014-04-10 14:17:57 -07:00
Dan Stoza
692231f348 Merge "Remove deprecated BufferQueue constructor" 2014-04-08 18:29:56 +00:00
Dan Stoza
5dce9e4f26 Remove deprecated BufferQueue constructor
Bug: 13415624
Change-Id: Ia2ed4b5bc7289f8d8ab6e6a431746b43c81842bc
2014-04-07 13:39:37 -07:00
Sasha Levitskiy
a747c069c6 Hardware: Fingerprint: Introducing Fingerprint HAL
Change-Id: I4e55c42841c3b6a1327a16bdf6d1d4bb3847c7f3
Signed-off-by: Sasha Levitskiy <sanek@google.com>
2014-04-07 18:14:34 +00:00
Etienne Le Grand
dbf0045d47 Merge "Revert "Remove offset checks for reserved fields in sensor_t and sensors_event_t."" 2014-04-05 04:47:01 +00:00
Etienne Le Grand
ea676f9ae6 Revert "Remove offset checks for reserved fields in sensor_t and sensors_event_t."
This reverts commit 4db220ec85.

Change-Id: I61feb99c2024889e29e2b300ad4a4f5af1fdc282
2014-04-05 04:46:55 +00:00
Aravind Akella
ed39dc7f5e Merge "Remove offset checks for reserved fields in sensor_t and sensors_event_t." 2014-04-05 01:44:23 +00:00
Aravind Akella
4db220ec85 Remove offset checks for reserved fields in sensor_t and sensors_event_t.
Change-Id: I3dcc4b4204932a73503ede45b188142b03dcdd31
2014-04-04 18:26:34 -07:00
Eino-Ville Talvala
f50fa9fb9b am ab140462: am 37de84bc: Merge "Camera2 Test: fix test criteria for exposure time"
* commit 'ab14046292922d1ad0df84f3231f1e8b6233b737':
  Camera2 Test: fix test criteria for exposure time
2014-03-29 01:09:31 +00:00
Eino-Ville Talvala
ab14046292 am 37de84bc: Merge "Camera2 Test: fix test criteria for exposure time"
* commit '37de84bc96f808601897bcd126b73fc839fd2c20':
  Camera2 Test: fix test criteria for exposure time
2014-03-29 01:02:57 +00:00
Gaurav Batra
a1bef2b9a6 Camera2 Test: fix test criteria for exposure time
Add some tolerance while testing requested exposure times against capture times.

Change-Id: I609e7819cde8ee466e152775781a6542e6686ded
2014-03-28 17:03:36 -07:00
Ruben Brunk
237d1c15c1 camera3: Remove old vendor tag ops dependencies.
Bug: 12134423
Change-Id: I7acdf76d4c0674bdb1cc939592d4620687c785c3
2014-03-10 19:01:06 -07:00
Sasha Levitskiy
ec61e78021 am f49598e0: am 024c1534: Camera: HAL3: device test fixture and a test.
* commit 'f49598e05886c0f71efad01c1aefb1a90e0b49d5':
  Camera: HAL3: device test fixture and a test.
2013-12-12 23:28:16 +00:00
Sasha Levitskiy
024c15346b Camera: HAL3: device test fixture and a test.
Change-Id: Ifaec4be35e8f4fb80c8e71e24499fbcd40fddb6e
Signed-off-by: Sasha Levitskiy <sanek@google.com>
2013-12-12 14:08:55 -08:00
Sasha Levitskiy
271f39d8bb am 44a61b2d: am 4a7b2171: Camera HAL3: first few unit tests.
* commit '44a61b2da0d1f348151dc7b82385aab582b1e429':
  Camera HAL3: first few unit tests.
2013-12-12 03:13:39 +00:00
Sasha Levitskiy
4a7b2171f0 Camera HAL3: first few unit tests.
Change-Id: I413dc447faadd4fd90986bc924722b2826e19382
Signed-off-by: Sasha Levitskiy <sanek@google.com>
2013-12-12 03:06:31 +00:00
Rom Lemarchand
ca10795491 HAL test: statically test the last member of structs
Ensure the last member of structs is actually the one we expect

Change-Id: Ib623f1a5e09fd9b8d464456528a94742b0ccd00b
2013-11-22 17:47:53 -08:00
Rom Lemarchand
1b22d07594 HAL test: statically test the offsets of known struct members
Make sure the ABI doesn't get inadvertently broken by moving HAL interface
struct members around.

Change-Id: I058c963df002dc7c12eb24181d5db74c0c6fd38c
2013-11-22 17:47:52 -08:00
Rom Lemarchand
4c2aa4c223 HAL test: statically test the size of HAL structs
Ensure none of the HAL structs change size over time.
Issues might arise when making changes without taking the different
pointer sizes for specific architectures into account.

Change-Id: I63f00004a23f09b2f46df01e7c69296766a5d03f
2013-11-21 15:52:05 -08:00
Zhijun He
fc2a795151 am b44ff650: Camera2 Test: Skip CameraModuleTest for HAL V1 devices
* commit 'b44ff6508bbcb8df751b5815dd4dfbd4cae252f7':
  Camera2 Test: Skip CameraModuleTest for HAL V1 devices
2013-10-29 18:37:02 -07:00
Zhijun He
b44ff6508b Camera2 Test: Skip CameraModuleTest for HAL V1 devices
Bug: 10971907
Change-Id: Ia3aa0e370d7eb5de6bb1fb7ff48a71ea5605fa17
2013-10-28 15:52:56 -07:00
Zhijun He
69716f4b1d am 3bf3b45f: Camera2 Test: skip some tests for limited hardware level
* commit '3bf3b45f2d5eb43b74e1a46ff03ed3e2142b1b38':
  Camera2 Test: skip some tests for limited hardware level
2013-09-24 19:29:53 -07:00
Zhijun He
3bf3b45f2d Camera2 Test: skip some tests for limited hardware level
Bug: 10388724
Change-Id: Ifd13f72f1b7ff78cf50dc1c238f17c4b4e90d9b0
2013-09-23 10:13:17 -07:00
Zhijun He
8c81382d68 am 60cbb526: Camera2 Test: Fix module and burst test issues
* commit '60cbb52613d212236de49b4f22fe059585f8c1b2':
  Camera2 Test: Fix module and burst test issues
2013-09-19 21:01:20 -07:00
Zhijun He
60cbb52613 Camera2 Test: Fix module and burst test issues
Bug: 10388724
Change-Id: Idc404cf8a7a96c00941aa8f1880734a236cb3737
2013-09-19 19:01:04 -07:00
Zhijun He
8a658946e9 am b3ac07c0: Camera2 Tests: fix some sanity checks
* commit 'b3ac07c0028b0afe8f9b009e37af90ec9a697b44':
  Camera2 Tests: fix some sanity checks
2013-09-17 18:29:35 -07:00
Zhijun He
b3ac07c002 Camera2 Tests: fix some sanity checks
Remove the requirement of HAL_PIXEL_FORMAT_IMPLEMENTATION_DEFINED and make and
fix some minor issues.

Bug: 10388724
Change-Id: I18f0ea60f87902d6c2bbaca53957a91953866c40
2013-09-17 16:53:55 -07:00
Zhijun He
8d24efb096 am 2a512b49: Merge "Camera2 Test: check the right result metadata" into klp-dev
* commit '2a512b49e028b5714782ab69cba9662e01e25016':
  Camera2 Test: check the right result metadata
2013-09-13 13:20:09 -07:00
Zhijun He
914226ce76 Camera2 Test: check the right result metadata
We need check the right result metadata by looking for the right request id.

Bug: 10710768
Change-Id: I1e946f82e569fa6afc5067552c3f850ffffbf698
2013-09-12 02:45:12 -07:00
Kenny Root
0b4b67c488 am 1d640f05: Merge "Use canonical UniquePtr.h header"
* commit '1d640f05dcedfcaae63eeb90f3d89b16e95d0208':
  Use canonical UniquePtr.h header
2013-09-11 14:56:06 -07:00
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
Zhijun He
a159417389 Camera2 Tests: Fix stream id types
Bug: 10604704
Change-Id: I5edddb1011d6744225c59f44bd6df8ae4234d336
2013-09-06 15:35:09 -07:00
Kenny Root
c124b23f94 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.

Bug: 10600582
Change-Id: Ied34cf382e2b7725e648faada00df2dee993e6c5
2013-09-04 22:17:56 -07:00
Kenny Root
2541a0a8f7 Add support for DSA and ECDSA key types
(cherry picked from commit 6e1683f5d5)

Bug: 10600582
Change-Id: I8e5b66baa70b37031198260853bb5355df75e23d
2013-09-03 00:52:48 -07:00
Kenny Root
6e1683f5d5 Add support for DSA and ECDSA key types
Change-Id: I4b7d11c0915c716a0f1be65f5933f33a36e0fb4b
2013-09-03 00:09:18 -07:00
Zhijun He
a7ff78d4ed Merge "Camera2 Tests: Add multiple stream tests" into klp-dev 2013-08-19 21:03:22 +00:00