Commit graph

416 commits

Author SHA1 Message Date
The Android Open Source Project
c212d9d76f am e879c389: am be0a1d3b: reconcile main tree with open-source eclair
Merge commit 'e879c389cf9bbbba209a35dc9c9b152489482711'

* commit 'e879c389cf9bbbba209a35dc9c9b152489482711':
  android-2.1_r1 snapshot
2010-02-05 14:09:58 -08:00
The Android Open Source Project
e879c389cf am be0a1d3b: reconcile main tree with open-source eclair
Merge commit 'be0a1d3b7677d08b928479cfa4fa16b734183ec9' into eclair-plus-aosp

* commit 'be0a1d3b7677d08b928479cfa4fa16b734183ec9':
  android-2.1_r1 snapshot
2010-02-05 08:38:43 -08:00
The Android Open Source Project
be0a1d3b76 reconcile main tree with open-source eclair 2010-02-05 08:09:38 -08:00
The Android Open Source Project
d910467a28 reconcile android-2.1_r1 snapshot 2010-01-29 14:09:18 -08:00
The Android Open Source Project
a6612f8442 android-2.1_r1 snapshot 2010-01-12 15:19:04 -08:00
Mathias Agopian
ee4e57e949 remove unused code 2009-12-15 17:22:56 -08:00
Mathias Agopian
f96b2064d7 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.
2009-12-15 15:00:57 -08:00
Jean-Baptiste Queru
058c1fce99 merge from open-source master 2009-11-15 14:55:21 -08:00
Jean-Baptiste Queru
e6d60500e7 merge from open-source master
Merge commit 'goog/stage-korg-master' into HEAD
2009-11-15 14:06:33 -08:00
Jean-Baptiste Queru
410c0077b0 merge from eclair 2009-11-15 12:06:40 -08:00
Jean-Baptiste Queru
1202e079cf eclair snapshot 2009-11-12 18:46:07 -08:00
Mike Lockwood
ecc3bfa617 am baf21439: Add brightnessMode field to light_state_t
Merge commit 'baf21439df7b4e641dfa990f12c287dc53c40f09' into eclair-mr2

* commit 'baf21439df7b4e641dfa990f12c287dc53c40f09':
  Add brightnessMode field to light_state_t
2009-11-10 11:59:57 -08:00
Mike Lockwood
baf21439df 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>
2009-11-10 07:51:33 -05:00
Eric Olsen
97bba48017 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)
2009-11-04 18:01:27 -08:00
Eric Olsen
a58556d7d8 Add support for colored jogball (adds hardware flash mode)
Signed-off-by: Eric Olsen <eolsen@android.com>
2009-11-04 17:51:56 -08:00
Mike Lockwood
cbda89c50b am c93ee254: Remove obsolete hardware auto-brightness support.
Merge commit 'c93ee2545a43bc7abdbcc57533e7e3114972d8ec' into eclair-mr2

* commit 'c93ee2545a43bc7abdbcc57533e7e3114972d8ec':
  Remove obsolete hardware auto-brightness support.
2009-11-03 09:37:35 -08:00
Mike Lockwood
fb9c9a63f3 am a2414316: Add documentation for proximity and light sensors.
Merge commit 'a2414316075dde4ca5c1393c662f224b36dd3fdc' into eclair-mr2

* commit 'a2414316075dde4ca5c1393c662f224b36dd3fdc':
  Add documentation for proximity and light sensors.
2009-11-03 09:37:30 -08:00
Mike Lockwood
c93ee2545a Remove obsolete hardware auto-brightness support.
Change-Id: Iab4bf538268c166a16b4b80f0a2c6361d63c2e2d
Signed-off-by: Mike Lockwood <lockwood@android.com>
2009-11-03 11:39:04 -05:00
Mike Lockwood
a241431607 Add documentation for proximity and light sensors.
Change-Id: I5692e803e33aefbfd79c156fec7700d972140dc4
Signed-off-by: Mike Lockwood <lockwood@android.com>
2009-11-03 10:29:50 -05:00
Mathias Agopian
5a5d4ad61b 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
2009-10-30 14:59:05 -07:00
Mathias Agopian
cd2433f380 fix[2222341] Soft reset while going back from camcorder settings
add a way to convert a mapped "pushbuffer" buffer to a gralloc handle
which then can be safely used by surfaceflinger
2009-10-30 14:38:22 -07:00
Patrick Scott
baf99300f7 Remove call to dump_l.
This fail to compile without NDEBUG and the following log statement does
something similar.
2009-10-29 08:33:42 -04:00
Mike Lockwood
4016d6bc35 Add comment warning to not use hardware based autobrightness support.
This is deprecated and will be removed in the next release.

Change-Id: I5a5e93b99ae722dfcd0e9cf6415c8af6a71e6eab
Signed-off-by: Mike Lockwood <lockwood@android.com>
2009-10-25 11:55:00 -04:00
David 'Digit' Turner
2b811adcbc Fix a bug that prevents default hw modules to be loaded properly.
The problem was a simple typo, which prevented modules like
/system/lib/hw/lib<module>.default.so from being loaded even if they
were found on the system.

