OSDN Git Service

android-x86/frameworks-native.git
10 years agoam 46cfde3b: am 708602cc: Merge "DispSync: remove delay when enabling vsync events"
Jesse Hall [Tue, 3 Dec 2013 05:31:57 +0000 (05:31 +0000)]
am 46cfde3b: am 708602cc: Merge "DispSync: remove delay when enabling vsync events"

* commit '46cfde3b65493d3b4ed0038ee7d6f7b66c2c2362':
  DispSync: remove delay when enabling vsync events

10 years agoam 708602cc: Merge "DispSync: remove delay when enabling vsync events"
Jesse Hall [Tue, 3 Dec 2013 05:19:56 +0000 (21:19 -0800)]
am 708602cc: Merge "DispSync: remove delay when enabling vsync events"

* commit '708602ccaad0f6e896c4bd4457503614b9ee81d0':
  DispSync: remove delay when enabling vsync events

10 years agoMerge "DispSync: remove delay when enabling vsync events"
Jesse Hall [Tue, 3 Dec 2013 05:12:31 +0000 (05:12 +0000)]
Merge "DispSync: remove delay when enabling vsync events"

10 years agoDispSync: remove delay when enabling vsync events
Jamie Gennis [Tue, 29 Oct 2013 20:36:12 +0000 (13:36 -0700)]
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

10 years agoam 651dc744: am bef08b8d: Merge "Handle policy reloads within installd rather than...
Nick Kralevich [Mon, 2 Dec 2013 23:31:01 +0000 (23:31 +0000)]
am 651dc744: am bef08b8d: Merge "Handle policy reloads within installd rather than restarting it."

* commit '651dc7440b10c8a4090bd5469a2e90d3bfe8356e':
  Handle policy reloads within installd rather than restarting it.

10 years agoam bef08b8d: Merge "Handle policy reloads within installd rather than restarting...
Nick Kralevich [Wed, 27 Nov 2013 21:16:46 +0000 (13:16 -0800)]
am bef08b8d: Merge "Handle policy reloads within installd rather than restarting it."

* commit 'bef08b8d1b30976ff273fc9041bc8d934f52fea9':
  Handle policy reloads within installd rather than restarting it.

10 years agoMerge "Handle policy reloads within installd rather than restarting it."
Nick Kralevich [Wed, 27 Nov 2013 21:09:12 +0000 (21:09 +0000)]
Merge "Handle policy reloads within installd rather than restarting it."

10 years agolibgui: Fix a couple of minor bugs, extract GLTest
Dan Stoza [Tue, 26 Nov 2013 23:10:10 +0000 (15:10 -0800)]
libgui: Fix a couple of minor bugs, extract GLTest

Fix a couple of minor bugs in existing tests, and extract the GLTest class into
its own files.

Change-Id: I7d9570a0d3dbc9c5d7f9b13f2017607af42744b3

10 years agoam f4325cee: am 63b62e8c: am 66ad04bc: Merge "Remove incompatible ashmem.h"
Dima Zavin [Sat, 23 Nov 2013 20:41:07 +0000 (12:41 -0800)]
am f4325cee: am 63b62e8c: am 66ad04bc: Merge "Remove incompatible ashmem.h"

* commit 'f4325ceea48103490aacbf335280e94ea24cdd8f':
  Remove incompatible ashmem.h

10 years agoam 63b62e8c: am 66ad04bc: Merge "Remove incompatible ashmem.h"
Dima Zavin [Sat, 23 Nov 2013 20:36:54 +0000 (12:36 -0800)]
am 63b62e8c: am 66ad04bc: Merge "Remove incompatible ashmem.h"

* commit '63b62e8cd48176abbfddb6bd67c138ae447f6ac7':
  Remove incompatible ashmem.h

10 years agoam 24bff56f: am fc3cdb93: Merge commit \'afd0debe4bdf47dc0f968282ca1261842bb65d60...
The Android Open Source Project [Sat, 23 Nov 2013 20:29:35 +0000 (12:29 -0800)]
am 24bff56f: am fc3cdb93: Merge commit \'afd0debe4bdf47dc0f968282ca1261842bb65d60\' into HEAD

* commit '24bff56ff591607d6515a286bb7908882dcb3bc1':

10 years agoam 66ad04bc: Merge "Remove incompatible ashmem.h"
Dima Zavin [Sat, 23 Nov 2013 04:45:07 +0000 (20:45 -0800)]
am 66ad04bc: Merge "Remove incompatible ashmem.h"

