Commit graph

165 commits

Author SHA1 Message Date
Eino-Ville Talvala
797976876f am d95a340b: Merge "Camera2 tests: Fix incorrect error code check" into mnc-dev
* commit 'd95a340b9f74b38703e78b3e2e8bc43f49c3ebf8':
  Camera2 tests: Fix incorrect error code check
2015-07-14 15:06:53 +00:00
Ruben Brunk
fa8430875c am 49f58811: Remove out-of-date camera2 native tests.
* commit '49f58811ea29ff8bed5e307d8018ead075731881':
  Remove out-of-date camera2 native tests.
2015-07-14 15:06:52 +00:00
Eino-Ville Talvala
d95a340b9f Merge "Camera2 tests: Fix incorrect error code check" into mnc-dev 2015-07-11 00:32:27 +00:00
Eino-Ville Talvala
5ad8086ad7 Camera2 tests: Fix incorrect error code check
Bug:  22410279
Change-Id: Iad74e90d148908aafd39878608c10fe03c689b8a
2015-07-10 15:06:02 -07:00
Ruben Brunk
49f58811ea Remove out-of-date camera2 native tests.
Bug: 22410279
Change-Id: Ib4a39306115e05b8e430bdc8456ad940b3426a8e
2015-07-10 14:45:56 -07:00
Dan Albert
b1988842df am 5e901ed4: Merge "Use abort() instead of a null dereference."
* commit '5e901ed49faed3465c9df8e6cf6c684249bb3c8c':
  Use abort() instead of a null dereference.
2015-06-11 20:05:53 +00:00
Dan Albert
5b57857c7f Use abort() instead of a null dereference.
Clang deletes these because they're invalid. It's pretty awful of
clang to do this, but this should be abort() anyway.

Change-Id: I89423ff2c4d08db82077e56b726549e3783d38e1
2015-06-11 11:04:52 -07:00
Eino-Ville Talvala
cd6984e762 Camera2 tests: Update for framework changes
Change-Id: I9ac788cfe9a001ef33bdc52a9e8ba0bdcf3ded2c
2015-06-09 15:23:34 -07:00
Sasha Levitskiy
468b567316 Fingerprint: Add an API to get authenticator id
Change-Id: If45ebc228425eaa43bf9abde934f8bb4e7d97e6c
Signed-off-by: Sasha Levitskiy <sanek@google.com>
2015-04-16 21:52:28 +00:00
Eino-Ville Talvala
aee4782839 Camera: Add HAL module init method.
For use by Camera HAL libraries to perform one-time initialization
steps after the library is loaded.

Bug: 20016050
Change-Id: Ia01ae0eafcadece9124ac2cfcc3b1c3939352843
2015-04-15 17:26:13 -07:00
Ashutosh Joshi
a679e3fcf0 Merge "Change struct offsets tests" 2015-04-14 23:26:20 +00:00
Ashutosh Joshi
5f0ebe67c5 Change struct offsets tests
Change the structure offset tests to account for the addition
of a new member in a sensors device structure.

Change-Id: I2ef7b82446b09b32f903346bbc9b857a99d80043
2015-04-14 16:24:10 -07:00
Jim Miller
1e1f7ba5c9 Clean up FingerprintManager API and make it public.
Change-Id: I416dcc42fd70926875cc77e0c2cc958fdfcd9f9d
2015-04-11 09:21:56 -07:00
Tim Kilbourn
73475a4eb2 Input event hub for evdev input HAL module.
InputHub monitors paths for device changes and input events.
InputDeviceManager creates InputDevices and routes input events to
them. InputDevices currently just log these events during development.
InputHost represents a wrapper around the HAL interface.

Change-Id: Ic47d574498eb07bcdcd17812a648539fdf1c69d6
2015-03-30 17:21:29 -07:00
Jim Miller
3fba7bebe8 Merge "Update fingerprint.h for new API" 2015-03-25 19:45:17 +00:00
Jim Miller
1fb1e33454 Update fingerprint.h for new API
This adds vendor-specific messaging capabilities to the
HAL driver to avoid the possibility of vendors clobbering
general-purpose methods. The framework translates these
additional messages as an offset into a custom message array.

Additionally, authenticate() now takes a group id to restrict
authentication to a subset of possible fingerprints.

