Dima Zavin
a66162b9eb
am f4325cee
: am 63b62e8c
: am 66ad04bc
: Merge "Remove incompatible ashmem.h"
...
* commit 'f4325ceea48103490aacbf335280e94ea24cdd8f':
Remove incompatible ashmem.h
2013-11-23 12:41:07 -08:00
Dima Zavin
f4325ceea4
am 63b62e8c
: am 66ad04bc
: Merge "Remove incompatible ashmem.h"
...
* commit '63b62e8cd48176abbfddb6bd67c138ae447f6ac7':
Remove incompatible ashmem.h
2013-11-23 12:36:54 -08:00
The Android Open Source Project
508203affe
am 24bff56f
: am fc3cdb93
: Merge commit \'afd0debe4bdf47dc0f968282ca1261842bb65d60\' into HEAD
...
* commit '24bff56ff591607d6515a286bb7908882dcb3bc1':
2013-11-23 12:29:35 -08:00
Dima Zavin
63b62e8cd4
am 66ad04bc
: Merge "Remove incompatible ashmem.h"
...
* commit '66ad04bc039c73763c55c8d3aad282378e05d257':
Remove incompatible ashmem.h
2013-11-22 20:45:07 -08:00
Dima Zavin
66ad04bc03
Merge "Remove incompatible ashmem.h"
2013-11-23 04:41:17 +00:00
The Android Open Source Project
24bff56ff5
am fc3cdb93
: Merge commit \'afd0debe4bdf47dc0f968282ca1261842bb65d60\' into HEAD
...
* commit 'fc3cdb936e6b34257a3bfaf30e89db8f11667cc5':
2013-11-22 17:41:41 -08:00
The Android Open Source Project
fc3cdb936e
Merge commit 'afd0debe4bdf47dc0f968282ca1261842bb65d60' into HEAD
...
Change-Id: Ic9aed2c57bdfeb250ce2dd7f0e9289ba5b6e936a
2013-11-22 11:20:20 -08:00
Elliott Hughes
ee47adfb1b
am 0d103b59
: am f2f74ca6
: Merge "Remove references to obsolete pmem functionality."
...
* commit '0d103b596dd9883898a062beaacf980d4439b835':
Remove references to obsolete pmem functionality.
2013-11-21 23:00:19 -08:00
Elliott Hughes
0d103b596d
am f2f74ca6
: Merge "Remove references to obsolete pmem functionality."
...
* commit 'f2f74ca65f34ae0cae6f0cca40f1c18aa771739d':
Remove references to obsolete pmem functionality.
2013-11-21 18:43:51 -08:00
Igor Murashkin
7ea777f097
gui: Add tests for IGraphicBufferProducer
...
* Basic tests only. Needs more complicated queue/dequeue tests.
* Also needs consumer-side tests to really be thorough.
Change-Id: I1099dd56d65b6e9dfa15377726d6054ce657c0ca
2013-11-21 14:06:13 -08:00
Elliott Hughes
f2f74ca65f
Merge "Remove references to obsolete pmem functionality."
2013-11-21 20:42:33 +00:00
Elliott Hughes
a5a13a3ecf
Remove references to obsolete pmem functionality.
...
Change-Id: I5d3befd075e51614e6801115388a0a9f32fbb6ea
2013-11-21 12:22:39 -08:00
Igor Murashkin
4be18a3566
gui: Remove BufferQueue::MIN_UNDEQUEUED_BUFFERS
...
Change-Id: I7c0cc36046dbbdb9c0e85acfe5027293d1131275
2013-11-18 12:36:15 -08:00
Igor Murashkin
7d2d160cdc
gui: Update header docs for IGraphicBufferConsumer/Producer/BufferQueue
...
Also fix compiler warnings for libgui
Change-Id: I0ee38d9ad5eaa82d55bf812d291da8c433581cef
2013-11-13 17:34:03 -08:00
Jesse Hall
324c69b542
am 1ee45c2d
: am 14e8b01a
: Don\'t change the framebuffer target until we render a new one
...
* commit '1ee45c2d2d816ee912624d81ff1b0aaa98e8fa74':
Don't change the framebuffer target until we render a new one
2013-11-08 13:01:20 -08:00
Jesse Hall
1ee45c2d2d
am 14e8b01a
: Don\'t change the framebuffer target until we render a new one
...
* commit '14e8b01a761180250671f3d6494532d8bd04fa8e':
Don't change the framebuffer target until we render a new one
2013-11-08 12:58:20 -08:00
Jesse Hall
14e8b01a76
Don't change the framebuffer target until we render a new one
...
Continuing to send the last-rendered framebuffer to HWC on subsequent
frames allows the HWC to read partially-composed regions that haven't
changed, instead of re-composing from scratch.
Bug: 11573910
Change-Id: I8829877d2a06001f1e1b3f168cbba71c7b217b2d
2013-11-07 12:37:13 -08:00
Jesse Hall
ad78055746
am 2d32aa59
: am 356c2386
: Merge "Provide virtual display output buffer to HWC in prepare" into klp-dev
...
* commit '2d32aa5918de1c12c54a32e8eb28bbc96d430796':
Provide virtual display output buffer to HWC in prepare
2013-11-06 21:12:40 -08:00
Jesse Hall
2d32aa5918
am 356c2386
: Merge "Provide virtual display output buffer to HWC in prepare" into klp-dev
...
* commit '356c23865d588659f1eea55bbe7e2b16b9cff08e':
Provide virtual display output buffer to HWC in prepare
2013-11-06 20:48:51 -08:00
Jesse Hall
356c23865d
Merge "Provide virtual display output buffer to HWC in prepare" into klp-dev
2013-11-07 04:43:20 +00:00
Changwan Ryu
bcd66ecb41
Merge "Extend OpenMAX IL definitions to support AC3"
2013-11-06 18:22:41 +00:00
Jesse Hall
45c9c0477d
am f111ee13
: am 49318631
: Merge "Don\'t use implementation-defined format with CPU consumers" into klp-dev
...
* commit 'f111ee13a6f5d8606c5dc7a5cc07cedf929e69a8':
Don't use implementation-defined format with CPU consumers
2013-11-06 08:52:02 -08:00
Jesse Hall
f111ee13a6
am 49318631
: Merge "Don\'t use implementation-defined format with CPU consumers" into klp-dev
...
* commit '493186312a9a8c0215da0d6d3a9b0369491c0796':
Don't use implementation-defined format with CPU consumers
2013-11-06 07:38:36 -08:00
Jesse Hall
493186312a
Merge "Don't use implementation-defined format with CPU consumers" into klp-dev
2013-11-06 15:35:09 +00:00
Jesse Hall
f7a675837b
Provide virtual display output buffer to HWC in prepare
...
We were already making sure the HWComposer class had the handle before
prepare, but it wasn't passing the handle along to HWC as intended.
Partial fix for bug: 11430248
Change-Id: I25f672c4fdfaa6a81fe0acb24d9ad05153ee17dc
2013-11-05 16:27:14 -08:00
Changwan Ryu
c9a8a34e40
Extend OpenMAX IL definitions to support AC3
...
OpenMAX IL does not have generic support for AC3, but IL 1.1.2 and above
supports component extension APIs, which enable us to add our own constants
and definitions.
Change-Id: Iecee4f8bb3112b0720ceae9192017e12d3fe97e3
2013-11-06 09:26:33 +09:00
Jamie Gennis
1a8e6bf966
am 39c5ea2c
: am ee874caa
: Merge "DispSync: remove delay when enabling vsync events" into klp-dev
...
* commit '39c5ea2caaddd7ea44eaeed38d3760fbc421ad56':
DispSync: remove delay when enabling vsync events
2013-11-05 12:02:26 -08:00
Jamie Gennis
39c5ea2caa
am ee874caa
: Merge "DispSync: remove delay when enabling vsync events" into klp-dev
...
* commit 'ee874caa81ad48d6d0ee34509d3050ca9c046676':
DispSync: remove delay when enabling vsync events
2013-11-04 21:55:09 -08:00
Jesse Hall
497ba0e085
Don't use implementation-defined format with CPU consumers
...
If the virtual display surface is being consumed by the CPU, it can't
be allowed with HAL_PIXEL_FORMAT_IMPLEMENTATION_DEFINED since there is
no way for the CPU consumer to find out what format gralloc chose. So
for CPU-consumer surfaces, just use the BufferQueue's default format,
which can be set by the consumer.
A better but more invasive change would be to let the consumer require
a certain format (or set of formats?), and disallow the producer from
requesting a different format.
Bug: 11479817
Change-Id: I5b20ee6ac1146550e8799b806e14661d279670c0
2013-11-04 16:43:03 -08:00
Jamie Gennis
ee874caa81
Merge "DispSync: remove delay when enabling vsync events" into klp-dev
2013-11-04 22:47:31 +00:00
Jamie Gennis
41c3c496ff
DispSync: remove delay when enabling vsync events
...
This change fixes a bug that caused an extra frame of latency when enabling
vsync event callbacks in DispSync. The bug was related to the logic that
prevents the two events from firing with very little time between them due to
updates to the vsync model.
Bug: 11479720
Change-Id: Ie7eaff9e92ffb7b7b6cb4d3d4402c96cbd29af7e
2013-11-01 13:58:56 -07:00
Jesse Hall
7d2ce753a2
am 18f94b1e
: resolved conflicts for merge of 51b27e82
to klp-dev-plus-aosp
...
* commit '18f94b1e6c489f0d68c694a197aae898c68124bb':
fix corruption in Vector<> when malloc falied
2013-10-30 23:23:45 -07:00
Jesse Hall
18f94b1e6c
resolved conflicts for merge of 51b27e82
to klp-dev-plus-aosp
...
File was moved to system/core.git. Change will be applied there.
Change-Id: Ic2027b7f3f1f1fb4b896a219a8c1b4ab545d9723
2013-10-30 23:21:24 -07:00
Jesse Hall
51b27e8233
Merge "fix corruption in Vector<> when malloc falied"
2013-10-31 04:02:24 +00:00
Igor Murashkin
8252bf752a
am bb3b5249
: am 40da5283
: Merge "EGL: rename CallStack::dump into CallStack::log" into klp-dev
...
* commit 'bb3b52495909ee1ce5d8b9beb6e8a9c72f0cdd90':
EGL: rename CallStack::dump into CallStack::log
2013-10-30 14:18:46 -07:00
Igor Murashkin
bb3b524959
am 40da5283
: Merge "EGL: rename CallStack::dump into CallStack::log" into klp-dev
...
* commit '40da5283ebc6b5cf1e3820740dc274c47cc55f6d':
EGL: rename CallStack::dump into CallStack::log
2013-10-30 14:16:19 -07:00
Igor Murashkin
40da5283eb
Merge "EGL: rename CallStack::dump into CallStack::log" into klp-dev
2013-10-30 21:09:40 +00:00
Elliott Hughes
26609e2c30
Re-apply androidfw fixes lost by the directory rearrangement.
...
Assignment to wrong variable in libs/androidfw/AssetManager.cpp.
https://code.google.com/p/android/issues/detail?id=61560
Missing delete[]s in libs/androidfw/ObbFile.cpp.
https://code.google.com/p/android/issues/detail?id=61549
Change-Id: I24e6867284d70a7793d78e62d1a836cbee310fb0
2013-10-29 15:28:08 -07:00
Aravind Akella
3d0c7797ac
am 245c4339
: am 46417b84
: Merge "Bug fixes for SensorService" into klp-dev
...
* commit '245c43395b9bb6502e0a4bcde4c60ad9541e5ce2':
Bug fixes for SensorService
2013-10-25 18:12:58 -07:00
Aravind Akella
245c43395b
am 46417b84
: Merge "Bug fixes for SensorService" into klp-dev
...
* commit '46417b845a257d6725adf048a3cfad6306218e9b':
Bug fixes for SensorService
2013-10-25 18:10:55 -07:00
Igor Murashkin
1f8363329c
EGL: rename CallStack::dump into CallStack::log
...
Bug: 11324229
Change-Id: Ibac1be182c336e7aa5ac098f08d18b3c188964b4
2013-10-25 17:13:57 -07:00
Aravind Akella
46417b845a
Merge "Bug fixes for SensorService" into klp-dev
2013-10-25 23:16:59 +00:00
Marco Nelissen
4ccd329ad1
am fddab476
: am 708cc794
: Native counterpart of new power manager method
...
* commit 'fddab476170de87d4d4fcd2afc34376c01f68b76':
Native counterpart of new power manager method
2013-10-25 15:04:53 -07:00
Marco Nelissen
fddab47617
am 708cc794
: Native counterpart of new power manager method
...
* commit '708cc794f6ccd4d31e0a00a23b289272c665adc1':
Native counterpart of new power manager method
2013-10-25 15:01:29 -07:00
Aravind Akella
b4099e77ec
Bug fixes for SensorService
...
i) Emulate Flush for AOSP Fusion Sesnsors on newer HALs that support batching.
ii) Early return if there are no events for the current SensorEventConnection.
Bug: 11325707, 11376538
Change-Id: Idb856302463649a99d3d5d0c965bb06ba06b8e1d
2013-10-25 13:58:58 -07:00
Marco Nelissen
708cc794f6
Native counterpart of new power manager method
...
Cherrypicked from master.
b/9464621
Change-Id: I54c0ed50a57ac870da91db8589a73a2c792dbd8d
2013-10-25 12:50:04 -07:00
Jesse Hall
45cb6ec715
am 96002be4
: am c354effe
: Fix handling of undefined TARGET_FORCE_HWC_FOR_VIRTUAL_DISPLAYS
...
* commit '96002be4bd4b8bbfecba2cc45bdf0b47f06464bc':
Fix handling of undefined TARGET_FORCE_HWC_FOR_VIRTUAL_DISPLAYS
2013-10-25 10:55:24 -07:00
Jesse Hall
96002be4bd
am c354effe
: Fix handling of undefined TARGET_FORCE_HWC_FOR_VIRTUAL_DISPLAYS
...
* commit 'c354effe97be26638618e3bc0da81a3f8b384b20':
Fix handling of undefined TARGET_FORCE_HWC_FOR_VIRTUAL_DISPLAYS
2013-10-25 10:52:37 -07:00
Jesse Hall
c354effe97
Fix handling of undefined TARGET_FORCE_HWC_FOR_VIRTUAL_DISPLAYS
...
related to b/8316155 - Implement HWComposer 1.3 w/ virtual display support
Change-Id: I2dc8d65a74174aa833cc491264f97f1f2df49307
2013-10-25 17:48:09 +00:00
Jesse Hall
6fdaaf5c7c
am a54a8b63
: am 93fcb823
: Merge "Add a boardconfig to force HWC composition of virtual displays" into klp-dev
...
* commit 'a54a8b63d191d2c1c4669f89b32c4b8a9c04cd31':
Add a boardconfig to force HWC composition of virtual displays
2013-10-23 15:20:43 -07:00