* commit '66ad04bc039c73763c55c8d3aad282378e05d257':
  Remove incompatible ashmem.h

10 years agoMerge "Remove incompatible ashmem.h"
Dima Zavin [Sat, 23 Nov 2013 04:41:17 +0000 (04:41 +0000)]
Merge "Remove incompatible ashmem.h"

10 years agoam fc3cdb93: Merge commit \'afd0debe4bdf47dc0f968282ca1261842bb65d60\' into HEAD
The Android Open Source Project [Sat, 23 Nov 2013 01:41:41 +0000 (17:41 -0800)]
am fc3cdb93: Merge commit \'afd0debe4bdf47dc0f968282ca1261842bb65d60\' into HEAD

* commit 'fc3cdb936e6b34257a3bfaf30e89db8f11667cc5':

10 years agoMerge commit 'afd0debe4bdf47dc0f968282ca1261842bb65d60' into HEAD
The Android Open Source Project [Fri, 22 Nov 2013 19:20:20 +0000 (11:20 -0800)]
Merge commit 'afd0debe4bdf47dc0f968282ca1261842bb65d60' into HEAD

Change-Id: Ic9aed2c57bdfeb250ce2dd7f0e9289ba5b6e936a

10 years agoam 0d103b59: am f2f74ca6: Merge "Remove references to obsolete pmem functionality."
Elliott Hughes [Fri, 22 Nov 2013 07:00:19 +0000 (23:00 -0800)]
am 0d103b59: am f2f74ca6: Merge "Remove references to obsolete pmem functionality."

* commit '0d103b596dd9883898a062beaacf980d4439b835':
  Remove references to obsolete pmem functionality.

10 years agoam f2f74ca6: Merge "Remove references to obsolete pmem functionality."
Elliott Hughes [Fri, 22 Nov 2013 02:43:51 +0000 (18:43 -0800)]
am f2f74ca6: Merge "Remove references to obsolete pmem functionality."

* commit 'f2f74ca65f34ae0cae6f0cca40f1c18aa771739d':
  Remove references to obsolete pmem functionality.

10 years agogui: Add tests for IGraphicBufferProducer
Igor Murashkin [Tue, 19 Nov 2013 00:58:36 +0000 (16:58 -0800)]
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

10 years agoMerge "Remove references to obsolete pmem functionality."
Elliott Hughes [Thu, 21 Nov 2013 20:42:32 +0000 (20:42 +0000)]
Merge "Remove references to obsolete pmem functionality."

10 years agoRemove references to obsolete pmem functionality.
Elliott Hughes [Thu, 21 Nov 2013 20:22:39 +0000 (12:22 -0800)]
Remove references to obsolete pmem functionality.

Change-Id: I5d3befd075e51614e6801115388a0a9f32fbb6ea

10 years agogui: Remove BufferQueue::MIN_UNDEQUEUED_BUFFERS
Igor Murashkin [Mon, 18 Nov 2013 20:26:56 +0000 (12:26 -0800)]
gui: Remove BufferQueue::MIN_UNDEQUEUED_BUFFERS

Change-Id: I7c0cc36046dbbdb9c0e85acfe5027293d1131275

10 years agogui: Update header docs for IGraphicBufferConsumer/Producer/BufferQueue
Igor Murashkin [Wed, 13 Nov 2013 02:02:20 +0000 (18:02 -0800)]
gui: Update header docs for IGraphicBufferConsumer/Producer/BufferQueue

Also fix compiler warnings for libgui

Change-Id: I0ee38d9ad5eaa82d55bf812d291da8c433581cef

10 years agoam 1ee45c2d: am 14e8b01a: Don\'t change the framebuffer target until we render a...
Jesse Hall [Fri, 8 Nov 2013 21:01:20 +0000 (13:01 -0800)]
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

10 years agoam 14e8b01a: Don\'t change the framebuffer target until we render a new one
Jesse Hall [Fri, 8 Nov 2013 20:58:20 +0000 (12:58 -0800)]
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

10 years agoDon't change the framebuffer target until we render a new one
Jesse Hall [Thu, 7 Nov 2013 20:28:26 +0000 (12:28 -0800)]
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

10 years agoam 2d32aa59: am 356c2386: Merge "Provide virtual display output buffer to HWC in...
Jesse Hall [Thu, 7 Nov 2013 05:12:40 +0000 (21:12 -0800)]
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