Bug 16487912

Change-Id: I8a92a6c86b4729af03a5576b4a150b1c73fbc9cc
2015-03-24 19:27:57 -07:00
Yin-Chia Yeh
c253765481 Camera: update test per interface change
CameraModule does not allow for accessing raw module pointer
anymore. Also cleanup some warnings.

Bug: 19897963

Change-Id: I111cc093f09f5fb3c4b13693d5d0687e1f441058
2015-03-24 12:07:32 -07:00
Yin-Chia Yeh
5407ef1ec2 Camera: Fix tests per camera service interface change
Also clarify rotation field has no meaning and will always be 0
for a input stream.

Change-Id: I0f4343a0bfa7bf09ba887c78a1da1c08daa35333
2015-03-16 13:11:11 -07:00
Eino-Ville Talvala
898ad176cd Camera tests: Adjust for framework device interface changes
Account for requirement to pass in dataspace in stream creation.

Change-Id: Ibc5af912ef4a55b787c70843fc82422977a02c0b
2015-03-09 12:54:15 -07:00
Eino-Ville Talvala
e69efbbabf Replace/rename old HAL graphics formats
- Replace RAW_SENSOR with RAW16
 - Remove sRGB formats

Change-Id: Ic5c44878c638c3d3559495ea5685e10fcc2c39e1
2015-03-06 13:19:36 -08:00
Shawn Willden
e05ffdbb30 am 17dde875: Merge "Separate keymaster0 and keymaster1 HALs."
* commit '17dde875dda1b96722e6fb07850c268ca716c3d1':
  Separate keymaster0 and keymaster1 HALs.
2015-02-26 23:31:14 +00:00
Shawn Willden
302d252f2c Separate keymaster0 and keymaster1 HALs.
For now the keymaster1 HAL still includes all of the keymaster0 entry
points, and soft_keymaster_device will continue to implement them.  In
the near future the keymaster0 entry points will be removed, as soon as
we can ensure that keystore no longer needs them.

Change-Id: I5c54282c12d1c4b8b22ed4929b6e6c724a94ede4
2015-02-25 23:08:39 -07:00
Shawn Willden
fd4b4d5a9b Separate keymaster0 and keymaster1 HALs.
For now the keymaster1 HAL still includes all of the keymaster0 entry
points, and soft_keymaster_device will continue to implement them.  In
the near future the keymaster0 entry points will be removed, as soon as
we can ensure that keystore no longer needs them.

Change-Id: I5c54282c12d1c4b8b22ed4929b6e6c724a94ede4
2015-02-24 14:58:17 -07:00
Yin-Chia Yeh
7eb3d91b87 Camera: modify test per framework interface change
Wrap camera_module_t by CameraModule to follow
framework interface change.

Change-Id: Ief423a1571cf06c7ef80b98b403a33969baf95f6
2015-02-03 14:43:09 -08:00
Kenny Root
1ea23b102b am c9832229: am 7b8e44f5: Merge "Remove superfluous OpenSSL include paths."
* commit 'c98322296c13617c911cc66f4578aa5daf08aadb':
  Remove superfluous OpenSSL include paths.
2015-01-26 19:17:35 +00:00
Kenny Root
c98322296c am 7b8e44f5: Merge "Remove superfluous OpenSSL include paths."
* commit '7b8e44f511fdb5bd2730e29cc88f72305cf7ab16':
  Remove superfluous OpenSSL include paths.
2015-01-26 19:12:19 +00:00
Adam Langley
d3564c7f90 Remove superfluous OpenSSL include paths.
The libcrypto and libssl modules (and their respective static and host
versions) use LOCAL_EXPORT_C_INCLUDE_DIRS thus just including the module
is sufficient.

Change-Id: I9030a3747b8a1f18acd0308746cb2f63d4123f8b
2015-01-22 17:16:01 -08:00
Chien-Yu Chen
301591776f camera_common: add torch mode APIs for flashlight
Add torch mode APIs to support flashlight without opening any
camera devices.

Bug: 2682206
Change-Id: Ida46bb878962caf305f3e97051b15e0465fe8c02
2015-01-15 10:35:07 -08:00
Dan Albert
6bafdcb508 am 4f1fe2f5: Merge "Fix build in C++11 mode"
* commit '4f1fe2f59889d88ed026596c1841043db7edbc6f':
  Fix build in C++11 mode
