Commit graph

142 commits

Author SHA1 Message Date
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
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
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
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
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
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