OSDN Git Service
David 'Digit' Turner [Fri, 23 Sep 2011 18:17:34 +0000 (11:17 -0700)]
am
3c935eda: resolved conflicts for merge of
33fddf0c to gingerbread-plus-aosp
* commit '
3c935eda2dcd96eda70da6367d705b3b081f6524':
emulator: Add <hardware/qemu_pipe.h> header
David 'Digit' Turner [Fri, 23 Sep 2011 18:13:07 +0000 (20:13 +0200)]
resolved conflicts for merge of
33fddf0c to gingerbread-plus-aosp
Change-Id: I8720ca884f326b661e30b51c4cf1cfe31c1ac579
David 'Digit' Turner [Fri, 16 Sep 2011 15:11:49 +0000 (17:11 +0200)]
emulator: Add <hardware/qemu_pipe.h> header
This header is required by our GLES emulation guest code to be able
to access the emulator services provided through the /dev/qemu_pipe
special device.
Change-Id: Ia9782256048d7340237f3e1d18d7452dd815e561
David Turner [Tue, 9 Aug 2011 17:05:32 +0000 (10:05 -0700)]
am
bce402a8: Merge "qemu_pipe: fix Mac build error."
* commit '
bce402a8fadf27b07b164b0468e27bb9b6de79e6':
qemu_pipe: fix Mac build error.
David Turner [Tue, 9 Aug 2011 10:54:00 +0000 (03:54 -0700)]
Merge "qemu_pipe: fix Mac build error."
David Turner [Tue, 9 Aug 2011 08:45:19 +0000 (10:45 +0200)]
qemu_pipe: fix Mac build error.
The <hardware/qemu_pipe.h> header was missing an include
that causes the code under development/tools/emulator/opengl
to fail to compile on OS X.
You need to define BUILD_EMULATOR_OPENGL=true in your
environment, otherwise this code doesn't get built yet by default.
Change-Id: Ia1b48c0ab84f493f3c9f95030d9165961069fb6e
Vladimir Chtchetkine [Mon, 8 Aug 2011 20:18:48 +0000 (13:18 -0700)]
am
079ff13b: Merge "Enable connection to QEMUD via pipe."
* commit '
079ff13b07b41d49c4d2f961ba6131960bd81c89':
Enable connection to QEMUD via pipe.
Vladimir Chtchetkine [Mon, 8 Aug 2011 19:59:17 +0000 (12:59 -0700)]
Merge "Enable connection to QEMUD via pipe."
Vladimir Chtchetkine [Thu, 4 Aug 2011 20:52:12 +0000 (13:52 -0700)]
Enable connection to QEMUD via pipe.
With the new model, we will try to connect client via pipe first, and only if
the pipe connection is not available we will fall back to the socket connection.
Change-Id: I7112ff3cb63e1f82a004b80b9ae579d97e15e029
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 [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
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
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
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
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"
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
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
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
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
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: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
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
Erik Gilling [Thu, 2 Dec 2010 00:34:08 +0000 (16:34 -0800)]
gralloc: add dump hooks to gralloc/hwcomposer
Change-Id: I27bf46103b4d1d547c42a6de4f3270a6dfd7b7ec
Erik Gilling [Wed, 8 Dec 2010 02:46:04 +0000 (18:46 -0800)]
gralloc: add padding to alloc_device_t and hwc_composer_device_t
also adds version #defines
Change-Id: I89f19fc7811ea9c9efb579a9f6abb4c3d9011bbf
Louis Huemiller [Wed, 1 Dec 2010 20:25:00 +0000 (12:25 -0800)]
const native_handle_t* -> buffer_handle_t
Change-Id: If4ac1bcfba7192ac1339039cac75f76a5c09f4c6
Mathias Agopian [Wed, 1 Dec 2010 11:37:43 +0000 (03:37 -0800)]
am
778ab436: am
3cceacee: Merge "update rotation-vector documentation." into gingerbread
* commit '
778ab436dee2918ae2fa083f4afa4ba68dc39235':
update rotation-vector documentation.
Mathias Agopian [Tue, 30 Nov 2010 22:08:43 +0000 (14:08 -0800)]
am
3cceacee: Merge "update rotation-vector documentation." into gingerbread
* commit '
3cceaceecac1e76244153940b8855ad1bbdd1037':
update rotation-vector documentation.
Mathias Agopian [Tue, 30 Nov 2010 22:05:02 +0000 (14:05 -0800)]
Merge "update rotation-vector documentation." into gingerbread
Jamie Gennis [Thu, 25 Nov 2010 00:27:25 +0000 (16:27 -0800)]
am
2d17786b: am
2ec21933: Update the docs for the private pixel formats.
* commit '
2d17786be760f473b2a05f5ab48f82cc463c860b':
Update the docs for the private pixel formats.
Jamie Gennis [Wed, 24 Nov 2010 23:03:39 +0000 (15:03 -0800)]
am
2ec21933: Update the docs for the private pixel formats.
* commit '
2ec2193365ab26c6f77a2c5617887ced7a8d6711':
Update the docs for the private pixel formats.
Louis Huemiller [Tue, 23 Nov 2010 00:34:10 +0000 (16:34 -0800)]
Hardware Composer add const for handle pointer
Change-Id: Icf53be12ed43bce19b152fa7f1dee104d713b8da
Mathias Agopian [Mon, 22 Nov 2010 23:55:32 +0000 (15:55 -0800)]
update rotation-vector documentation.
the rotation-vector sensor must transmit the W component of the
unit quaternion in data[4].
This change doesn't cause a compatibility issue because nothing in the
system relies on the W component being present.
Change-Id: If4f699ac8d41d8b957925b375e355a138a82dcf8
Jamie Gennis [Mon, 22 Nov 2010 23:28:58 +0000 (15:28 -0800)]
Update the docs for the private pixel formats.
Change-Id: I337d9e7ba7f3a625294398790844c6d15ee75237
Jamie Gennis [Thu, 18 Nov 2010 02:51:17 +0000 (18:51 -0800)]
Add a gralloc usage flag for external displays.
This change adds a gralloc usage flag to indicate that a buffer should
be displayed full-screen on an external display if one is present.
Change-Id: I3230a8dd2c49c89c81bf0ee9e646a448028bda2e
Mathias Agopian [Tue, 26 Oct 2010 19:21:50 +0000 (12:21 -0700)]
am
caf9528e: am
2d1e978e: improve hardware.h documentation
Mathias Agopian [Tue, 26 Oct 2010 19:19:39 +0000 (12:19 -0700)]
am
2d1e978e: improve hardware.h documentation
Mathias Agopian [Tue, 26 Oct 2010 00:20:19 +0000 (17:20 -0700)]
improve hardware.h documentation
Change-Id: I637a1d8924af144a9c2cc4645659e9d23e9527d6
Louis Huemiller [Tue, 26 Oct 2010 00:00:52 +0000 (17:00 -0700)]
hwcomposer.h - Add comment that buffer handles in a list must be unique
Change-Id: Iaa4984258572b46d6ded4c74b616b842003031c8
Mathias Agopian [Thu, 21 Oct 2010 20:49:17 +0000 (13:49 -0700)]
am
ccacbce3: am
937af9b7: fix part of [Issue
3114236] [Crespo] The order of FLIP_H and ROT_90 is different from other devices
Merge commit '
ccacbce375af6422fa24f81bdc771a5460f60fed'
* commit '
ccacbce375af6422fa24f81bdc771a5460f60fed':
fix part of [Issue
3114236] [Crespo] The order of FLIP_H and ROT_90 is different from other devices
Mathias Agopian [Thu, 21 Oct 2010 07:26:22 +0000 (00:26 -0700)]
am
937af9b7: fix part of [Issue
3114236] [Crespo] The order of FLIP_H and ROT_90 is different from other devices
Merge commit '
937af9b7136a8b692812bc47eaeb9a3e255c46a5' into gingerbread-plus-aosp
* commit '
937af9b7136a8b692812bc47eaeb9a3e255c46a5':
fix part of [Issue
3114236] [Crespo] The order of FLIP_H and ROT_90 is different from other devices
Mathias Agopian [Thu, 21 Oct 2010 07:07:32 +0000 (00:07 -0700)]
fix part of [Issue
3114236] [Crespo] The order of FLIP_H and ROT_90 is different from other devices
there are a typo in hardware.h where FLIP_V and FLIP_H were inverted.
this change will probably break all the overlay HALs which
implement FLIP_V/H, which thanksfully are not many.
Change-Id: Ie824d9a924354d637e44eb6476cb4e5e945c3594
Jean-Baptiste Queru [Mon, 18 Oct 2010 23:41:56 +0000 (16:41 -0700)]
am
4829b184: am
118b5d79: Allow disabling page-flipping.
Merge commit '
4829b184f15350de20096a97e583ed4c2b3d6427'
* commit '
4829b184f15350de20096a97e583ed4c2b3d6427':
Allow disabling page-flipping.
Jean-Baptiste Queru [Mon, 18 Oct 2010 16:53:02 +0000 (09:53 -0700)]
am
118b5d79: Allow disabling page-flipping.
Merge commit '
118b5d7961a4abc29c8bd592956007f40ad4fc6d' into gingerbread-plus-aosp
* commit '
118b5d7961a4abc29c8bd592956007f40ad4fc6d':
Allow disabling page-flipping.
Jean-Baptiste Queru [Fri, 15 Oct 2010 01:04:30 +0000 (18:04 -0700)]
Allow disabling page-flipping.
Some devices have low-level bugs in their page-flip.
Disabling it at this level gives us more flexibility
than trying to control it elsewhere.
Bug:
3097357
Change-Id: Icc6ae172264e453bec0680e74a497a2b24299c4a
Mike Lockwood [Tue, 12 Oct 2010 18:49:55 +0000 (11:49 -0700)]
am
7b96b46c: am
455e83b7: GPS: Add update_network_state call to AGpsRilInterface
Merge commit '
7b96b46c5bc0bb7149c5323c9537660558e65bad'
* commit '
7b96b46c5bc0bb7149c5323c9537660558e65bad':
GPS: Add update_network_state call to AGpsRilInterface
Mike Lockwood [Mon, 11 Oct 2010 19:03:19 +0000 (12:03 -0700)]
am
455e83b7: GPS: Add update_network_state call to AGpsRilInterface
Merge commit '
455e83b705cf4ab830b79585f83176b90daed895' into gingerbread-plus-aosp
* commit '
455e83b705cf4ab830b79585f83176b90daed895':
GPS: Add update_network_state call to AGpsRilInterface
Mike Lockwood [Mon, 11 Oct 2010 10:16:57 +0000 (06:16 -0400)]
GPS: Add update_network_state call to AGpsRilInterface
Change-Id: I3ecc24965ef7fbd943738dee7d0e440bfdeae753
Signed-off-by: Mike Lockwood <lockwood@android.com>
Miguel Torroja [Thu, 7 Oct 2010 16:28:09 +0000 (09:28 -0700)]
am
b15cd546: am
5f404f58: gps: Adding AgpsRilInterface extension
Merge commit '
b15cd546e2043b7530c8eabf235820906e42eaa3'
* commit '
b15cd546e2043b7530c8eabf235820906e42eaa3':
gps: Adding AgpsRilInterface extension
Miguel Torroja [Tue, 5 Oct 2010 19:38:42 +0000 (12:38 -0700)]
am
5f404f58: gps: Adding AgpsRilInterface extension
Merge commit '
5f404f58df329e7676f8fd47bb9bb82f9dc047f1' into gingerbread-plus-aosp
* commit '
5f404f58df329e7676f8fd47bb9bb82f9dc047f1':
gps: Adding AgpsRilInterface extension
Miguel Torroja [Tue, 27 Jul 2010 04:34:15 +0000 (06:34 +0200)]
gps: Adding AgpsRilInterface extension
Change-Id: Iddc10906ca4bd59fef25d51068e0c69998aae13f
Signed-off-by: Mike Lockwood <lockwood@android.com>
Brian Swetland [Sun, 19 Sep 2010 11:46:16 +0000 (04:46 -0700)]
Brian Swetland [Sun, 19 Sep 2010 10:51:37 +0000 (03:51 -0700)]
am
e755bd40: add /vendor support
Merge commit '
e755bd4038cab69f98f7cf17e41f493296ec62ab' into gingerbread-plus-aosp
* commit '
e755bd4038cab69f98f7cf17e41f493296ec62ab':
add /vendor support
Brian Swetland [Sun, 19 Sep 2010 10:41:01 +0000 (03:41 -0700)]
add /vendor support
Search /vendor/lib/hw/... as well as /system/lib/hw/... for hal modules.
Change-Id: I1aecafcc884e11b2f17edf28e8c8ca2926184807
Mathias Agopian [Wed, 15 Sep 2010 19:08:05 +0000 (12:08 -0700)]
resolved conflicts for merge of
72c113ee to master
Change-Id: Icef7703423fdb153477bfd3dc49980e979bbd8e7
Mathias Agopian [Tue, 14 Sep 2010 20:29:39 +0000 (13:29 -0700)]
am
c04e5f68: Added a data field for gyroscopes and improved documentation.
Merge commit '
c04e5f68905127ae4c1a0c17d225db9cebe66a07' into gingerbread-plus-aosp
* commit '
c04e5f68905127ae4c1a0c17d225db9cebe66a07':
Added a data field for gyroscopes and improved documentation.
Mathias Agopian [Tue, 14 Sep 2010 17:53:55 +0000 (10:53 -0700)]
Added a data field for gyroscopes and improved documentation.
Change-Id: Iddc9710d8b724af9285df0396949479dccc3de7a
Mathias Agopian [Sat, 11 Sep 2010 00:24:19 +0000 (17:24 -0700)]
am
20d7bafc: am
a2df7ab5: Fix (again) description of our interchange YV12 format
Merge commit '
20d7bafcf02a629d4d02401445a5d4804f86336b'
* commit '
20d7bafcf02a629d4d02401445a5d4804f86336b':
Fix (again) description of our interchange YV12 format
Mathias Agopian [Fri, 10 Sep 2010 23:31:49 +0000 (16:31 -0700)]
am
a2df7ab5: Fix (again) description of our interchange YV12 format
Merge commit '
a2df7ab5fe89fda56606f8151659db47e160a5b3' into gingerbread-plus-aosp
* commit '
a2df7ab5fe89fda56606f8151659db47e160a5b3':
Fix (again) description of our interchange YV12 format
Mathias Agopian [Fri, 10 Sep 2010 21:33:16 +0000 (14:33 -0700)]
Fix (again) description of our interchange YV12 format
Change-Id: I8cd81654b51d50385cccec7b96f6e694fd372925
Brian Carlstrom [Wed, 25 Aug 2010 03:02:38 +0000 (20:02 -0700)]
Brian Carlstrom [Wed, 25 Aug 2010 03:00:30 +0000 (20:00 -0700)]
am
03cb00b7: Fix sim-eng build.
Merge commit '
03cb00b7b37d39f6d599bb148db775a08eb8b04a' into gingerbread-plus-aosp
* commit '
03cb00b7b37d39f6d599bb148db775a08eb8b04a':
Fix sim-eng build.
Brian Carlstrom [Wed, 25 Aug 2010 00:57:25 +0000 (17:57 -0700)]
Fix sim-eng build.
Missing a <string.h> header.
git cherry-pick -e
d0019991
Change-Id: I7a3dc7cb7d2855fde56512b3dcb181a092055497
Kevin Powell [Tue, 24 Aug 2010 18:21:34 +0000 (11:21 -0700)]
am
a9c5514e: am
4ec14c1e: add new sensor types for handling gyro data and device orientation more efficiently.
Merge commit '
a9c5514e74a921eec19c912ca93cc666e496dc93'
* commit '
a9c5514e74a921eec19c912ca93cc666e496dc93':
add new sensor types for handling gyro data and device orientation more efficiently.
Kenny Root [Tue, 24 Aug 2010 17:22:45 +0000 (10:22 -0700)]
resolved conflicts for merge of
5e610d6a to master
Change-Id: Ibeaa176ff4b25f81559d14dd8c73283ee4f2eacf
Kevin Powell [Mon, 23 Aug 2010 20:56:18 +0000 (13:56 -0700)]
am
4ec14c1e: add new sensor types for handling gyro data and device orientation more efficiently.
Merge commit '
4ec14c1e233bbc0c7c7efe990f2fafe9727179ca' into gingerbread-plus-aosp
* commit '
4ec14c1e233bbc0c7c7efe990f2fafe9727179ca':
add new sensor types for handling gyro data and device orientation more efficiently.