10 years agoam 356c2386: Merge "Provide virtual display output buffer to HWC in prepare" into...
Jesse Hall [Thu, 7 Nov 2013 04:48:51 +0000 (20:48 -0800)]
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

10 years agoMerge "Provide virtual display output buffer to HWC in prepare" into klp-dev
Jesse Hall [Thu, 7 Nov 2013 04:43:19 +0000 (04:43 +0000)]
Merge "Provide virtual display output buffer to HWC in prepare" into klp-dev

10 years agoMerge "Extend OpenMAX IL definitions to support AC3"
Changwan Ryu [Wed, 6 Nov 2013 18:22:41 +0000 (18:22 +0000)]
Merge "Extend OpenMAX IL definitions to support AC3"

10 years agoam f111ee13: am 49318631: Merge "Don\'t use implementation-defined format with CPU...
Jesse Hall [Wed, 6 Nov 2013 16:52:02 +0000 (08:52 -0800)]
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

10 years agoam 49318631: Merge "Don\'t use implementation-defined format with CPU consumers"...
Jesse Hall [Wed, 6 Nov 2013 15:38:36 +0000 (07:38 -0800)]
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

10 years agoMerge "Don't use implementation-defined format with CPU consumers" into klp-dev
Jesse Hall [Wed, 6 Nov 2013 15:35:08 +0000 (15:35 +0000)]
Merge "Don't use implementation-defined format with CPU consumers" into klp-dev

10 years agoProvide virtual display output buffer to HWC in prepare
Jesse Hall [Wed, 6 Nov 2013 00:12:31 +0000 (16:12 -0800)]
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

10 years agoExtend OpenMAX IL definitions to support AC3
Changwan Ryu [Mon, 28 Oct 2013 02:32:47 +0000 (11:32 +0900)]
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

10 years agoam 39c5ea2c: am ee874caa: Merge "DispSync: remove delay when enabling vsync events...
Jamie Gennis [Tue, 5 Nov 2013 20:02:26 +0000 (12:02 -0800)]
am 39c5ea2c: am ee874caa: Merge "DispSync: remove delay when enabling vsync events" into klp-dev

* commit '39c5ea2caaddd7ea44eaeed38d3760fbc421ad56':
  DispSync: remove delay when enabling vsync events

10 years agoam ee874caa: Merge "DispSync: remove delay when enabling vsync events" into klp-dev
Jamie Gennis [Tue, 5 Nov 2013 05:55:09 +0000 (21:55 -0800)]
am ee874caa: Merge "DispSync: remove delay when enabling vsync events" into klp-dev

* commit 'ee874caa81ad48d6d0ee34509d3050ca9c046676':
  DispSync: remove delay when enabling vsync events

10 years agoDon't use implementation-defined format with CPU consumers
Jesse Hall [Tue, 5 Nov 2013 00:43:03 +0000 (16:43 -0800)]
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

10 years agoMerge "DispSync: remove delay when enabling vsync events" into klp-dev
Jamie Gennis [Mon, 4 Nov 2013 22:47:31 +0000 (22:47 +0000)]
Merge "DispSync: remove delay when enabling vsync events" into klp-dev

10 years agoDispSync: remove delay when enabling vsync events
Jamie Gennis [Tue, 29 Oct 2013 20:36:12 +0000 (13:36 -0700)]
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

10 years agoam 18f94b1e: resolved conflicts for merge of 51b27e82 to klp-dev-plus-aosp
Jesse Hall [Thu, 31 Oct 2013 06:23:45 +0000 (23:23 -0700)]
am 18f94b1e: resolved conflicts for merge of 51b27e82 to klp-dev-plus-aosp

* commit '18f94b1e6c489f0d68c694a197aae898c68124bb':
  fix corruption in Vector<> when malloc falied

10 years agoresolved conflicts for merge of 51b27e82 to klp-dev-plus-aosp
Jesse Hall [Thu, 31 Oct 2013 06:21:21 +0000 (23:21 -0700)]
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

10 years agoMerge "fix corruption in Vector<> when malloc falied"
Jesse Hall [Thu, 31 Oct 2013 04:02:24 +0000 (04:02 +0000)]
Merge "fix corruption in Vector<> when malloc falied"