2014-12-17 02:43:50 +00:00
Bernhard Rosenkränzer
1f1d79732f Fix build in C++11 mode
Fix build in C++11 mode instead of reverting to C++98 mode.
(Fixes some constructs that were mistaken for C++11 literals and
a use of the std::ostream(NULL) constructor).

Building in C++98 mode causes clang to fall over conflicting definitions
of char16_t.

Change-Id: I66230eeb960f4a894d6c98fe7935ec932569c5a4
Signed-off-by: Bernhard Rosenkränzer <Bernhard.Rosenkranzer@linaro.org>
2014-12-12 22:16:55 +01:00
Dan Albert
9d018618c4 am 58afe329: Merge "Use an older C++ standard."
* commit '58afe329533dc60618186f414d945829706ed772':
  Use an older C++ standard.
2014-11-20 23:00:38 +00:00
Dan Albert
e51237cda5 Use an older C++ standard.
Bug: 18466763
Change-Id: Ibea0eb2617f13bacca0a662fe4ca88fc8a168cd7
2014-11-20 21:14:12 +00:00
Dan Stoza
1497e7e767 am e0e834e3: Merge "Add a BufferItem parameter to onFrameAvailable" into lmp-mr1-dev
* commit 'e0e834e3fe5561bf87aac7f88faaed39f0937a64':
  Add a BufferItem parameter to onFrameAvailable
2014-11-07 20:03:42 +00:00
Dan Stoza
e0e834e3fe Merge "Add a BufferItem parameter to onFrameAvailable" into lmp-mr1-dev 2014-11-07 19:44:33 +00:00
Yin-Chia Yeh
3d31e157d0 am 8d3acf6e: Merge "Camera2/3 HAL test: cleanup deprecated keys" into lmp-mr1-dev
* commit '8d3acf6e6e58c392fcdc4913e49c6b1ded8117c8':
  Camera2/3 HAL test: cleanup deprecated keys
2014-11-07 18:35:40 +00:00
Yin-Chia Yeh
8df990b3a2 Camera2/3 HAL test: cleanup deprecated keys
Bug:16877860
Change-Id: I1eddec02cefa39692f63cc54cc40b75f449516a7
2014-11-06 10:11:32 -08:00
Dan Stoza
32ef0cae63 Add a BufferItem parameter to onFrameAvailable
Passes the BufferItem for the queued buffer to the onFrameAvailable
callback so the consumer can track the BufferQueue's contents.

Bug: 18111837
Change-Id: If9d07229c9b586c668e5f99074e9b63b0468feb0
2014-11-04 11:39:35 -08:00
Dan Albert
98b8aaf3de am 9f497870: Merge "Don\'t manually link stlport."
* commit '9f4978701783942e836aeab526727458e9cb1492':
  Don't manually link stlport.
2014-09-26 19:53:02 +00:00
Dan Albert
a2671def0c am 9f497870: Merge "Don\'t manually link stlport."
* commit '9f4978701783942e836aeab526727458e9cb1492':
  Don't manually link stlport.
2014-09-26 19:53:02 +00:00
Dan Albert
04d2191800 Don't manually link stlport.
Change-Id: Ib5a6e31b3a6dea39b45727a49356fa2838ea77bc
2014-09-26 10:55:44 -07:00
Zhijun He
1c3e65731a Camera2/3 HAL test: Update tet according createStream change
Bug: 14327010
Change-Id: I45d2ab4859ee0cc9273e579254f0569108c748f1
2014-08-10 21:24:49 -07:00
Zhijun He
b5ac45ff29 Camera2/3 Test: cleanup the test
1. Fix the HAL version check
2. Disable some test temporarily as the deprecated tags were used.

Bug: 16855498
Change-Id: I9f9dc285a1085b471d03c5a900cc44dd2a7480c3
2014-08-07 16:26:52 -07:00
Greg Hackmann
6d37e6ac6d update struct-offset.cpp test for hwc 1.4
Change-Id: I882a1741ad473492d4acc58918a54d944ac382c3
Signed-off-by: Greg Hackmann <ghackmann@google.com>
2014-07-24 13:27:07 -07:00
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