OSDN Git Service
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 [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: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 [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.
Kevin Powell [Tue, 20 Jul 2010 02:12:15 +0000 (19:12 -0700)]
add new sensor types for handling gyro data and device orientation more efficiently.
Change-Id: I89faf5b3d57a3e726d1c347ce01d931b100188cd
Jean-Baptiste Queru [Sat, 21 Aug 2010 00:30:45 +0000 (17:30 -0700)]
resolved conflicts for merge of
b01a043d to gingerbread-plus-aosp
Change-Id: I60466613c7ea0335a78d553a10876367d65557d9
Mathias Agopian [Thu, 19 Aug 2010 20:42:13 +0000 (13:42 -0700)]
am
76022c6f: Merge "revert pixelformat hack" into gingerbread
Merge commit '
76022c6f4417ac91069c010aa15044e07f7b7d2e' into gingerbread-plus-aosp
* commit '
76022c6f4417ac91069c010aa15044e07f7b7d2e':
revert pixelformat hack
Mathias Agopian [Thu, 19 Aug 2010 20:37:53 +0000 (13:37 -0700)]
Merge "revert pixelformat hack" into gingerbread
Mathias Agopian [Thu, 19 Aug 2010 20:14:46 +0000 (13:14 -0700)]
revert pixelformat hack
Change-Id: Ia5e01b2b2f205f48ede1d29275094a64221df2d4
Elliott Hughes [Thu, 19 Aug 2010 19:50:10 +0000 (12:50 -0700)]
am
5f5c5460: Fix build (missing #include).
Merge commit '
5f5c5460d382104a8792952907aa2fa0cae1bca7' into gingerbread-plus-aosp
* commit '
5f5c5460d382104a8792952907aa2fa0cae1bca7':
Fix build (missing #include).
Elliott Hughes [Thu, 19 Aug 2010 17:21:01 +0000 (10:21 -0700)]
Fix build (missing #include).
Change-Id: Icafc2289d1320f2cd41e8756363240268780d8b8
Mathias Agopian [Wed, 18 Aug 2010 20:57:11 +0000 (13:57 -0700)]
am
2698f0cd: Revert hwcomposer HAL. DO NOT MERGE.
Merge commit '
2698f0cd99ee0cb8c88d06ea3555edbf7606c07a' into gingerbread-plus-aosp
* commit '
2698f0cd99ee0cb8c88d06ea3555edbf7606c07a':
Revert hwcomposer HAL. DO NOT MERGE.
Mathias Agopian [Wed, 18 Aug 2010 03:28:04 +0000 (20:28 -0700)]
Mathias Agopian [Thu, 12 Aug 2010 22:09:17 +0000 (15:09 -0700)]
am
cdd44a0d: added a new hint to tell SF it should clear the FB for some layers
Merge commit '
cdd44a0db36749af5036e903e4867b279ef420df' into gingerbread-plus-aosp
* commit '
cdd44a0db36749af5036e903e4867b279ef420df':
added a new hint to tell SF it should clear the FB for some layers
Mathias Agopian [Thu, 12 Aug 2010 22:04:58 +0000 (15:04 -0700)]
added a new hint to tell SF it should clear the FB for some layers
Change-Id: I784e7c5be2eab84c321773dc53b4cb657ca9a457
Mathias Agopian [Wed, 11 Aug 2010 23:21:03 +0000 (16:21 -0700)]
am
e6b5c05a: Add a helper for dumping layers into the log
Merge commit '
e6b5c05aa0236dc42107d028a366a3fd2678677b' into gingerbread-plus-aosp
* commit '
e6b5c05aa0236dc42107d028a366a3fd2678677b':
Add a helper for dumping layers into the log
Mathias Agopian [Wed, 11 Aug 2010 23:15:42 +0000 (16:15 -0700)]
Add a helper for dumping layers into the log
Change-Id: I0943d9114c33b4800fb797bac316041dec992f5e
Mathias Agopian [Tue, 10 Aug 2010 20:52:53 +0000 (13:52 -0700)]
am
60d641e5: Merge "first stab at hwcomposer HAL and default implementation." into gingerbread
Merge commit '
60d641e5eb197918d078d9aaeea623c48d8474b7' into gingerbread-plus-aosp
* commit '
60d641e5eb197918d078d9aaeea623c48d8474b7':
first stab at hwcomposer HAL and default implementation.
Mathias Agopian [Tue, 10 Aug 2010 20:52:51 +0000 (13:52 -0700)]
am
a7932f47: fix typo in default overlay hal
Merge commit '
a7932f47f1226e3fe732b5550aaf0b301b09b8df' into gingerbread-plus-aosp
* commit '
a7932f47f1226e3fe732b5550aaf0b301b09b8df':
fix typo in default overlay hal
Mathias Agopian [Tue, 10 Aug 2010 20:50:35 +0000 (13:50 -0700)]
Merge "first stab at hwcomposer HAL and default implementation." into gingerbread
Mathias Agopian [Thu, 5 Aug 2010 22:24:35 +0000 (15:24 -0700)]
first stab at hwcomposer HAL and default implementation.
Change-Id: I7ff47b94a6b34a8f61031bd94e936a088dcea6ab
Mathias Agopian [Sat, 7 Aug 2010 00:50:56 +0000 (17:50 -0700)]
fix typo in default overlay hal
Change-Id: I5313691acee74dfd69639946c01232256b22bc51
Kevin Powell [Tue, 20 Jul 2010 02:12:15 +0000 (19:12 -0700)]
add new sensor types for handling gyro data and device orientation more efficiently.
Change-Id: I453b7a2e84b885ca207d9d938b923e1624554644
Mathias Agopian [Sat, 31 Jul 2010 02:09:07 +0000 (19:09 -0700)]
am
67d82220: temporary hack to allow compilation of adreno driver
Merge commit '
67d822206387e19a080d94a35d0d720d6b2f78b1' into gingerbread-plus-aosp
* commit '
67d822206387e19a080d94a35d0d720d6b2f78b1':
temporary hack to allow compilation of adreno driver
Mathias Agopian [Sat, 31 Jul 2010 00:57:02 +0000 (17:57 -0700)]
temporary hack to allow compilation of adreno driver
Change-Id: Ib3c260df2c22e1c59c5380278ea470e34aedbd81
Mathias Agopian [Fri, 30 Jul 2010 01:18:55 +0000 (18:18 -0700)]
am
1511e20f: improved comments and added a minDelay attribute to sensor_t
Merge commit '
1511e20fbbdfe7bf30b9de73f06fc981eb494f09' into gingerbread-plus-aosp
* commit '
1511e20fbbdfe7bf30b9de73f06fc981eb494f09':
improved comments and added a minDelay attribute to sensor_t
Mathias Agopian [Fri, 30 Jul 2010 01:18:54 +0000 (18:18 -0700)]
am
1832f557: Added definition/documentation for pressure sensors
Merge commit '
1832f55760fff86d00b5d808b3da8f1e55a889e5' into gingerbread-plus-aosp
* commit '
1832f55760fff86d00b5d808b3da8f1e55a889e5':
Added definition/documentation for pressure sensors
Mathias Agopian [Thu, 29 Jul 2010 22:33:22 +0000 (15:33 -0700)]
improved comments and added a minDelay attribute to sensor_t
Change-Id: Ie00fe8260089614e15f1f8035b8392711dff048c
Mathias Agopian [Thu, 29 Jul 2010 22:22:30 +0000 (15:22 -0700)]
Added definition/documentation for pressure sensors
Change-Id: I68b1bb74ebf1aceee09b6e8cbb8e37b906dbdcd0
Mathias Agopian [Mon, 26 Jul 2010 19:24:03 +0000 (12:24 -0700)]
am
478994a7: improve sensor HAL documentation
Merge commit '
478994a758e48b0de7f56f3de0678d5c2b6a4b61' into gingerbread-plus-aosp
* commit '
478994a758e48b0de7f56f3de0678d5c2b6a4b61':
improve sensor HAL documentation
Mathias Agopian [Sat, 24 Jul 2010 00:23:43 +0000 (17:23 -0700)]
improve sensor HAL documentation
Change-Id: If443c1d2e48c697fa8774bd94af4e65866d1dedb
Mathias Agopian [Fri, 23 Jul 2010 00:15:00 +0000 (17:15 -0700)]
am
66a4095c: Be more explicit about the rate at which sensor events must be returned
Merge commit '
66a4095ca0ecfe89b10abe5402617450f57759cd' into gingerbread-plus-aosp
* commit '
66a4095ca0ecfe89b10abe5402617450f57759cd':
Be more explicit about the rate at which sensor events must be returned
Mathias Agopian [Fri, 23 Jul 2010 00:11:50 +0000 (17:11 -0700)]
Be more explicit about the rate at which sensor events must be returned
Change-Id: I937e84c34c539b4e3ff34eddcf4fb24e2866ebfa
Mathias Agopian [Wed, 21 Jul 2010 23:07:53 +0000 (16:07 -0700)]
am
1a2bf61d: fix the nusensor test
Merge commit '
1a2bf61d4990ac9c04aa62b2c08f01e20593624a' into gingerbread-plus-aosp
* commit '
1a2bf61d4990ac9c04aa62b2c08f01e20593624a':
fix the nusensor test
Mathias Agopian [Wed, 21 Jul 2010 23:07:51 +0000 (16:07 -0700)]
am
98c53090: move the old sensorHAL interface into a separate header
Merge commit '
98c5309047d2eedfe93ac42243f9750cfeb3517e' into gingerbread-plus-aosp
* commit '
98c5309047d2eedfe93ac42243f9750cfeb3517e':
move the old sensorHAL interface into a separate header
Mathias Agopian [Wed, 21 Jul 2010 23:07:49 +0000 (16:07 -0700)]
am
cdefccdb: new sensor_event_t structure for the new HAL that can handle bigger payloads
Merge commit '
cdefccdba52337df41f577d9ebfcfd67c05708cf' into gingerbread-plus-aosp
* commit '
cdefccdba52337df41f577d9ebfcfd67c05708cf':
new sensor_event_t structure for the new HAL that can handle bigger payloads
Mathias Agopian [Wed, 21 Jul 2010 23:07:47 +0000 (16:07 -0700)]
am
b1e212e7: New sensor HAL and test
Merge commit '
b1e212e7b6fce2bc5c743b05853129e19760d7a4' into gingerbread-plus-aosp
* commit '
b1e212e7b6fce2bc5c743b05853129e19760d7a4':
New sensor HAL and test
Mathias Agopian [Wed, 21 Jul 2010 01:01:19 +0000 (18:01 -0700)]
fix the nusensor test
it used the sensor handle instead of the sensor type
Change-Id: I8a1bc11826427bde9fb88d6fe88be58e3b8d2397
Mathias Agopian [Mon, 19 Jul 2010 22:32:24 +0000 (15:32 -0700)]
move the old sensorHAL interface into a separate header
sensors_deprecated.h is included from sensors.h, for
easier reading.
Change-Id: I97883e1db73beb6c612da2ec023ee6bb8d4858c3
Mathias Agopian [Fri, 16 Jul 2010 01:29:03 +0000 (18:29 -0700)]
new sensor_event_t structure for the new HAL that can handle bigger payloads
Change-Id: I8f21e457c308eea9cb1f73b49b1fed36627ec55e
Mathias Agopian [Thu, 8 Jul 2010 23:44:54 +0000 (16:44 -0700)]
New sensor HAL and test
Change-Id: I216e3dd0b2b45829fef7c682774d2cdd8271d4e7
Mathias Agopian [Wed, 14 Jul 2010 23:33:47 +0000 (16:33 -0700)]
am
80107f8e: Remove the YV16 format.
Merge commit '
80107f8e92e25e62c945600325f3e846477bc855' into gingerbread-plus-aosp
* commit '
80107f8e92e25e62c945600325f3e846477bc855':
Remove the YV16 format.
Mathias Agopian [Wed, 7 Jul 2010 21:54:14 +0000 (14:54 -0700)]
Remove the YV16 format.
Change-Id: I12f72cf91a66d78499983221925ac68ca646efc8
Mathias Agopian [Fri, 2 Jul 2010 04:29:42 +0000 (21:29 -0700)]
am
1daacdc8: Merge "remove h/w specific YUV formats from the HAL" into gingerbread
Merge commit '
1daacdc8d2d110d3edd077fcd2befa9884924e10' into gingerbread-plus-aosp
* commit '
1daacdc8d2d110d3edd077fcd2befa9884924e10':
remove h/w specific YUV formats from the HAL
Mathias Agopian [Fri, 2 Jul 2010 04:28:06 +0000 (21:28 -0700)]
Merge "remove h/w specific YUV formats from the HAL" into gingerbread
Mathias Agopian [Fri, 2 Jul 2010 03:36:08 +0000 (20:36 -0700)]
remove h/w specific YUV formats from the HAL
we now only support 2 "standard" yuv format in the HAL.
there is a new reserved range 0x100-0x1FF for OEMs.
Change-Id: I171fb0f8d90ded64773ac9c1e5adcab1e1f25c7f
Jamie Gennis [Thu, 1 Jul 2010 23:59:54 +0000 (16:59 -0700)]
am
95d78bef: Add 4 private gralloc usage bits.
Merge commit '
95d78bef32edd183fb8c16b7775bf0a069948420' into gingerbread-plus-aosp
* commit '
95d78bef32edd183fb8c16b7775bf0a069948420':
Add 4 private gralloc usage bits.
Jamie Gennis [Thu, 1 Jul 2010 23:58:05 +0000 (16:58 -0700)]
am
aabb7029: Fix a typo in the GRALLOC_USAGE_HW_2D constant.
Merge commit '
aabb70292351f231bfd4daae8b73edb788eeba1a' into gingerbread-plus-aosp
* commit '
aabb70292351f231bfd4daae8b73edb788eeba1a':
Fix a typo in the GRALLOC_USAGE_HW_2D constant.
Jamie Gennis [Thu, 1 Jul 2010 23:49:52 +0000 (16:49 -0700)]
Add 4 private gralloc usage bits.
The private gralloc usage bits can be used to specify device-specific
allocation requirements.
Change-Id: Idc4fbdd3dd7b71767143cf3df5886dfaf43e50a4
Jamie Gennis [Thu, 1 Jul 2010 23:49:07 +0000 (16:49 -0700)]
Fix a typo in the GRALLOC_USAGE_HW_2D constant.
Change-Id: I3de500455715298765b2e27bc8c59e2ec6c7a34f
Mike Lockwood [Tue, 22 Jun 2010 13:45:00 +0000 (06:45 -0700)]
am
00758793: Merge "GPS: Add callback for creating threads that can call into the Java VM." into gingerbread
Merge commit '
00758793ab2803ddb463260dbbb0479f254a3959' into gingerbread-plus-aosp
* commit '
00758793ab2803ddb463260dbbb0479f254a3959':
GPS: Add callback for creating threads that can call into the Java VM.
Mike Lockwood [Tue, 22 Jun 2010 13:43:50 +0000 (06:43 -0700)]
Merge "GPS: Add callback for creating threads that can call into the Java VM." into gingerbread
Mathias Agopian [Tue, 22 Jun 2010 01:44:14 +0000 (18:44 -0700)]
am
28147965: remove unused YUV formats
Merge commit '
28147965b4f3b57893897924bdd2fc8fdc695f84' into gingerbread-plus-aosp
* commit '
28147965b4f3b57893897924bdd2fc8fdc695f84':
remove unused YUV formats
Mathias Agopian [Tue, 22 Jun 2010 00:46:10 +0000 (17:46 -0700)]
remove unused YUV formats
Change-Id: I328cac1ed8bb2acb105ee118d8a87bdb39a545e6
Mathias Agopian [Mon, 21 Jun 2010 22:12:19 +0000 (15:12 -0700)]
am
373a9c6e: Add some useful YUV formats. Add fourcc version of the definitions.
Merge commit '
373a9c6efebc97ade940dc5996f24992cda450c7' into gingerbread-plus-aosp
* commit '
373a9c6efebc97ade940dc5996f24992cda450c7':
Add some useful YUV formats. Add fourcc version of the definitions.
The Android Open Source Project [Mon, 21 Jun 2010 18:14:15 +0000 (11:14 -0700)]
merge from froyo-plus-aosp
Change-Id: I52f5bbe1b0b7d9cda30d8ae62236e85e3d4e3631
Mike Lockwood [Sun, 20 Jun 2010 21:23:10 +0000 (14:23 -0700)]
GPS: Add callback for creating threads that can call into the Java VM.
To eliminate an unnecessary thread in the framework GPS code, we now
require the GPS HAL to call callbacks from a thread created using the
create_thread_cb. Such threads are able to call directly into Java,
eliminating a polling thread in the GpsLocationProvider code.
Change-Id: I91eeea73b8908f10f10a93ae71034c63f806e8a1
Signed-off-by: Mike Lockwood <lockwood@android.com>
Mathias Agopian [Tue, 15 Jun 2010 04:08:00 +0000 (21:08 -0700)]
Add some useful YUV formats. Add fourcc version of the definitions.
also removed incorrect 4:2:0 interleaved formats
Change-Id: Ib477de86504cc67861def16fc4dfdae0dd3eb59d
The Android Open Source Project [Tue, 15 Jun 2010 18:12:53 +0000 (11:12 -0700)]
ignore from open-source master
Change-Id: Ia7b62aeb66181b7574f0d1b7464d5df43b29fa4d
Chris Pearson [Wed, 2 Jun 2010 22:54:27 +0000 (15:54 -0700)]
Silenced compiler warning seen only in debug builds.
Change-Id: I831ec3a75e6acdfddae95665f6b931b6d731f69e
Signed-off-by: Chris Pearson <christopherx.c.pearson@intel.com>
Mike Lockwood [Wed, 14 Apr 2010 19:36:34 +0000 (15:36 -0400)]
GPS API enhancements:
Add set_capabilities callback to inform the framework of the engine's capabilities.
Add more parameters to set_position_mode
Change-Id: I75572979c031ffc0d915bb9e8aebce09d4982336
Signed-off-by: Mike Lockwood <lockwood@android.com>
Mike Lockwood [Wed, 7 Apr 2010 13:04:25 +0000 (09:04 -0400)]
Add wake lock utility functions for the GPS HAL.
Change-Id: Ia7e20dec1a658f5506004ed29632f6a720c77fab
Signed-off-by: Mike Lockwood <lockwood@android.com>
The Android Open Source Project [Mon, 12 Apr 2010 20:35:17 +0000 (13:35 -0700)]
am
804c3e10: merge from open-source master
Merge commit '
804c3e10774b1b05f958d9b860a814abbd4a6c9b' into kraken
* commit '
804c3e10774b1b05f958d9b860a814abbd4a6c9b':
New GPS HAL Interface
The Android Open Source Project [Mon, 12 Apr 2010 20:31:56 +0000 (13:31 -0700)]
merge from open-source master
Change-Id: Id5e821e29b8d7ad1c1e103c8f219934bb0214eb8
Mike Lockwood [Tue, 23 Feb 2010 23:42:37 +0000 (18:42 -0500)]
New GPS HAL Interface
This change converts the hardware_legacy API to a HAL API.
More cleanup work will likely follow.
Change-Id: I6bd23b94ae458b0de32827c704a481564772ee3b
Mike Lockwood [Tue, 6 Apr 2010 14:16:33 +0000 (07:16 -0700)]
am
da4947ea: New GPS HAL Interface
Merge commit '
da4947ea976b0174bf2938d8a375cb0da485ecf4' into kraken
* commit '
da4947ea976b0174bf2938d8a375cb0da485ecf4':
New GPS HAL Interface
Mike Lockwood [Tue, 23 Feb 2010 23:42:37 +0000 (18:42 -0500)]
New GPS HAL Interface
This change converts the hardware_legacy API to a HAL API.
More cleanup work will likely follow.
Change-Id: I6bd23b94ae458b0de32827c704a481564772ee3b
Mike Lockwood [Tue, 23 Feb 2010 23:42:37 +0000 (18:42 -0500)]
New GPS HAL Interface
This change converts the hardware_legacy API to a HAL API.
More cleanup work will likely follow.
Change-Id: Ia4f9f8a9b12d84c239d367db3ad1dfdc830e0aba
Signed-off-by: Mike Lockwood <lockwood@android.com>
Jean-Baptiste Queru [Tue, 9 Mar 2010 02:04:52 +0000 (18:04 -0800)]
Add an empty CleanSpec.mk
Change-Id: Icc1fdd9c695af86d1fa09c90f7e729391f343d67
Mathias Agopian [Fri, 26 Feb 2010 21:15:18 +0000 (13:15 -0800)]
[
2472946] Sensor.TYPE_ORIENTATION returns inverted roll values
update the documentation is sensors.h to reflect reality.
Mathias Agopian [Thu, 18 Feb 2010 05:27:20 +0000 (21:27 -0800)]
fix typo
Mathias Agopian [Thu, 18 Feb 2010 01:51:06 +0000 (17:51 -0800)]
renumber the YCbCr constants to keep binary compatiblity with previous releases
Mathias Agopian [Wed, 17 Feb 2010 03:43:19 +0000 (19:43 -0800)]
add missing yuv constants
Mathias Agopian [Wed, 17 Feb 2010 01:03:50 +0000 (17:03 -0800)]
don't use undefined constants
Dima Zavin [Wed, 17 Feb 2010 00:30:26 +0000 (16:30 -0800)]
Merge "hal: Add nv12_tiled/nv21 pixel format constants"
Mathias Agopian [Tue, 16 Feb 2010 22:04:00 +0000 (14:04 -0800)]
fix [
2444483] gralloc size for YUV formats
Dima Zavin [Tue, 16 Feb 2010 18:14:47 +0000 (10:14 -0800)]
hal: Add nv12_tiled/nv21 pixel format constants
Change-Id: I6a906cf9fb1539c1876f3737b409ed0598075c8e
Signed-off-by: Dima Zavin <dima@android.com>
The Android Open Source Project [Fri, 5 Feb 2010 22:09:58 +0000 (14:09 -0800)]
am
e879c389: am
be0a1d3b: reconcile main tree with open-source eclair
Merge commit '
e879c389cf9bbbba209a35dc9c9b152489482711'
* commit '
e879c389cf9bbbba209a35dc9c9b152489482711':
android-2.1_r1 snapshot
The Android Open Source Project [Fri, 5 Feb 2010 16:38:43 +0000 (08:38 -0800)]
am
be0a1d3b: reconcile main tree with open-source eclair
Merge commit '
be0a1d3b7677d08b928479cfa4fa16b734183ec9' into eclair-plus-aosp
* commit '
be0a1d3b7677d08b928479cfa4fa16b734183ec9':
android-2.1_r1 snapshot
The Android Open Source Project [Fri, 5 Feb 2010 16:09:38 +0000 (08:09 -0800)]
reconcile main tree with open-source eclair
The Android Open Source Project [Fri, 29 Jan 2010 22:09:18 +0000 (14:09 -0800)]
reconcile android-2.1_r1 snapshot
The Android Open Source Project [Tue, 12 Jan 2010 23:19:04 +0000 (15:19 -0800)]
android-2.1_r1 snapshot
Mathias Agopian [Wed, 16 Dec 2009 01:22:56 +0000 (17:22 -0800)]
remove unused code
Mathias Agopian [Tue, 15 Dec 2009 02:27:09 +0000 (18:27 -0800)]
remove all references to pmem and simplify the lock/unlock hooks
this gralloc module is only used on the emulator or without a h/w
renderer. therefore there is no synchronization to do in lock/unlock
and pmem buffers are not relevant.
hopefully this will remove some of the confusion about how gralloc
should be implemented and make it more obvious that this implementation
is not intended to be used by h/w renderers.
Jean-Baptiste Queru [Sun, 15 Nov 2009 22:55:21 +0000 (14:55 -0800)]
merge from open-source master
Jean-Baptiste Queru [Sun, 15 Nov 2009 22:06:33 +0000 (14:06 -0800)]
merge from open-source master
Merge commit 'goog/stage-korg-master' into HEAD
Jean-Baptiste Queru [Sun, 15 Nov 2009 20:06:40 +0000 (12:06 -0800)]
merge from eclair
Jean-Baptiste Queru [Fri, 13 Nov 2009 02:46:07 +0000 (18:46 -0800)]
eclair snapshot
Mike Lockwood [Tue, 10 Nov 2009 19:59:57 +0000 (11:59 -0800)]
am
baf21439: Add brightnessMode field to light_state_t
Merge commit '
baf21439df7b4e641dfa990f12c287dc53c40f09' into eclair-mr2
* commit '
baf21439df7b4e641dfa990f12c287dc53c40f09':
Add brightnessMode field to light_state_t
Mike Lockwood [Tue, 10 Nov 2009 12:51:33 +0000 (07:51 -0500)]
Add brightnessMode field to light_state_t
This is to allow the framework to inform the lights HAL of the current
lighting mode for the LCD backlight.
Change-Id: I665653c4b9097c4dd92bf0aaa5d83953e134a886
Signed-off-by: Mike Lockwood <lockwood@android.com>
Eric Olsen [Thu, 5 Nov 2009 02:01:27 +0000 (18:01 -0800)]
am
a58556d7: Add support for colored jogball (adds hardware flash mode)
Merge commit '
a58556d7d8919ca193ec894b3f8553357bbbccc4' into eclair-mr2
* commit '
a58556d7d8919ca193ec894b3f8553357bbbccc4':
Add support for colored jogball (adds hardware flash mode)
Eric Olsen [Thu, 5 Nov 2009 01:51:56 +0000 (17:51 -0800)]
Add support for colored jogball (adds hardware flash mode)
Signed-off-by: Eric Olsen <eolsen@android.com>
Mike Lockwood [Tue, 3 Nov 2009 17:37:35 +0000 (09:37 -0800)]
am
c93ee254: Remove obsolete hardware auto-brightness support.
Merge commit '
c93ee2545a43bc7abdbcc57533e7e3114972d8ec' into eclair-mr2
* commit '
c93ee2545a43bc7abdbcc57533e7e3114972d8ec':
Remove obsolete hardware auto-brightness support.
Mike Lockwood [Tue, 3 Nov 2009 17:37:30 +0000 (09:37 -0800)]
am
a2414316: Add documentation for proximity and light sensors.
Merge commit '
a2414316075dde4ca5c1393c662f224b36dd3fdc' into eclair-mr2
* commit '
a2414316075dde4ca5c1393c662f224b36dd3fdc':
Add documentation for proximity and light sensors.
Mike Lockwood [Tue, 3 Nov 2009 16:39:04 +0000 (11:39 -0500)]
Remove obsolete hardware auto-brightness support.
Change-Id: Iab4bf538268c166a16b4b80f0a2c6361d63c2e2d
Signed-off-by: Mike Lockwood <lockwood@android.com>
Mike Lockwood [Tue, 3 Nov 2009 15:29:50 +0000 (10:29 -0500)]
Add documentation for proximity and light sensors.
Change-Id: I5692e803e33aefbfd79c156fec7700d972140dc4
Signed-off-by: Mike Lockwood <lockwood@android.com>
Mathias Agopian [Fri, 30 Oct 2009 21:59:05 +0000 (14:59 -0700)]
am
cd2433f3: fix[
2222341] Soft reset while going back from camcorder settings
Merge commit '
cd2433f3804a537aedc26f595b1c05f95a05244a' into eclair-mr2
* commit '
cd2433f3804a537aedc26f595b1c05f95a05244a':
fix[
2222341] Soft reset while going back from camcorder settings