10 years agoam bb3b5249: am 40da5283: Merge "EGL: rename CallStack::dump into CallStack::log...
Igor Murashkin [Wed, 30 Oct 2013 21:18:46 +0000 (14:18 -0700)]
am bb3b5249: am 40da5283: Merge "EGL: rename CallStack::dump into CallStack::log" into klp-dev

* commit 'bb3b52495909ee1ce5d8b9beb6e8a9c72f0cdd90':
  EGL: rename CallStack::dump into CallStack::log

10 years agoam 40da5283: Merge "EGL: rename CallStack::dump into CallStack::log" into klp-dev
Igor Murashkin [Wed, 30 Oct 2013 21:16:19 +0000 (14:16 -0700)]
am 40da5283: Merge "EGL: rename CallStack::dump into CallStack::log" into klp-dev

* commit '40da5283ebc6b5cf1e3820740dc274c47cc55f6d':
  EGL: rename CallStack::dump into CallStack::log

10 years agoMerge "EGL: rename CallStack::dump into CallStack::log" into klp-dev
Igor Murashkin [Wed, 30 Oct 2013 21:09:39 +0000 (21:09 +0000)]
Merge "EGL: rename CallStack::dump into CallStack::log" into klp-dev

10 years agoRe-apply androidfw fixes lost by the directory rearrangement.
Elliott Hughes [Tue, 29 Oct 2013 22:28:08 +0000 (15:28 -0700)]
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

10 years agoam 245c4339: am 46417b84: Merge "Bug fixes for SensorService" into klp-dev
Aravind Akella [Sat, 26 Oct 2013 01:12:58 +0000 (18:12 -0700)]
am 245c4339: am 46417b84: Merge "Bug fixes for SensorService" into klp-dev

* commit '245c43395b9bb6502e0a4bcde4c60ad9541e5ce2':
  Bug fixes for SensorService

10 years agoam 46417b84: Merge "Bug fixes for SensorService" into klp-dev
Aravind Akella [Sat, 26 Oct 2013 01:10:55 +0000 (18:10 -0700)]
am 46417b84: Merge "Bug fixes for SensorService" into klp-dev

* commit '46417b845a257d6725adf048a3cfad6306218e9b':
  Bug fixes for SensorService

10 years agoEGL: rename CallStack::dump into CallStack::log
Igor Murashkin [Sat, 26 Oct 2013 00:13:57 +0000 (17:13 -0700)]
EGL: rename CallStack::dump into CallStack::log

Bug: 11324229
Change-Id: Ibac1be182c336e7aa5ac098f08d18b3c188964b4

10 years agoMerge "Bug fixes for SensorService" into klp-dev
Aravind Akella [Fri, 25 Oct 2013 23:16:59 +0000 (23:16 +0000)]
Merge "Bug fixes for SensorService" into klp-dev

10 years agoam fddab476: am 708cc794: Native counterpart of new power manager method
Marco Nelissen [Fri, 25 Oct 2013 22:04:53 +0000 (15:04 -0700)]
am fddab476: am 708cc794: Native counterpart of new power manager method

* commit 'fddab476170de87d4d4fcd2afc34376c01f68b76':
  Native counterpart of new power manager method

10 years agoam 708cc794: Native counterpart of new power manager method
Marco Nelissen [Fri, 25 Oct 2013 22:01:29 +0000 (15:01 -0700)]
am 708cc794: Native counterpart of new power manager method

* commit '708cc794f6ccd4d31e0a00a23b289272c665adc1':
  Native counterpart of new power manager method

10 years agoBug fixes for SensorService
Aravind Akella [Tue, 15 Oct 2013 22:43:10 +0000 (15:43 -0700)]
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: 1132570711376538

Change-Id: Idb856302463649a99d3d5d0c965bb06ba06b8e1d

10 years agoNative counterpart of new power manager method
Marco Nelissen [Wed, 16 Oct 2013 17:57:51 +0000 (10:57 -0700)]
Native counterpart of new power manager method

Cherrypicked from master.

b/9464621

Change-Id: I54c0ed50a57ac870da91db8589a73a2c792dbd8d

10 years agoam 96002be4: am c354effe: Fix handling of undefined TARGET_FORCE_HWC_FOR_VIRTUAL_DISPLAYS
Jesse Hall [Fri, 25 Oct 2013 17:55:24 +0000 (10:55 -0700)]
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

