OSDN Git Service
Amit Shekhar [Thu, 6 Mar 2014 22:41:21 +0000 (22:41 +0000)]
am
ee4e28c9: am
1482406b: usbaudio: fix for out->dev->lock remains locked in error case
* commit '
ee4e28c9ebc7f26a1a25d1042d5a941139055447':
usbaudio: fix for out->dev->lock remains locked in error case
Amit Shekhar [Thu, 6 Mar 2014 21:02:36 +0000 (21:02 +0000)]
am
1482406b: usbaudio: fix for out->dev->lock remains locked in error case
* commit '
1482406b70a254fc85d153a7066d7f90d724d195':
usbaudio: fix for out->dev->lock remains locked in error case
Jesse Hall [Thu, 6 Mar 2014 20:04:55 +0000 (20:04 +0000)]
am
282ab1b6: Merge "gralloc: dont hardcode 32bpp as RGBX"
* commit '
282ab1b6b1a92b8cb2650c111bfab02916f8715d':
gralloc: dont hardcode 32bpp as RGBX
Greg Hackmann [Thu, 6 Mar 2014 20:04:54 +0000 (20:04 +0000)]
am
b342abb6: Merge "gralloc: make private_handle_t layout consistent on 32/64-bit"
* commit '
b342abb6902a698963bb9d2108000da895845985':
gralloc: make private_handle_t layout consistent on 32/64-bit
Jesse Hall [Thu, 6 Mar 2014 19:04:07 +0000 (19:04 +0000)]
Merge "gralloc: dont hardcode 32bpp as RGBX"
Greg Hackmann [Thu, 6 Mar 2014 18:24:48 +0000 (18:24 +0000)]
Merge "gralloc: make private_handle_t layout consistent on 32/64-bit"
Amit Shekhar [Thu, 30 Jan 2014 20:47:34 +0000 (12:47 -0800)]
usbaudio: fix for out->dev->lock remains locked in error case
out->dev->lock remains locked in error case in out_write()
Added pthread_mutex_unlock() in the error case
Bug:
12824374
Change-Id: Id467e3122008eb8128b42dfc0e9103600c1eef2d
Signed-off-by: Glenn Kasten <gkasten@google.com>
Greg Hackmann [Mon, 3 Mar 2014 21:10:15 +0000 (13:10 -0800)]
gralloc: make private_handle_t layout consistent on 32/64-bit
private_handle_t's memory layout must be consistent between the 32-bit
and 64-bit gralloc, in case buffers are passed between processes.
Replace the (variably sized) uintptr_t base with a fixed size uint64_t,
and enforce 8-byte alignment for architectures where uint64_t alignment
varies between 32-bit and 64-bit.
Change-Id: I06cb31d4b9620ea18e5b50d3a3142b5adb2d2a14
Signed-off-by: Greg Hackmann <ghackmann@google.com>
Elliott Hughes [Tue, 25 Feb 2014 00:06:51 +0000 (00:06 +0000)]
am
b96f1083: Merge "Move libhardware of <asm/page.h>."
* commit '
b96f1083b8d10f3e33b64f0da943dedfdb25b557':
Move libhardware of <asm/page.h>.
Elliott Hughes [Tue, 25 Feb 2014 00:01:47 +0000 (00:01 +0000)]
Merge "Move libhardware of <asm/page.h>."
Elliott Hughes [Mon, 24 Feb 2014 23:50:34 +0000 (15:50 -0800)]
Move libhardware of <asm/page.h>.
Change-Id: I7cf9d04828f19b8d7d1d3b8948bef580b101b10c
Bernhard Rosenkraenzer [Thu, 20 Feb 2014 20:08:44 +0000 (01:38 +0530)]
gralloc: dont hardcode 32bpp as RGBX
Not every 32bpp is in RGBX format.
Change-Id: Ic3c6a0cbf475bff2fe2fc4b023c6bc58e4fc295e
Signed-off-by: Amit Pundir <amit.pundir@linaro.org>
Jinsuk Kim [Fri, 21 Feb 2014 01:30:35 +0000 (01:30 +0000)]
am
5f9a7907: Merge "Header file for HDMI-CEC HAL interface definition" into klp-modular-dev
* commit '
5f9a7907844ba5319957dd9913ef951d78709afb':
Header file for HDMI-CEC HAL interface definition
Jinsuk Kim [Fri, 21 Feb 2014 01:27:29 +0000 (01:27 +0000)]
Merge "Header file for HDMI-CEC HAL interface definition" into klp-modular-dev
Jinsuk Kim [Wed, 19 Feb 2014 01:21:35 +0000 (10:21 +0900)]
Header file for HDMI-CEC HAL interface definition
Added here is the header file that defines HDMI-CEC HAL interface.
Its main purpose is to support major CEC features such as 'one touch
play', 'standby' for playback device. But basic skeleton for supporting
other kinds of devices(like TV) is also in place.
Change-Id: Iccbbec398bc675d69cb78ad6848ec57ac727cb8d
Colin Cross [Sun, 16 Feb 2014 18:42:54 +0000 (18:42 +0000)]
am
80d4eced: Merge "Use /(vendor|system)/lib64/hw for 64-bit HAL libraries"
* commit '
80d4eced69f4d1e9f9ef97b5f4f26868cd76ae26':
Use /(vendor|system)/lib64/hw for 64-bit HAL libraries
Colin Cross [Sun, 16 Feb 2014 18:40:01 +0000 (18:40 +0000)]
Merge "Use /(vendor|system)/lib64/hw for 64-bit HAL libraries"
Dan Willemsen [Sun, 16 Feb 2014 18:07:15 +0000 (10:07 -0800)]
Use /(vendor|system)/lib64/hw for 64-bit HAL libraries
Change-Id: Ib905e079b1e88977fb3408671301904c58f35d3c
David Turner [Fri, 14 Feb 2014 17:27:21 +0000 (17:27 +0000)]
am
f77bd7d0: Merge "Try using goldfish_pipe as the device name"
* commit '
f77bd7d005e27364e233c92ac7f6c06a18d1f128':
Try using goldfish_pipe as the device name
David Turner [Fri, 14 Feb 2014 16:34:25 +0000 (16:34 +0000)]
Merge "Try using goldfish_pipe as the device name"
Greg Hackmann [Thu, 13 Feb 2014 20:46:21 +0000 (20:46 +0000)]
am
f4c46752: Merge "AArch64: Calculate private_handle_t\'s numInts"
* commit '
f4c46752df57be558773a056d6545877ef65c844':
AArch64: Calculate private_handle_t's numInts
Greg Hackmann [Thu, 13 Feb 2014 20:41:17 +0000 (20:41 +0000)]
Merge "AArch64: Calculate private_handle_t's numInts"
Simon Wilson [Mon, 10 Feb 2014 20:38:51 +0000 (20:38 +0000)]
am
907b20aa: Initial version of the MCU HAL
* commit '
907b20aa7475a91a148bb655b0d80cecabb130f6':
Initial version of the MCU HAL
Simon Wilson [Fri, 7 Feb 2014 02:42:17 +0000 (18:42 -0800)]
Initial version of the MCU HAL
Change-Id: Ic88da7e825b67ed64cde4eed3055022daabe9830
Ashok Bhat [Thu, 6 Feb 2014 14:11:08 +0000 (14:11 +0000)]
AArch64: Calculate private_handle_t's numInts
A constant sNumInts with a value of 6 was being assigned to the numInts
attribute in the private_handle_t constructor, and was also used in the
validate method. That constant value is appropriate for 32-bit systems
but is not appropriate for a 64-bit system where uintptr_t used for
base attribute will be 64-bit.
sNumInts is now changed to a static inline function that calculates
numInts.
Change-Id: I482ddb5915c9ff55fb2e2a87887a0ec2dc2299ed
Signed-off-by: Marcus Oakland <marcus.oakland@arm.com>
Signed-off-by: Ashok Bhat <ashok.bhat@arm.com>
Colin Cross [Thu, 6 Feb 2014 03:03:12 +0000 (03:03 +0000)]
am
037335eb: Merge "gralloc: fix warnings"
* commit '
037335ebe826289445fd2ba14e95ff41d57ad928':
gralloc: fix warnings
Colin Cross [Thu, 6 Feb 2014 02:25:32 +0000 (02:25 +0000)]
Merge "gralloc: fix warnings"
Colin Cross [Thu, 6 Feb 2014 02:21:09 +0000 (18:21 -0800)]
gralloc: fix warnings
Fix LP64 pointer casting warnings, unused parameters, and
turn off missing initializer warnings.
Change-Id: Idb70f4534282fed64ae81cb1e154d3f5b93091b0
Octavian Purdila [Wed, 6 Nov 2013 17:38:31 +0000 (19:38 +0200)]
Try using goldfish_pipe as the device name
The upstream goldfish_pipe driver uses goldfish_pipe as a name instead
of qemu_pipe. Try using this name if the old name (qemu_pipe) fails.
For: ABIT-15
Change-Id: I8c6178faf27b1cdb31cc4343cf1af396e929f7e4
Signed-off-by: Octavian Purdila <octavian.purdila@intel.com>
Signed-off-by: Jun Tian <jun.j.tian@intel.com>
Colin Cross [Tue, 28 Jan 2014 01:03:07 +0000 (01:03 +0000)]
am
3da0d0f4: am
662e97ee: am
aea8c156: Merge "hardware/libhardware: convert LOCAL_MODULE_PATH to LOCAL_MODULE_RELATIVE_PATH"
* commit '
3da0d0f4c7a02cbb510d65def4e87eb31c97948b':
hardware/libhardware: convert LOCAL_MODULE_PATH to LOCAL_MODULE_RELATIVE_PATH
Colin Cross [Tue, 28 Jan 2014 00:58:41 +0000 (00:58 +0000)]
am
662e97ee: am
aea8c156: Merge "hardware/libhardware: convert LOCAL_MODULE_PATH to LOCAL_MODULE_RELATIVE_PATH"
* commit '
662e97eedbb36374e61dab50a7acb4b2bae29883':
hardware/libhardware: convert LOCAL_MODULE_PATH to LOCAL_MODULE_RELATIVE_PATH
Colin Cross [Tue, 28 Jan 2014 00:51:42 +0000 (00:51 +0000)]
am
aea8c156: Merge "hardware/libhardware: convert LOCAL_MODULE_PATH to LOCAL_MODULE_RELATIVE_PATH"
* commit '
aea8c156649c16347514741eb084858cdb458b75':
hardware/libhardware: convert LOCAL_MODULE_PATH to LOCAL_MODULE_RELATIVE_PATH
Colin Cross [Tue, 28 Jan 2014 00:42:39 +0000 (00:42 +0000)]
Merge "hardware/libhardware: convert LOCAL_MODULE_PATH to LOCAL_MODULE_RELATIVE_PATH"
Colin Cross [Sat, 25 Jan 2014 05:00:32 +0000 (21:00 -0800)]
hardware/libhardware: convert LOCAL_MODULE_PATH to LOCAL_MODULE_RELATIVE_PATH
LOCAL_MODULE_PATH doesn't work for multiarch builds, replace it
with LOCAL_MODULE_RELATIVE_PATH.
Change-Id: I4e4ceec61d026bbe74ba604554c06104bde42e5e
David 'Digit' Turner [Thu, 23 Jan 2014 22:34:45 +0000 (23:34 +0100)]
resolved conflicts for merge of
017649d6 to klp-modular-dev
Conflicts:
modules/Android.mk
Change-Id: I6b84d2320be98b6af1f0cab729a917cf84cd9524
David Turner [Thu, 23 Jan 2014 20:29:23 +0000 (20:29 +0000)]
am
c2f6dc45: am
fa3d243b: Merge "Vibra: Adapt AOSP (default) vibrator HAL into a hardware module."
* commit '
c2f6dc45643bd2b6251362ca4bc814d6601358d2':
Vibra: Adapt AOSP (default) vibrator HAL into a hardware module.
David Turner [Thu, 23 Jan 2014 20:20:28 +0000 (12:20 -0800)]
am
fa3d243b: Merge "Vibra: Adapt AOSP (default) vibrator HAL into a hardware module."
* commit '
fa3d243b4690f2cc21d259e52178abf969cafc09':
Vibra: Adapt AOSP (default) vibrator HAL into a hardware module.
David Turner [Thu, 23 Jan 2014 20:13:02 +0000 (20:13 +0000)]
Merge "Vibra: Adapt AOSP (default) vibrator HAL into a hardware module."
Matthew Xie [Tue, 14 Jan 2014 20:42:38 +0000 (20:42 +0000)]
Merge "BLE peripheral mode (1/4): change HAL to support service data and service uuids." into klp-modular-dev
Colin Cross [Tue, 14 Jan 2014 08:03:28 +0000 (08:03 +0000)]
am
260b0f50: am
2428eaa3: am
a97c6fec: Merge "hardware: fix check for ro.hardware.<class> property"
* commit '
260b0f50e97794d5663de55664e3ec554e216dc3':
hardware: fix check for ro.hardware.<class> property
Colin Cross [Tue, 14 Jan 2014 07:59:52 +0000 (07:59 +0000)]
am
2428eaa3: am
a97c6fec: Merge "hardware: fix check for ro.hardware.<class> property"
* commit '
2428eaa319bfd0481f49e364c4f242300f4ed291':
hardware: fix check for ro.hardware.<class> property
Colin Cross [Tue, 14 Jan 2014 07:56:52 +0000 (23:56 -0800)]
am
a97c6fec: Merge "hardware: fix check for ro.hardware.<class> property"
* commit '
a97c6fecdbe576b732a2ca00fbf4dcb82f079c8f':
hardware: fix check for ro.hardware.<class> property
Colin Cross [Tue, 14 Jan 2014 07:52:15 +0000 (07:52 +0000)]
Merge "hardware: fix check for ro.hardware.<class> property"
Colin Cross [Tue, 14 Jan 2014 07:43:23 +0000 (23:43 -0800)]
hardware: fix check for ro.hardware.<class> property
Replace == with >, property_get returns the length of the
property if found.
Change-Id: I4b8fe8f8dba578112d21eee5dc64be4aa27f3bfb
Wei Wang [Wed, 6 Nov 2013 00:09:51 +0000 (16:09 -0800)]
BLE peripheral mode (1/4): change HAL to support service data and service uuids.
Change-Id: I19a3755a4ed16e1ae03368cecee97773c05c1770
Vincent Becker [Fri, 10 Aug 2012 12:40:49 +0000 (14:40 +0200)]
Vibra: Adapt AOSP (default) vibrator HAL into a hardware module.
Android's implementation of vibrator needs to be done inside a
hardware module, so that it can make a vendor implementation possible.
Hw module's name becomes vibrator.default.so.
This change is related to other changes in:
- frameworks/base
- hardware/libhardware_legacy
- device/generic/goldfish
- platform/build
Change-Id: I844279f5535289f079d412fdc44c5cb3c9c1130c
Author: Vincent Becker <vincentx.becker@intel.com>
Signed-off-by: Vincent Becker <vincentx.becker@intel.com>
Signed-off-by: Shuo Gao <shuo.gao@intel.com>
Signed-off-by: Bruce Beare <bruce.j.beare@intel.com>
Signed-off-by: Jack Ren <jack.ren@intel.com>
Signed-off-by: David Wagner <david.wagner@intel.com>
Author-tracking-BZ: 49760 94611
Colin Cross [Thu, 2 Jan 2014 21:31:52 +0000 (21:31 +0000)]
am
728c78a4: am
7c2a4681: am
e0c252ae: Merge "hardware: add ro.hardware.<class> to HAL loading properites list"
* commit '
728c78a4d189c3677b6bc061b8602c28330a5464':
hardware: add ro.hardware.<class> to HAL loading properites list
Colin Cross [Thu, 2 Jan 2014 21:28:41 +0000 (21:28 +0000)]
am
7c2a4681: am
e0c252ae: Merge "hardware: add ro.hardware.<class> to HAL loading properites list"
* commit '
7c2a468127bbfb48f7cb239c992edfa48fd54cd2':
hardware: add ro.hardware.<class> to HAL loading properites list
Colin Cross [Thu, 2 Jan 2014 21:26:21 +0000 (13:26 -0800)]
am
e0c252ae: Merge "hardware: add ro.hardware.<class> to HAL loading properites list"
* commit '
e0c252ae43490cc324b89f6d7cbaa33af8ff341d':
hardware: add ro.hardware.<class> to HAL loading properites list
Colin Cross [Thu, 2 Jan 2014 21:21:35 +0000 (21:21 +0000)]
Merge "hardware: add ro.hardware.<class> to HAL loading properites list"
Colin Cross [Thu, 26 Dec 2013 21:47:56 +0000 (13:47 -0800)]
hardware: add ro.hardware.<class> to HAL loading properites list
Try to load a HAL determined by ro.hardware.<class> first before
falling back to hardware, board, platform, arch, and default.
This is intended to be used to support multiple hardware variants
from the same source. For example, a single build that supports
two gps chips, gps001 and gpsb, could use /factory/factory.prop
to set ro.hardware.gps=gps001 or ro.hardware.gps=gpsb, which would
load gps.gps001.so or gps.gpsb.so. Two separate builds from the
same source could use PRODUCT_PROPERTY_OVERRIDES to set the
properties.
Change-Id: I1ac46c21ceb27ceb5165e8c44e9373e9c5d4e34e
Sasha Levitskiy [Thu, 12 Dec 2013 23:25:26 +0000 (23:25 +0000)]
am
024c1534: Camera: HAL3: device test fixture and a test.
* commit '
024c15346b00c2ac7d6b53e78422570bbc4245c7':
Camera: HAL3: device test fixture and a test.
Sasha Levitskiy [Thu, 12 Dec 2013 22:08:55 +0000 (14:08 -0800)]
Camera: HAL3: device test fixture and a test.
Change-Id: Ifaec4be35e8f4fb80c8e71e24499fbcd40fddb6e
Signed-off-by: Sasha Levitskiy <sanek@google.com>
Sasha Levitskiy [Thu, 12 Dec 2013 03:10:43 +0000 (03:10 +0000)]
am
4a7b2171: Camera HAL3: first few unit tests.
* commit '
4a7b2171f00ba37e301105e8ea1f61dddaa4db3d':
Camera HAL3: first few unit tests.
Sasha Levitskiy [Tue, 10 Dec 2013 17:37:58 +0000 (09:37 -0800)]
Camera HAL3: first few unit tests.
Change-Id: I413dc447faadd4fd90986bc924722b2826e19382
Signed-off-by: Sasha Levitskiy <sanek@google.com>
Mike Lockwood [Thu, 17 Oct 2013 15:05:00 +0000 (08:05 -0700)]
DO NOT MERGE: Sensor multi HAL
Squashed commit of:
Move sensors multi HAL to libhardware
Added a SensorEventQueue, a circular buffer meant for reading with one thread
and polling a subhal with another. The writing thread gets access to pointers
in the internal buffer. This design avoids a memcpy on write when the multihal
fetches subhal events using poll().
Unit-tests include multithreaded reading and writing lots of events, in
random-sized chunks.
This is not used by the multihal yet. That will be a different CL.
MultiHal multithreaded polling
Tests SensorEventQueue I/O when the queue is full.
Reduced debug logging in multihal.
deactivated multihal logspam, made warnings warnings, left critical startup info
Removed unneeded linux/input.h includes, to fix Mac SDK build
Change-Id: I1e35508949df98a1acef7a4a2d012eea87b4a5eb
Qiwen Zhao [Mon, 9 Dec 2013 22:19:06 +0000 (14:19 -0800)]
DO NOT MERGE reset to goog/klp-volantis-dev
Qiwen Zhao [Fri, 6 Dec 2013 21:30:37 +0000 (13:30 -0800)]
snap to klp-dev-plus-aosp
19b13b9 with history
The Android Open Source Project [Fri, 6 Dec 2013 01:25:49 +0000 (17:25 -0800)]
The Android Open Source Project [Thu, 5 Dec 2013 20:38:20 +0000 (12:38 -0800)]
Mike Lockwood [Thu, 17 Oct 2013 15:05:00 +0000 (08:05 -0700)]
DO NOT MERGE: Sensor multi HAL
Squashed commit of:
Move sensors multi HAL to libhardware
Added a SensorEventQueue, a circular buffer meant for reading with one thread
and polling a subhal with another. The writing thread gets access to pointers
in the internal buffer. This design avoids a memcpy on write when the multihal
fetches subhal events using poll().
Unit-tests include multithreaded reading and writing lots of events, in
random-sized chunks.
This is not used by the multihal yet. That will be a different CL.
MultiHal multithreaded polling
Tests SensorEventQueue I/O when the queue is full.
Reduced debug logging in multihal.
deactivated multihal logspam, made warnings warnings, left critical startup info
Removed unneeded linux/input.h includes, to fix Mac SDK build
Rom Lemarchand [Tue, 26 Nov 2013 18:37:58 +0000 (10:37 -0800)]
am
047510b1: Merge "gralloc: delete unused mutex declaration"
* commit '
047510b132e33c26607b4b93e806884aa4d13f19':
gralloc: delete unused mutex declaration
Rom Lemarchand [Tue, 26 Nov 2013 18:30:33 +0000 (18:30 +0000)]
Merge "gralloc: delete unused mutex declaration"
Rom Lemarchand [Tue, 26 Nov 2013 18:01:25 +0000 (10:01 -0800)]
gralloc: delete unused mutex declaration
Change-Id: Ibc7e70887b61f7dd885c86d412387636d3a6a867
The Android Open Source Project [Sat, 23 Nov 2013 01:41:01 +0000 (17:41 -0800)]
The Android Open Source Project [Fri, 22 Nov 2013 18:35:26 +0000 (10:35 -0800)]
Jesse Hall [Thu, 14 Nov 2013 01:04:25 +0000 (17:04 -0800)]
am
7ccf148f: Update HWC documentation for virtual displays
* commit '
7ccf148f5066ceb1a161f0d7a7d66f75c6e8d420':
Update HWC documentation for virtual displays
Jesse Hall [Wed, 13 Nov 2013 22:48:15 +0000 (14:48 -0800)]
Update HWC documentation for virtual displays
Bug:
8316155
Change-Id: I56598551b07082bfff90df160b103a4158e8c8c9
Nick Kralevich [Thu, 7 Nov 2013 03:40:57 +0000 (19:40 -0800)]
am
af822c43: Merge "gralloc: do not use GNU old-style field designators"
* commit '
af822c43cf144a991db49d8c25068d054265ae37':
gralloc: do not use GNU old-style field designators
Nick Kralevich [Thu, 7 Nov 2013 03:34:27 +0000 (03:34 +0000)]
Merge "gralloc: do not use GNU old-style field designators"
synergy dev [Thu, 7 Nov 2013 01:27:44 +0000 (17:27 -0800)]
gralloc: do not use GNU old-style field designators
Avoiding the use of gnu extensions improves code portability
Change-Id: Icf8e3d4813bcddff40548bb5e65e615f8697b75c
Zhijun He [Wed, 30 Oct 2013 01:37:02 +0000 (18:37 -0700)]
am
b44ff650: Camera2 Test: Skip CameraModuleTest for HAL V1 devices
* commit '
b44ff6508bbcb8df751b5815dd4dfbd4cae252f7':
Camera2 Test: Skip CameraModuleTest for HAL V1 devices
Zhijun He [Mon, 28 Oct 2013 22:52:56 +0000 (15:52 -0700)]
Camera2 Test: Skip CameraModuleTest for HAL V1 devices
Bug:
10971907
Change-Id: Ia3aa0e370d7eb5de6bb1fb7ff48a71ea5605fa17
Colin Cross [Wed, 2 Oct 2013 05:21:16 +0000 (22:21 -0700)]
am
b0c30322: hardware: look in /vendor for default.so
* commit '
b0c303229fcbc89a0afa8f170de64f2a7fee9d6c':
hardware: look in /vendor for default.so
Colin Cross [Mon, 30 Sep 2013 21:23:01 +0000 (14:23 -0700)]
hardware: look in /vendor for default.so
Some vendors have their own HAL modules, which may need their
default implementation stored in /vendor.
Change-Id: I5337a61875023404a85029bbc59b984056b3e441
Eino-Ville Talvala [Wed, 25 Sep 2013 19:29:27 +0000 (12:29 -0700)]
am
89cfe208: Merge "Camera3: Add PASSIVE_UNFOCUSED AF state and clean up INACTIVE" into klp-dev
* commit '
89cfe20899d41e1c96efc20e3f203d3f1dba71cd':
Camera3: Add PASSIVE_UNFOCUSED AF state and clean up INACTIVE
Eino-Ville Talvala [Wed, 25 Sep 2013 19:27:54 +0000 (19:27 +0000)]
Merge "Camera3: Add PASSIVE_UNFOCUSED AF state and clean up INACTIVE" into klp-dev
Zhijun He [Wed, 25 Sep 2013 02:29:53 +0000 (19:29 -0700)]
am
3bf3b45f: Camera2 Test: skip some tests for limited hardware level
* commit '
3bf3b45f2d5eb43b74e1a46ff03ed3e2142b1b38':
Camera2 Test: skip some tests for limited hardware level
Zhijun He [Thu, 19 Sep 2013 06:42:12 +0000 (23:42 -0700)]
Camera2 Test: skip some tests for limited hardware level
Bug:
10388724
Change-Id: Ifd13f72f1b7ff78cf50dc1c238f17c4b4e90d9b0
Eino-Ville Talvala [Sat, 21 Sep 2013 00:24:50 +0000 (17:24 -0700)]
Camera3: Add PASSIVE_UNFOCUSED AF state and clean up INACTIVE
Needed to support the real case of continuous focus giving up on a
scene for a while (say, a blank wall), during which we shouldn't claim
the lens is in motion.
Also add new states for INACTIVE to clarify it as the starting state
after mode transitions or enabling AF/AE/AWB.
Bug:
10860639
Bug:
10446772
Change-Id: Ie4c1ac73e5a9eb6d1894d83dbded49a2767a8ffd
Zhijun He [Fri, 20 Sep 2013 04:01:20 +0000 (21:01 -0700)]
am
60cbb526: Camera2 Test: Fix module and burst test issues
* commit '
60cbb52613d212236de49b4f22fe059585f8c1b2':
Camera2 Test: Fix module and burst test issues
Zhijun He [Wed, 18 Sep 2013 16:44:19 +0000 (09:44 -0700)]
Camera2 Test: Fix module and burst test issues
Bug:
10388724
Change-Id: Idc404cf8a7a96c00941aa8f1880734a236cb3737
Zhijun He [Wed, 18 Sep 2013 01:29:35 +0000 (18:29 -0700)]
am
b3ac07c0: Camera2 Tests: fix some sanity checks
* commit '
b3ac07c0028b0afe8f9b009e37af90ec9a697b44':
Camera2 Tests: fix some sanity checks
Zhijun He [Tue, 17 Sep 2013 23:51:06 +0000 (16:51 -0700)]
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
Rom Lemarchand [Fri, 13 Sep 2013 20:20:43 +0000 (13:20 -0700)]
am
cd996be7: Merge "Initial interface for MemoryTrackerHAL" into klp-dev
* commit '
cd996be7791b3f78e925532d5820da06d58cf635':
Initial interface for MemoryTrackerHAL
Zhijun He [Fri, 13 Sep 2013 20:20:09 +0000 (13:20 -0700)]
am
2a512b49: Merge "Camera2 Test: check the right result metadata" into klp-dev
* commit '
2a512b49e028b5714782ab69cba9662e01e25016':
Camera2 Test: check the right result metadata
Rom Lemarchand [Fri, 13 Sep 2013 18:23:56 +0000 (18:23 +0000)]
Merge "Initial interface for MemoryTrackerHAL" into klp-dev
Zhijun He [Fri, 13 Sep 2013 14:31:07 +0000 (14:31 +0000)]
Merge "Camera2 Test: check the right result metadata" into klp-dev
Alex Ray [Thu, 12 Sep 2013 16:12:47 +0000 (09:12 -0700)]
am
d9d105a0: consumer_ir: add array length to get carrier freq
* commit '
d9d105a0ce6bbaa8d1d1cf70a255612a5dd33701':
consumer_ir: add array length to get carrier freq
Zhijun He [Sun, 8 Sep 2013 17:56:24 +0000 (10:56 -0700)]
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
Alex Ray [Wed, 11 Sep 2013 23:20:07 +0000 (16:20 -0700)]
consumer_ir: add array length to get carrier freq
Change-Id: Iefb424db6f16ffefa40da56c765c9b7a24bea397
Kenny Root [Wed, 11 Sep 2013 21:56:06 +0000 (14:56 -0700)]
am
1d640f05: Merge "Use canonical UniquePtr.h header"
* commit '
1d640f05dcedfcaae63eeb90f3d89b16e95d0208':
Use canonical UniquePtr.h header
Kenny Root [Wed, 11 Sep 2013 21:52:15 +0000 (21:52 +0000)]
Merge "Use canonical UniquePtr.h header"
Kenny Root [Wed, 11 Sep 2013 21:51:09 +0000 (14:51 -0700)]
Use canonical UniquePtr.h header
Change-Id: I0487bd53fc946e1a488d7109eebd402d1ecc5a0a
Alex Ray [Wed, 11 Sep 2013 20:49:29 +0000 (13:49 -0700)]
am
c900b423: Merge "consumerir: make transmit array constant" into klp-dev
* commit '
c900b4230c5f33abc1b7bc590c4ffe21ec8a59d0':
consumerir: make transmit array constant
Alex Ray [Wed, 11 Sep 2013 20:45:02 +0000 (20:45 +0000)]
Merge "consumerir: make transmit array constant" into klp-dev
Alex Ray [Wed, 11 Sep 2013 20:36:58 +0000 (13:36 -0700)]
consumerir: make transmit array constant
Change-Id: I0409970d7bd8efe69a69ec038eea4ee3ff9cbfe0
Glenn Kasten [Wed, 11 Sep 2013 19:33:30 +0000 (12:33 -0700)]
am
22b42bc5: Merge "Clarify return values of get_presentation_position" into klp-dev
* commit '
22b42bc528c1a38176572c128323e945ea4a7d0a':
Clarify return values of get_presentation_position
Glenn Kasten [Wed, 11 Sep 2013 19:31:26 +0000 (19:31 +0000)]
Merge "Clarify return values of get_presentation_position" into klp-dev
Alex Ray [Tue, 10 Sep 2013 19:54:16 +0000 (12:54 -0700)]
am
09875a2e: modules: add demo consumer IR HAL
* commit '
09875a2eabe6bc6582b40ab8f1cc9eac9c3901d5':
modules: add demo consumer IR HAL
OSDN Git Service