This is required to fix the generic build when run in the emulator.
2009-09-25 02:31:47 -07:00
Mathias Agopian
cab816fb6d fix a bug I introduced recently where the "default" HAL module would not be loaded. 2009-09-24 15:11:04 -07:00
Mathias Agopian
3f03e98dbf don't loas inapropriate HAL for a device.
Once we have determined which HAL to load and checked that the library exists,
we should not try to load another (more generic) HAL if a failure occurs, because
this could result in different process using different HALs for the same component.
Instead we just return an error.
2009-09-21 22:50:44 -07:00
Mathias Agopian
8255d9d3b6 Android side of the fix for [2121211] Sholes has stutter during animations
a new method, compostionComplete() is added to the framebuffer hal, it is used by surfaceflinger to signal the driver that the composition is complete, BEFORE it releases its client. This gives a chance to the driver to perfrom the proper synchronization.
2009-09-17 16:15:36 -07:00
Snigdha Sinha
adc7f1ba08 OVERLAY_FORMAT_DEFAULT for overlay
Originally from: https://partner.source.android.com/g/#change,922
2009-09-08 22:39:56 -07:00
Mike Lockwood
2bedac69dc sensors: whitespace clean up
Change-Id: I49da2d17dae2f9f958a0ccb205c41a83c123802c
Signed-off-by: Mike Lockwood <lockwood@android.com>
2009-09-04 12:09:05 -04:00
Mike Lockwood
fbbb347f17 sensors: Add optional close_data_source call
Change-Id: I591afea509ee055211a4beeaa83b12692e251f67
Signed-off-by: Mike Lockwood <lockwood@android.com>
2009-08-29 11:55:27 -04:00
Iliyan Malchev
61fee89f2d libhardware: add a field for reporting light levels
Signed-off-by: Iliyan Malchev <malchev@google.com>
2009-08-20 16:47:17 -07:00
Android (Google) Code Review
2a8477c899 Merge changes 21851,21852 into eclair
* changes:
  split gralloc_priv.h and make sure it is C friendly
  integrate this change from the generic gralloc
2009-08-19 13:18:38 -07:00
Mathias Agopian
9d82c1a447 add typedefs to gralloc and hardware.h so it's more C friendly 2009-08-19 11:20:55 -07:00
Mathias Agopian
fc05413281 split gralloc_priv.h and make sure it is C friendly 2009-08-18 17:35:44 -07:00
Mathias Agopian
876b4e8b84 integrate this change from the generic gralloc 2009-08-18 17:24:52 -07:00
Mathias Agopian
ed04f7871b don't memset ashmem region, especially before they're mmapped 2009-08-08 17:01:18 -07:00
Mathias Agopian
7d512e3dc3 add support for RGBX_8888 2009-08-07 20:55:37 -07:00
Mathias Agopian
e83629abb9 make sure to clear surface's buffers when they are allocated 2009-08-07 18:13:47 -07:00
Benny Wong
75cdfbb45d Added resizeInput and setAttributes function declarations to overlay hal 2009-07-29 17:48:04 -07:00
Dan Murphy
e00013c495 lights: Header file updates for ALS support codes
These changes adds ALS support to the lighting system

Signed-off-by: Dan Murphy <D.Murphy@motorola.com>
Signed-off-by: Mike Lockwood <lockwood@android.com>
2009-07-28 08:48:37 -07:00
Jean-Baptiste Queru
24a9a66dba reconcile korg/master into goog/master 2009-07-26 11:43:55 -07:00
Jean-Baptiste Queru
f0a3c389eb Merge korg/donut into korg/master 2009-07-25 17:48:02 -07:00
Android (Google) Code Review
93614c25ae Merge change 7784
* changes:
  Remove redundant defines, these were only necessary while changes were being staged to another repo
2009-07-20 11:34:39 -07:00
Android (Google) Code Review
9e44c4f198 Merge change 5893
* changes:
  Color Format and Overlay Functions
2009-07-17 23:37:19 -07:00
Rebecca Schultz Zavin
dbb872157b Remove redundant defines, these were only necessary while changes were
being staged to another repo

Signed-off-by: Rebecca Schultz Zavin <rebecca@android.com>
2009-07-17 16:28:02 -07:00
Benny Wong
49b02f75eb Color Format and Overlay Functions
Add hardware overlay related function declarations and more color format enums
2009-07-17 16:26:25 -07:00
Marco Nelissen
15c9d3af0d Fix the simulator build. 2009-07-17 11:15:18 -07:00
Mathias Agopian
3e1f89bcca fix [1980202] Surfaceflinger crash with transparent rollo on firestone
we now automatically size the pmem region isntead of using hardcoded values
2009-07-16 18:06:19 -07:00
Mathias Agopian
6d125da5d2 generic gralloc HAL doesn't need to support partial updates using msm7k specific ioctl. 2009-07-15 15:12:13 -07:00
Mathias Agopian
05eacf533e better logs 2009-07-13 18:32:37 -07:00