10 years agoam c354effe: Fix handling of undefined TARGET_FORCE_HWC_FOR_VIRTUAL_DISPLAYS
Jesse Hall [Fri, 25 Oct 2013 17:52:37 +0000 (10:52 -0700)]
am c354effe: Fix handling of undefined TARGET_FORCE_HWC_FOR_VIRTUAL_DISPLAYS

* commit 'c354effe97be26638618e3bc0da81a3f8b384b20':
  Fix handling of undefined TARGET_FORCE_HWC_FOR_VIRTUAL_DISPLAYS

10 years agoFix handling of undefined TARGET_FORCE_HWC_FOR_VIRTUAL_DISPLAYS
Jesse Hall [Fri, 25 Oct 2013 17:44:41 +0000 (10:44 -0700)]
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

10 years agoam a54a8b63: am 93fcb823: Merge "Add a boardconfig to force HWC composition of virtua...
Jesse Hall [Wed, 23 Oct 2013 22:20:43 +0000 (15:20 -0700)]
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

10 years agoam 48775386: am c5807f90: Merge "Use implementation-defined format when HWC writes...
Jesse Hall [Wed, 23 Oct 2013 22:20:42 +0000 (15:20 -0700)]
am 48775386: am c5807f90: Merge "Use implementation-defined format when HWC writes to output buffer" into klp-dev

* commit '487753868aa86902f723dbdedd7083783701188d':
  Use implementation-defined format when HWC writes to output buffer

10 years agoam 93fcb823: Merge "Add a boardconfig to force HWC composition of virtual displays...
Jesse Hall [Wed, 23 Oct 2013 22:17:29 +0000 (15:17 -0700)]
am 93fcb823: Merge "Add a boardconfig to force HWC composition of virtual displays" into klp-dev

* commit '93fcb82361a1cd5ceb138f8331ad9cf11fc77c95':
  Add a boardconfig to force HWC composition of virtual displays

10 years agoam c5807f90: Merge "Use implementation-defined format when HWC writes to output buffe...
Jesse Hall [Wed, 23 Oct 2013 22:17:29 +0000 (15:17 -0700)]
am c5807f90: Merge "Use implementation-defined format when HWC writes to output buffer" into klp-dev

* commit 'c5807f90f8e05227e6396f30b3ed91fc01392d9a':
  Use implementation-defined format when HWC writes to output buffer

10 years agoMerge "Add a boardconfig to force HWC composition of virtual displays" into klp-dev
Jesse Hall [Wed, 23 Oct 2013 22:12:54 +0000 (22:12 +0000)]
Merge "Add a boardconfig to force HWC composition of virtual displays" into klp-dev

10 years agoMerge "Use implementation-defined format when HWC writes to output buffer" into klp-dev
Jesse Hall [Wed, 23 Oct 2013 22:12:37 +0000 (22:12 +0000)]
Merge "Use implementation-defined format when HWC writes to output buffer" into klp-dev

10 years agofix corruption in Vector<> when malloc falied
Shuo Gao [Thu, 17 Oct 2013 03:36:11 +0000 (11:36 +0800)]
fix corruption in Vector<> when malloc falied

1. When alloc or realloc failed in the function SharedBuffer::editResize,
it would return a NULL pointer, then mStorage would update to be 1 by
SharedBuffer::data() if no pointer check here, which is an obviously
wrong address, and would cause corruption when used it e.g. in capacity().

So add the pointer check here for the return value of SharedBuffer::editResize,
if it's NULL do not use it to update mStorage, to avoid the value of mStorage
polluted.

2. when alloc or realloc falied in _grow & _shrink function, mStorage keep
the original value, so mCount should not be updated here.

Otherwise, mStorage might be 0 but mCount>0, so a corruption would happend
when it try to delete items from the Vector since mCount>0.

Change-Id: I7c3814e843c459834ca5eed392e8d63d1cb7d2d8
Signed-off-by: Shuo Gao <shuo.gao@intel.com>
Signed-off-by: Jian Luo <jian.luo@intel.com>
Signed-off-by: Bruce Beare <bruce.j.beare@intel.com>
Signed-off-by: Jack Ren <jack.ren@intel.com>
Author-tracking-BZ: 139626

10 years agobatteryservice: remove now unused struct BatteryExtraProperties
Todd Poynor [Wed, 23 Oct 2013 01:29:44 +0000 (18:29 -0700)]
batteryservice: remove now unused struct BatteryExtraProperties

Change-Id: Ibbb1eba95a800d2198e7524149ce38beb13dd7c9

