OSDN Git Service
Jamie Gennis [Wed, 10 Aug 2011 18:41:52 +0000 (11:41 -0700)]
Gralloc: add a HWComposer usage bit
This change adds a new Gralloc usage bit to indicate that the Gralloc
buffer being allocated will be passed to the HWComposer HAL module.
Change-Id: If901f886cb22fc8379811898db3a380a61c0e442
Mike Lockwood [Thu, 4 Aug 2011 14:53:33 +0000 (07:53 -0700)]
am
20013279: am
4306ca7d: Merge "GPS: added update_network_availability to AGpsRilInterface"
* commit '
20013279f3dacec0b1d6c2844213d762b469cf98':
GPS: added update_network_availability to AGpsRilInterface
Mike Lockwood [Thu, 4 Aug 2011 14:52:14 +0000 (07:52 -0700)]
am
4306ca7d: Merge "GPS: added update_network_availability to AGpsRilInterface"
* commit '
4306ca7d446c26752ecd9f724590487d68a27f10':
GPS: added update_network_availability to AGpsRilInterface
Mike Lockwood [Thu, 4 Aug 2011 14:32:47 +0000 (07:32 -0700)]
Merge "GPS: added update_network_availability to AGpsRilInterface"
Kevin Tang [Thu, 14 Apr 2011 00:15:55 +0000 (17:15 -0700)]
GPS: added update_network_availability to AGpsRilInterface
Change-Id: Ib2ed9ea96f1043d34a12c2ddf87b41c5256b585e
Signed-off-by: Mike Lockwood <lockwood@android.com>
Vladimir Chtchetkine [Thu, 4 Aug 2011 01:16:35 +0000 (18:16 -0700)]
am
d9f2f74e: am
da51d1ca: Merge "Inline implementation of qemu_pipe_open"
* commit '
d9f2f74e1939eb268ec557171149375f220628d2':
Inline implementation of qemu_pipe_open
Vladimir Chtchetkine [Wed, 3 Aug 2011 19:44:05 +0000 (12:44 -0700)]
am
da51d1ca: Merge "Inline implementation of qemu_pipe_open"
* commit '
da51d1ca145b8cc82588d97ea33e81d6a0cda408':
Inline implementation of qemu_pipe_open
Vladimir Chtchetkine [Wed, 3 Aug 2011 17:50:58 +0000 (10:50 -0700)]
Merge "Inline implementation of qemu_pipe_open"
Vladimir Chtchetkine [Wed, 3 Aug 2011 16:07:39 +0000 (09:07 -0700)]
Inline implementation of qemu_pipe_open
Change-Id: Icbe0528b1ac2b215d2cebc5c35cce9c3c830b722
Eric Laurent [Wed, 3 Aug 2011 00:12:00 +0000 (17:12 -0700)]
audio HAL: add defines for BT NREC parameter
Added definitions of keys and values used to enable or disable
AEC and NS via set_parameters according to BT headset capabilities.
Change-Id: Id3fba06edfe77e2832b8256c0c4c46eeef17b816
Mathias Agopian [Mon, 1 Aug 2011 23:34:42 +0000 (16:34 -0700)]
Add a h/w composer HAL API to allow the HAL to trigger a redraw
This is useful in various situations, for instance if the HAL
wants to change its compositing strategy.
Bug:
4488017
Change-Id: Idc410c689af30a2c9613dc3141e323d6e02a5648
Wu-cheng Li [Fri, 29 Jul 2011 00:23:41 +0000 (17:23 -0700)]
Merge "Add frame metadata to camera data callback."
Wu-cheng Li [Mon, 25 Jul 2011 23:39:41 +0000 (07:39 +0800)]
Add frame metadata to camera data callback.
bug:
4460717
Change-Id: I6175af70d0f10e0ba1b7158a237bceed2be06dd2
Mike Lockwood [Thu, 28 Jul 2011 21:06:05 +0000 (14:06 -0700)]
am
bc287a05: am
61659b21: Merge "gps: Adding ip address for AGps"
* commit '
bc287a056561b52d3f4067c3a9a2f948635ed2c1':
gps: Adding ip address for AGps
Mike Lockwood [Thu, 28 Jul 2011 21:04:11 +0000 (14:04 -0700)]
am
61659b21: Merge "gps: Adding ip address for AGps"
* commit '
61659b21b512a4d1e26a1843738e0486a68be36b':
gps: Adding ip address for AGps
Mike Lockwood [Thu, 28 Jul 2011 20:52:29 +0000 (13:52 -0700)]
Merge "gps: Adding ip address for AGps"
Stephen Li [Thu, 3 Mar 2011 23:40:47 +0000 (15:40 -0800)]
gps: Adding ip address for AGps
Change-Id: I3ac752294b81e1fa69019d037d8b89563773b35e
Iliyan Malchev [Tue, 26 Jul 2011 22:47:56 +0000 (15:47 -0700)]
camera HAL: add optional put_parameters callback
Change-Id: I2b2436c68b3095e840458059f8533dc897e1ca87
Signed-off-by: Iliyan Malchev <malchev@google.com>
Mathias Agopian [Wed, 13 Jul 2011 21:07:03 +0000 (14:07 -0700)]
Merge "get rid of overlay HAL"
Jean-Baptiste Queru [Wed, 13 Jul 2011 14:28:21 +0000 (07:28 -0700)]
Ignore
6f3cb7d4
Change-Id: Iabdf987ac6fc0299e1de4fc160de6699df088472
Mathias Agopian [Tue, 12 Jul 2011 22:48:30 +0000 (15:48 -0700)]
get rid of overlay HAL
Change-Id: I1ba7ffac8776a8d59a5cc4e7688c3a5bd02e6647
Jeff Brown [Tue, 12 Jul 2011 19:15:45 +0000 (12:15 -0700)]
Merge "Remove the simulator target from all makefiles. Bug:
5010576"
Jeff Brown [Tue, 12 Jul 2011 05:12:23 +0000 (22:12 -0700)]
Remove the simulator target from all makefiles.
Bug:
5010576
Change-Id: I19222871077be62d2b6a4a215f251675389ffdb4
Jean-Baptiste Queru [Tue, 12 Jul 2011 00:54:07 +0000 (17:54 -0700)]
am
03e7ec95: Merge "Tweaks for forward-compatibility"
* commit '
03e7ec959823279937ceae1290b938c4b0b68317':
Tweaks for forward-compatibility
Jean-Baptiste Queru [Tue, 12 Jul 2011 00:38:46 +0000 (17:38 -0700)]
Merge "Tweaks for forward-compatibility"
Jean-Baptiste Queru [Mon, 11 Jul 2011 23:59:19 +0000 (16:59 -0700)]
Tweaks for forward-compatibility
Change-Id: I9171f0f0155c910cf5ae4109e812c9ff10702946
Eric Laurent [Fri, 17 Jun 2011 23:53:12 +0000 (16:53 -0700)]
Audio HAL: added interface for audio preprocessing
Change-Id: I032f6dd8f9ad11283a3f0a6721018dabfd12236d
Mike Lockwood [Wed, 29 Jun 2011 19:10:36 +0000 (15:10 -0400)]
GPS: Add support for on-demand NTP time injection
Change-Id: I95ea2bc2a345d6fbde22356f575506385257e574
Signed-off-by: Mike Lockwood <lockwood@android.com>
Sundar Raman [Fri, 17 Jun 2011 14:14:46 +0000 (09:14 -0500)]
Camera: Add lock_buffer to preview_stream_ops
Giving HAL control of locking buffer instead of locking in dequeue buffer.
Change-Id: I2640b784218fa67ccb051c13b24f2d3dda48ce9a
Signed-off-by: Iliyan Malchev <malchev@google.com>
Jean-Baptiste Queru [Tue, 21 Jun 2011 22:26:56 +0000 (15:26 -0700)]
am
e710fc70: am
910cf83c: Merge "tweak for forward-compatibility"
* commit '
e710fc70e442604fe300cafb467b9208869c28ed':
tweak for forward-compatibility
Jean-Baptiste Queru [Mon, 20 Jun 2011 16:10:56 +0000 (09:10 -0700)]
am
910cf83c: Merge "tweak for forward-compatibility"
* commit '
910cf83c9a58e4ee42b6aea919de80273cb25aa4':
tweak for forward-compatibility
Jean-Baptiste Queru [Sat, 18 Jun 2011 17:55:37 +0000 (10:55 -0700)]
Merge "tweak for forward-compatibility"
Jean-Baptiste Queru [Sat, 18 Jun 2011 17:32:53 +0000 (10:32 -0700)]
tweak for forward-compatibility
Change-Id: I4230a049221f551a6b0c279c0ba75e872e703a83
Dima Zavin [Tue, 14 Jun 2011 00:59:54 +0000 (17:59 -0700)]
hardware: drop the _hal suffixes from audio.h and audio_policy.h
Change-Id: Ib9bfc4049cf350f72af3ee577ce4756ac4118cfc
Signed-off-by: Dima Zavin <dima@android.com>
Dima Zavin [Tue, 14 Jun 2011 01:00:30 +0000 (18:00 -0700)]
hardware: move audio_policy.h to system/
Change-Id: I392c5f91db88ca923dead7202064169edc1cc0c7
Signed-off-by: Dima Zavin <dima@android.com>
Iliyan Malchev [Fri, 10 Jun 2011 23:06:52 +0000 (16:06 -0700)]
libhardware: report stride on dequeue_buffer
Change-Id: Ic41f625f69e135fd2dc3929f99af83b9584f8c1d
Signed-off-by: Iliyan Malchev <malchev@google.com>
Dima Zavin [Tue, 7 Jun 2011 22:23:24 +0000 (15:23 -0700)]
Merge "hardware: audio: add stream parameter strings needed by HALs"
Dima Zavin [Tue, 7 Jun 2011 02:31:18 +0000 (19:31 -0700)]
hardware: audio: add stream parameter strings needed by HALs
Change-Id: Ib5fcb67426ad5d67fd021894db71ae7114ea3367
Signed-off-by: Dima Zavin <dima@android.com>
Iliyan Malchev [Mon, 6 Jun 2011 23:39:06 +0000 (16:39 -0700)]
libhardware/camera.h: camera HAL memory management updates
-- add a callback to camera_memory_t that can be used to free the requested
memory
-- memory requests are in the form of N buffers S bytes each
-- data callbacks pass an index to a buffer in addition to the camera_memory
pointer
Change-Id: I368139809f25a662d8895f205e3b87fa5046a4b2
Signed-off-by: Iliyan Malchev <malchev@google.com>
Jean-Baptiste Queru [Mon, 6 Jun 2011 20:28:45 +0000 (13:28 -0700)]
Remove workarounds for buggy /dev/fb0 drivers
Change-Id: Ideadd5f39693d05cf29a81d9f87ed804d7e52380
Eric Laurent [Fri, 27 May 2011 22:41:57 +0000 (15:41 -0700)]
Fix hw module lookup order.
Make sure hw_get_module_by_class() first scans /vendor/lib/hw
and then /system/lib/hw so that vendor specific modules override
default ones.
Change-Id: Iaec61c3b4bb6fde202acb4412aaec3b318cc1cbd
Eric Laurent [Wed, 18 May 2011 02:24:26 +0000 (19:24 -0700)]
Modified audio effect API.
Moved and renamed media/EffectApi.h to hardware/audio_effect.h
Modified the effect library API to expose a library info structure
containing an interface functions table.
Also removed enums for audio channels, audio format and devices
from effect API and use values from system/audio.h instead.
Change-Id: I32fd752e449337410115121c1c60c699d95247c2
Jean-Baptiste Queru [Wed, 18 May 2011 23:40:03 +0000 (16:40 -0700)]
Merge
48e4ab6b7
Change-Id: Ie034418055ed9b10608e06fd6e35d64bddb73598
Jean-Baptiste Queru [Wed, 18 May 2011 22:15:48 +0000 (15:15 -0700)]
am
83eb0af0: Merge "support humidity sensor type"
* commit '
83eb0af000c80bc9d9b2a19eb15ab22bb0dddb1b':
support humidity sensor type
Jean-Baptiste Queru [Wed, 18 May 2011 21:39:13 +0000 (14:39 -0700)]
Merge "support humidity sensor type"
Mathias Agopian [Tue, 17 May 2011 02:05:15 +0000 (19:05 -0700)]
Merge "split fb.h out of gralloc.h"
Jean-Baptiste Queru [Fri, 13 May 2011 23:38:13 +0000 (16:38 -0700)]
am
61b16262: am
ab8a3590: Merge "Revert "Extra audio headers for better build-time compatibility""
* commit '
61b16262441607f1ecee6dd087246302c6889a39':
Revert "Extra audio headers for better build-time compatibility"
Jean-Baptiste Queru [Fri, 13 May 2011 23:35:54 +0000 (16:35 -0700)]
am
ab8a3590: Merge "Revert "Extra audio headers for better build-time compatibility""
* commit '
ab8a35906f6ed5055a0a6c52db4d5cb154cdf703':
Revert "Extra audio headers for better build-time compatibility"
Jean-Baptiste Queru [Fri, 13 May 2011 21:23:42 +0000 (14:23 -0700)]
Merge "Revert "Extra audio headers for better build-time compatibility""
Jean-Baptiste Queru [Fri, 13 May 2011 21:08:58 +0000 (14:08 -0700)]
Revert "Extra audio headers for better build-time compatibility"
This reverts commit
54aa0e15204d42c316f98e208eb3ec8cacc4e9b6.
Change-Id: Id13be86091d064db69b47a85d69c02332a2c5193
Mathias Agopian [Fri, 29 Apr 2011 01:56:10 +0000 (18:56 -0700)]
split fb.h out of gralloc.h
fb and gralloc are part of the same HAL for now,
but for clarity we split them into these two headers.
Change-Id: I8e9e3068e47f0d94dd7c145d72fdc2e9fff24af5
Dima Zavin [Wed, 11 May 2011 21:15:53 +0000 (14:15 -0700)]
audio: move audio.h to system/core/include/system/audio.h
Change-Id: I523dfb361b1b3862cf8bc41c1691c607b2c815b0
Signed-off-by: Dima Zavin <dima@android.com>
Jean-Baptiste Queru [Thu, 12 May 2011 16:32:48 +0000 (09:32 -0700)]
am
e3193479: am
47050dc6: Merge "Extra audio headers for better build-time compatibility"
* commit '
e3193479ae0ab05ceb149a186861621eb33ebb74':
Extra audio headers for better build-time compatibility
Jean-Baptiste Queru [Thu, 12 May 2011 16:28:31 +0000 (09:28 -0700)]
am
47050dc6: Merge "Extra audio headers for better build-time compatibility"
* commit '
47050dc62e02fe9129217495281f8201de7fcb91':
Extra audio headers for better build-time compatibility
Jean-Baptiste Queru [Thu, 12 May 2011 16:18:03 +0000 (09:18 -0700)]
Merge "Extra audio headers for better build-time compatibility"
Derek Sollenberger [Wed, 11 May 2011 17:23:43 +0000 (13:23 -0400)]
Extra audio headers for better build-time compatibility
Change-Id: I58724c04b73403391b157bcc14792ad080e5912f
Iliyan Malchev [Tue, 3 May 2011 01:58:16 +0000 (18:58 -0700)]
libhardware: move buffer_handle_t to system/core
Change-Id: I2ed9ff7360086bc3458b2211437c102fee615481
Signed-off-by: Iliyan Malchev <malchev@google.com>
Iliyan Malchev [Fri, 15 Apr 2011 06:16:54 +0000 (23:16 -0700)]
libhardware: introduce camera HAL header
camera.h
-- a HAL module for the camera, camera_module_t, which can be queried for the
number and orientation of the available camera sensors. A camera sensor is
also opened through this module, and is represented by:
-- a HAL device for each camera sensor, camera_device_t, which encapsulates all
the functionality of the base class CameraHardwareInterface;
Change-Id: I79a9524ceeafc4275581c009d7b9c0fa05eed764
Signed-off-by: Iliyan Malchev <malchev@google.com>
Iliyan Malchev [Fri, 15 Apr 2011 03:00:02 +0000 (20:00 -0700)]
libhardware: break pixel formats out of hardware.h
These definitions now live under system/core/include/android/graphics.h
Change-Id: I65ca8226cb42387748c3aaa1432423153d1dad33
Signed-off-by: Iliyan Malchev <malchev@google.com>
Iliyan Malchev [Thu, 14 Apr 2011 00:37:26 +0000 (17:37 -0700)]
libhardware: minor cleanup in gralloc.h
Change-Id: I2180725805e47d313e29ed80b4c9c05e06b77831
Signed-off-by: Iliyan Malchev <malchev@google.com>
Mathias Agopian [Tue, 3 May 2011 22:36:17 +0000 (15:36 -0700)]
Merge "Improve ROTATION_VECTOR sensor documentation"
Mathias Agopian [Tue, 3 May 2011 02:10:31 +0000 (19:10 -0700)]
Improve ROTATION_VECTOR sensor documentation
Change-Id: Iebc978beadf365d63c60c04d54ce7331605348b3
David 'Digit' Turner [Fri, 29 Apr 2011 22:09:45 +0000 (15:09 -0700)]
am
05a9b62f: am
d1be1d02: Merge "<hardware/qemu_pipe.h>: Allow inclusion from C++"
* commit '
05a9b62f315c933e9f92e2fb8ee64f6f8f261d3f':
<hardware/qemu_pipe.h>: Allow inclusion from C++
David 'Digit' Turner [Fri, 29 Apr 2011 22:09:43 +0000 (15:09 -0700)]
am
61d6a702: am
67e71a87: am
ee5636cf: Merge "Add <hardware/qemu_pipe.h> header."
* commit '
61d6a702dc318247273169e0eafb74f4bd7e7c59':
Add <hardware/qemu_pipe.h> header.
David 'Digit' Turner [Fri, 29 Apr 2011 21:57:56 +0000 (14:57 -0700)]
am
d1be1d02: Merge "<hardware/qemu_pipe.h>: Allow inclusion from C++"
* commit '
d1be1d02135917497866526ce12ef4c2548e63cb':
<hardware/qemu_pipe.h>: Allow inclusion from C++
David 'Digit' Turner [Fri, 29 Apr 2011 21:53:39 +0000 (14:53 -0700)]
am
67e71a87: am
ee5636cf: Merge "Add <hardware/qemu_pipe.h> header."
* commit '
67e71a870d882be851def98fb3e87c3a67a4b93e':
Add <hardware/qemu_pipe.h> header.
David 'Digit' Turner [Fri, 29 Apr 2011 14:39:50 +0000 (07:39 -0700)]
Merge "<hardware/qemu_pipe.h>: Allow inclusion from C++"
David 'Digit' Turner [Fri, 29 Apr 2011 14:38:51 +0000 (16:38 +0200)]
<hardware/qemu_pipe.h>: Allow inclusion from C++
Change-Id: Ic33b5daf7a01e8fe638ea1ccc54ed76561745abe
Mathias Agopian [Fri, 29 Apr 2011 03:00:54 +0000 (20:00 -0700)]
remove deprecated/unused HAL headers
copybit, overlay, sensors_deprecated are no longer supported.
Change-Id: Ie5da20bd4ff95f7565a162d628bf572a76327b7b
Mathias Agopian [Fri, 29 Apr 2011 02:03:40 +0000 (19:03 -0700)]
get rid of GRALLOC_MODULE_PERFORM_CREATE_HANDLE_FROM_BUFFER
Change-Id: I916812dcfa2e1188e7e249303b80b7b221de71fd
David 'Digit' Turner [Thu, 28 Apr 2011 15:06:20 +0000 (08:06 -0700)]
am
ee5636cf: Merge "Add <hardware/qemu_pipe.h> header."
* commit '
ee5636cff3411f80ae4ec73e14564ff2783eef9e':
Add <hardware/qemu_pipe.h> header.
David 'Digit' Turner [Thu, 28 Apr 2011 14:47:48 +0000 (07:47 -0700)]
Merge "Add <hardware/qemu_pipe.h> header."
David 'Digit' Turner [Wed, 16 Mar 2011 13:21:28 +0000 (14:21 +0100)]
Add <hardware/qemu_pipe.h> header.
This header is used to implement qemu pipes, a very fast way to exchange
messages between the guest and the emulator program. See implementation and
tests under development/tools/emulator/system/libqemu/
Change-Id: I8272435cb9bf6e2a96ac62b9a56cbc5930052682
Dima Zavin [Wed, 20 Apr 2011 23:38:05 +0000 (16:38 -0700)]
libhardware: add stub audio and audio_policy modules
Change-Id: Ib6c0c49dbc369b735b2ac5fb5b583de96c3e9f3e
Signed-off-by: Dima Zavin <dima@android.com>
Dima Zavin [Thu, 21 Apr 2011 01:46:23 +0000 (18:46 -0700)]
libhardware: add separate makefile for modules subdir
Change-Id: I787c444ee1c3a687ee6f8f551c359e5e908ed7f5
Signed-off-by: Dima Zavin <dima@android.com>
Dima Zavin [Fri, 11 Mar 2011 19:20:49 +0000 (11:20 -0800)]
libhardware: add audio defines and HAL headers
Change-Id: Iae523059834c252f0d39f7efc6e15832e6273101
Signed-off-by: Dima Zavin <dima@android.com>
Mathias Agopian [Fri, 22 Apr 2011 00:13:45 +0000 (17:13 -0700)]
Merge "add a method to blank/unblank the screen"
Mathias Agopian [Tue, 19 Apr 2011 02:05:29 +0000 (19:05 -0700)]
add a method to blank/unblank the screen
Change-Id: I3874654248826c29e57bb62bb5217184bdfb4263
Dima Zavin [Mon, 18 Apr 2011 17:55:37 +0000 (10:55 -0700)]
libhardware: add concept of module classes
Needed for things like audio and audio effects. Provides a
new interface to loading modules named 'hw_get_module_by_class'.
This takes two parameters: 'class_id' and 'instance' which are
used to construct the filename for the module to be loaded. If
instance is NULL, then this function acts identically to
hw_get_module where 'class_id' == 'id' (and in fact the latter
implemented exactly this way).
For audio, this new mechanism allows us to load multiple audio
interfaces by doing:
hw_get_module_by_class("audio", "primary", &module);
hw_get_module_by_class("audio", "a2dp", &module);
hw_get_module_by_class("audio", "usb", &module);
...
In the future we will likely want to add the ability to load a set of
module instances based on a config file, which will have a standard
syntax and the mechanism will be provided by libhardware.
Change-Id: I9976cc6d59a85a414b18e7b398a36edfbce4abd8
Signed-off-by: Dima Zavin <dima@android.com>
Urs Fleisch [Wed, 29 Dec 2010 16:00:33 +0000 (17:00 +0100)]
support humidity sensor type
Change-Id: I7600d64ea28d2eefc20104cbf81270ddad9d57c0
Jean-Baptiste Queru [Tue, 5 Apr 2011 18:27:14 +0000 (11:27 -0700)]
am
cb4ea7ac: am
7b584867: am
cd347fdf: Allow to force 16bpp when 32bpp has problems
* commit '
cb4ea7ac8af7ac0732f480dc4938e62566bd5550':
Allow to force 16bpp when 32bpp has problems
Jean-Baptiste Queru [Tue, 5 Apr 2011 18:22:04 +0000 (11:22 -0700)]
am
7b584867: am
cd347fdf: Allow to force 16bpp when 32bpp has problems
* commit '
7b584867cdfef3ba393e308471d5da76024e249c':
Allow to force 16bpp when 32bpp has problems
Jean-Baptiste Queru [Mon, 4 Apr 2011 21:42:32 +0000 (14:42 -0700)]
am
cd347fdf: Allow to force 16bpp when 32bpp has problems
* commit '
cd347fdf74d5f2e0af856455c514e655f40a6fdb':
Allow to force 16bpp when 32bpp has problems
Jean-Baptiste Queru [Fri, 1 Apr 2011 02:34:19 +0000 (19:34 -0700)]
Allow to force 16bpp when 32bpp has problems
Bug:
4197654
Change-Id: Icf1e8793d6a4d2e070a8f232efd4136d79339496
Mathias Agopian [Wed, 23 Mar 2011 01:42:03 +0000 (18:42 -0700)]
fix [
4056232] Deprecate Sensor.TYPE_TEMPERATURE and add Sensor.TYPE_AMBIENT_TEMPERATURE
Bug:
4056232
Change-Id: I4555823abacc8aa127429bda78033ef6007aa04b
Iliyan Malchev [Mon, 14 Mar 2011 21:02:15 +0000 (14:02 -0700)]
hardware/libhardware: remove LOCAL_PRELINK_MODULE
Change-Id: I8a0ba7e4c99e334b9789d88b48383439eb7cc780
Signed-off-by: Iliyan Malchev <malchev@google.com>
The Android Open Source Project [Sun, 30 Jan 2011 20:53:57 +0000 (12:53 -0800)]
am
30497e4f: Reconcile gingerbread-plus-aosp and honeycomb
* commit '
30497e4fa693b73e91bbd39c573e6ffa1d57f98f':
The Android Open Source Project [Sun, 30 Jan 2011 20:40:53 +0000 (12:40 -0800)]
Reconcile gingerbread-plus-aosp and honeycomb
Change-Id: I0310c299ff4719e454488eafcebbd16045c7e9ea
The Android Open Source Project [Sun, 30 Jan 2011 20:40:53 +0000 (12:40 -0800)]
Mass merge from gingerbread - do not merge
Change-Id: I99b09f1fd58b5c3119903304605ff613e1c4a665
Glenn Kasten [Thu, 20 Jan 2011 00:58:31 +0000 (16:58 -0800)]
Protected surface API
Change-Id: I63a16e77228b4a440ad08b9f21d8fbbacef3698e
David 'Digit' Turner [Thu, 27 Jan 2011 17:18:13 +0000 (09:18 -0800)]
am
25b68b5c: gralloc: Add support for 32-bit framebuffers.
* commit '
25b68b5c24e443c326af73a33cea6dc45e845254':
gralloc: Add support for 32-bit framebuffers.
David 'Digit' Turner [Thu, 27 Jan 2011 16:35:09 +0000 (08:35 -0800)]
am
80d3699c: gralloc: Fix division-by-0 during system emulation.
* commit '
80d3699c9e8e18d57684f3b20d58fd259379a9d2':
gralloc: Fix division-by-0 during system emulation.
David 'Digit' Turner [Mon, 17 Jan 2011 22:59:26 +0000 (14:59 -0800)]
am
36292755: am
25b68b5c: gralloc: Add support for 32-bit framebuffers.
* commit '
3629275560f4a952cedd69c76b7b96b3b490f6f6':
gralloc: Add support for 32-bit framebuffers.
David 'Digit' Turner [Mon, 17 Jan 2011 22:57:46 +0000 (14:57 -0800)]
am
25b68b5c: gralloc: Add support for 32-bit framebuffers.
* commit '
25b68b5c24e443c326af73a33cea6dc45e845254':
gralloc: Add support for 32-bit framebuffers.
David 'Digit' Turner [Sun, 16 Jan 2011 18:52:22 +0000 (19:52 +0100)]
gralloc: Add support for 32-bit framebuffers.
Note: The code under hardware/libhardware/modules/gralloc/ is only used
when running the system under the emulator.
Change-Id: I022978aeaacc5137c9917cd2ef6952dd3897ece4
David 'Digit' Turner [Sun, 16 Jan 2011 23:15:17 +0000 (15:15 -0800)]
am
3d05f9cf: Merge
80d3699c: gralloc: Fix division-by-0 during system emulation.
* commit '
3d05f9cfbd996f52c0bd6307a80beaabc4e58140':
Merge
80d3699c: gralloc: Fix division-by-0 during system emulation.
David 'Digit' Turner [Sat, 15 Jan 2011 20:06:12 +0000 (21:06 +0100)]
Merge
80d3699c: gralloc: Fix division-by-0 during system emulation.
This patch avoids a division-by-0 when the system is running
under emulation (the kernel driver reports pixclock as 0, for
some reason). Which results in a SIGFPE during the boot sequence.
Change-Id: Ia9febdf143dcbce9837ca89c641e95dce3a888bb
David 'Digit' Turner [Sun, 16 Jan 2011 21:06:33 +0000 (13:06 -0800)]
am
f540c44f: am
80d3699c: gralloc: Fix division-by-0 during system emulation.
* commit '
f540c44fc218bffcdfbc226187d3cdc08e213c32':
gralloc: Fix division-by-0 during system emulation.
David 'Digit' Turner [Sun, 16 Jan 2011 21:04:42 +0000 (13:04 -0800)]
am
80d3699c: gralloc: Fix division-by-0 during system emulation.
* commit '
80d3699c9e8e18d57684f3b20d58fd259379a9d2':
gralloc: Fix division-by-0 during system emulation.
David 'Digit' Turner [Sat, 15 Jan 2011 20:06:12 +0000 (21:06 +0100)]
gralloc: Fix division-by-0 during system emulation.
This patch avoids a division-by-0 when the system is running
under emulation (the kernel driver reports pixclock as 0, for
some reason). Which results in a SIGFPE during the boot sequence.
Change-Id: Idb6bcdd58999ea9231f2411481c25929d5d02f1d