10 years agobatteryservice: remove BatteryProperties fields not sent to BatteryService
Todd Poynor [Fri, 4 Oct 2013 21:03:27 +0000 (14:03 -0700)]
batteryservice: remove BatteryProperties fields not sent to BatteryService

Change-Id: I1116ebf0e21117fd37df7bfc41cb8ebaf9361faa

10 years agoam 47f0b989: am 3223217a: Only consume touches up until the frame time
Michael Wright [Tue, 22 Oct 2013 00:30:25 +0000 (17:30 -0700)]
am 47f0b989: am 3223217a: Only consume touches up until the frame time

* commit '47f0b9894b78a76a1257e0f3299cbe5446035c09':
  Only consume touches up until the frame time

10 years agoMerge "Add MAX_CONTROLLER_LEDS constant"
Michael Wright [Tue, 22 Oct 2013 00:26:57 +0000 (00:26 +0000)]
Merge "Add MAX_CONTROLLER_LEDS constant"

10 years agoam 3223217a: Only consume touches up until the frame time
Michael Wright [Tue, 22 Oct 2013 00:23:55 +0000 (17:23 -0700)]
am 3223217a: Only consume touches up until the frame time

* commit '3223217aed6dcfa55b5b952cd6be71f70e41ba63':
  Only consume touches up until the frame time

10 years agoOnly consume touches up until the frame time
Michael Wright [Mon, 21 Oct 2013 19:05:22 +0000 (12:05 -0700)]
Only consume touches up until the frame time

When resampling is disabled, it's currently possible to consume
touches after the current frame time. This breaks some guarantees and
could cause unexpected behaviors.

Change-Id: I99908a2cac2df9f795dd4a07188b4451213cf3e4

10 years agoAdd MAX_CONTROLLER_LEDS constant
Michael Wright [Sat, 19 Oct 2013 00:53:50 +0000 (17:53 -0700)]
Add MAX_CONTROLLER_LEDS constant

Change-Id: I5ec972338c50647049bb5a8279847d54a84d9f70

10 years agoam 251b11c2: am 85075869: Wait for buffers to drain
Andy McFadden [Sat, 19 Oct 2013 00:00:26 +0000 (17:00 -0700)]
am 251b11c2: am 85075869: Wait for buffers to drain

* commit '251b11c2045b2ae97f2ab270a65e11b4ca49b1b6':
  Wait for buffers to drain

10 years agoam 85075869: Wait for buffers to drain
Andy McFadden [Fri, 18 Oct 2013 23:57:01 +0000 (16:57 -0700)]
am 85075869: Wait for buffers to drain

* commit '8507586903fa803abf535853a169913f2cf2e555':
  Wait for buffers to drain

10 years agoWait for buffers to drain
Andy McFadden [Fri, 18 Oct 2013 22:50:24 +0000 (15:50 -0700)]
Wait for buffers to drain

When a BufferQueue producer disconnects and reconnects, we retain
the previously-queued buffers but empty the slots.  This allows
the number of queued buffers to grow without limit.  The low-memory
killer does not approve.

Bug 11069934

Change-Id: Ia2eaa954c7a3904b54209a3701dba01689e204d8

10 years agoMerge "Parse LED mappings in keylayout files"
Michael Wright [Fri, 18 Oct 2013 20:02:59 +0000 (20:02 +0000)]
Merge "Parse LED mappings in keylayout files"

10 years agoParse LED mappings in keylayout files
Michael Wright [Fri, 18 Oct 2013 00:35:53 +0000 (17:35 -0700)]
Parse LED mappings in keylayout files

Change-Id: I6bc3760341868015f054d9866e2616a312da94e0

10 years agoMerge "Native counterpart of new power manager method"
Marco Nelissen [Fri, 18 Oct 2013 14:28:55 +0000 (14:28 +0000)]
Merge "Native counterpart of new power manager method"

10 years agoAdd a boardconfig to force HWC composition of virtual displays
Naseer Ahmed [Fri, 4 Oct 2013 20:15:22 +0000 (16:15 -0400)]
Add a boardconfig to force HWC composition of virtual displays

When this boardconfig is defined, even when all virtual display
composition is done by GLES, the HWC will be forced to copy from the
GLES framebuffer to the output buffer. On some hardware this allows
HWC to do format conversions that would otherwise have to be done by
the consumer, with worse power and/or performance.

Bug: 8316155
Change-Id: If980ecc589f138cef063eafa757f7f748196713e

10 years agoUse implementation-defined format when HWC writes to output buffer
Jesse Hall [Fri, 27 Sep 2013 16:05:09 +0000 (09:05 -0700)]
Use implementation-defined format when HWC writes to output buffer

When GLES isn't writing to the output buffer directly, request an
implementation-defined format with minimal usage flags, leaving the
format choice up to gralloc. On some hardware this allows HWC to do
format conversions during composition that would otherwise need to be
done (with worse power and/or performance) by the consumer.

Bug: 8316155
Change-Id: Iee6ee8404282036f9fd1833067cfe11dbadbf0bf

10 years agoam afd0debe: am dacd4159: merge in klp-release (no-op)
Ed Heyl [Thu, 17 Oct 2013 01:02:04 +0000 (18:02 -0700)]
am afd0debe: am dacd4159: merge in klp-release (no-op)

* commit 'afd0debe4bdf47dc0f968282ca1261842bb65d60':
  Change API from flush(handle) to flush(). Call flush on all active sensors in the given SensorEventConnection.
  Eliminate latency when resampling is disabled
  Fix blank / partial screenshots
  Set the outbuf acquire fence after we actually have it.
  only clear FB when asked for the opaque layer
  Treat composition frames with no layers as using GLES composition
  Fix two EGLConfig selection bugs
  fix crashers with wifi/virtual displays

10 years agoam dacd4159: merge in klp-release (no-op)
Ed Heyl [Thu, 17 Oct 2013 00:56:33 +0000 (17:56 -0700)]
am dacd4159: merge in klp-release (no-op)

* commit 'dacd4159631865da1a02203fe5fa7c5f1339cda9':
  Change API from flush(handle) to flush(). Call flush on all active sensors in the given SensorEventConnection.
  Eliminate latency when resampling is disabled
  Fix blank / partial screenshots
  Set the outbuf acquire fence after we actually have it.
  only clear FB when asked for the opaque layer
  Treat composition frames with no layers as using GLES composition
  Fix two EGLConfig selection bugs
  fix crashers with wifi/virtual displays

10 years agomerge in klp-release (no-op)
Ed Heyl [Thu, 17 Oct 2013 00:43:06 +0000 (17:43 -0700)]
merge in klp-release (no-op)

10 years agoNative counterpart of new power manager method
Marco Nelissen [Wed, 16 Oct 2013 17:57:51 +0000 (10:57 -0700)]
Native counterpart of new power manager method

Change-Id: I54c0ed50a57ac870da91db8589a73a2c792dbd8d

10 years agomerge in klp-release history after reset to klp-dev
The Android Automerger [Wed, 16 Oct 2013 04:14:09 +0000 (21:14 -0700)]
merge in klp-release history after reset to klp-dev

10 years agoam bbfbe93c: am 0a645cc5: SurfaceFlinger: give SF its own vsync phase
Jamie Gennis [Wed, 16 Oct 2013 00:29:21 +0000 (17:29 -0700)]
am bbfbe93c: am 0a645cc5: SurfaceFlinger: give SF its own vsync phase

* commit 'bbfbe93c0d2d6c7818e23219d2925f02ddf5bd92':
  SurfaceFlinger: give SF its own vsync phase

10 years agoam 47c772e8: am d1700756: SurfaceFlinger: Add EventControlThread
Jamie Gennis [Wed, 16 Oct 2013 00:29:21 +0000 (17:29 -0700)]
am 47c772e8: am d1700756: SurfaceFlinger: Add EventControlThread

* commit '47c772e8ec28eb0a3df9c8edd252f292c7c8e152':
  SurfaceFlinger: Add EventControlThread

10 years agoresolved conflicts for merge of e94d204a to master
Jesse Hall [Wed, 16 Oct 2013 00:22:33 +0000 (17:22 -0700)]
resolved conflicts for merge of e94d204a to master

Change-Id: Idb2030dbb25a2e4b972492587558b25a305e68bd

10 years agoam 0a645cc5: SurfaceFlinger: give SF its own vsync phase
Jamie Gennis [Tue, 15 Oct 2013 23:17:18 +0000 (16:17 -0700)]
am 0a645cc5: SurfaceFlinger: give SF its own vsync phase

* commit '0a645cc5a935e67a8d1effc7679a838160b971d8':
  SurfaceFlinger: give SF its own vsync phase

10 years agoam d1700756: SurfaceFlinger: Add EventControlThread
Jamie Gennis [Tue, 15 Oct 2013 23:17:18 +0000 (16:17 -0700)]
am d1700756: SurfaceFlinger: Add EventControlThread

* commit 'd1700756ec9520c3fba22f9a14fd064a6e288810':
  SurfaceFlinger: Add EventControlThread

10 years agoam 24742375: Merge "Disable hardware vsync when blanking the screen" into klp-dev
Jesse Hall [Tue, 15 Oct 2013 23:16:47 +0000 (16:16 -0700)]
am 24742375: Merge "Disable hardware vsync when blanking the screen" into klp-dev

* commit '247423751fd4bfb0b1f87537c985413a28fd04a1':
  Disable hardware vsync when blanking the screen

10 years agomerge in klp-release history after reset to klp-dev
The Android Automerger [Tue, 15 Oct 2013 22:55:41 +0000 (15:55 -0700)]
merge in klp-release history after reset to klp-dev

10 years agoSurfaceFlinger: give SF its own vsync phase
Jamie Gennis [Tue, 15 Oct 2013 03:52:46 +0000 (20:52 -0700)]
SurfaceFlinger: give SF its own vsync phase

This change allows SurfaceFlinger to run at a different vsync phase offset from
that used by external listeners.

Bug: 11175503
Change-Id: I561c53a5659fa6dc1e3e4ae30340f3c1a6adceb4

10 years agoSurfaceFlinger: Add EventControlThread
Jamie Gennis [Mon, 14 Oct 2013 19:22:52 +0000 (12:22 -0700)]
SurfaceFlinger: Add EventControlThread

This change adds a new thread for calling HWComposer's eventControl
asynchronously.  The DispSync-based vsync approach ends up enabling and
disabling HWComposer's vsync callbacks at arbitrary times, and some HWComposer
implementations do not have these calls optimized.

Bug: 11175503
Change-Id: I719be82bd200b391c61d40863b991c7b59acdfd6

10 years agoMerge "Disable hardware vsync when blanking the screen" into klp-dev
Jesse Hall [Tue, 15 Oct 2013 19:53:10 +0000 (19:53 +0000)]
Merge "Disable hardware vsync when blanking the screen" into klp-dev

10 years agoam 487c7815: am 641a1868: Merge "SensorService Flush API bug fix." into klp-dev
Aravind Akella [Tue, 15 Oct 2013 17:07:23 +0000 (10:07 -0700)]
am 487c7815: am 641a1868: Merge "SensorService Flush API bug fix." into klp-dev

* commit '487c7815d7d81570c4f2cf37ceddf10ec84e0c39':
  SensorService Flush API bug fix.

10 years agoam 641a1868: Merge "SensorService Flush API bug fix." into klp-dev
Aravind Akella [Tue, 15 Oct 2013 17:05:09 +0000 (10:05 -0700)]
am 641a1868: Merge "SensorService Flush API bug fix." into klp-dev

* commit '641a18688bc6b208bbeaffa6083d3cf5f6790e4b':
  SensorService Flush API bug fix.

10 years agoMerge "SensorService Flush API bug fix." into klp-dev
Aravind Akella [Tue, 15 Oct 2013 17:01:55 +0000 (17:01 +0000)]
Merge "SensorService Flush API bug fix." into klp-dev

10 years agomerge in klp-release history after reset to klp-dev
The Android Automerger [Tue, 15 Oct 2013 13:00:54 +0000 (06:00 -0700)]
merge in klp-release history after reset to klp-dev

10 years agoam a04fd39c: am 8e26b28b: Filter out vsync events from HWC with duplicate timestamps
Jesse Hall [Tue, 15 Oct 2013 12:05:36 +0000 (05:05 -0700)]
am a04fd39c: am 8e26b28b: Filter out vsync events from HWC with duplicate timestamps

* commit 'a04fd39cb88bb6df5f639464f70795f58cd0aefa':
  Filter out vsync events from HWC with duplicate timestamps

10 years agoam 8e26b28b: Filter out vsync events from HWC with duplicate timestamps
Jesse Hall [Tue, 15 Oct 2013 03:34:58 +0000 (20:34 -0700)]
am 8e26b28b: Filter out vsync events from HWC with duplicate timestamps

* commit '8e26b28be62e7c0e093900540db5e5cdcf52a0ff':
  Filter out vsync events from HWC with duplicate timestamps