Commit Graph

49370 Commits

Author SHA1 Message Date
Brian Carlstrom
c1bf6fa949 am 7fea2361: Merge "Track Looper decoupling from ALooper"
* commit '7fea23613a8bcfae2d6f13234c3f0d7c9c3ef570':
  Track Looper decoupling from ALooper
2013-12-18 23:21:51 -08:00
Brian Carlstrom
7fea23613a Merge "Track Looper decoupling from ALooper" 2013-12-19 07:13:03 +00:00
Nick Kralevich
e7394ba8bd am c02c35fb: Merge "restorecon /data/media when re-creating it for multi-user upgrade."
* commit 'c02c35fbdc90acbb6483fddd9a8822a16a63689d':
  restorecon /data/media when re-creating it for multi-user upgrade.
2013-12-17 15:08:30 -08:00
Nick Kralevich
c02c35fbdc Merge "restorecon /data/media when re-creating it for multi-user upgrade." 2013-12-17 23:02:36 +00:00
Stephen Smalley
47a351834f restorecon /data/media when re-creating it for multi-user upgrade.
Change-Id: I112c61863f2104d1962697c54cff25106e9b48a0
Signed-off-by: Stephen Smalley <sds@tycho.nsa.gov>
2013-12-17 16:04:20 -05:00
Brian Carlstrom
fe761ab6c7 Track Looper decoupling from ALooper
Change-Id: I612f0de7002e24948a4cbbea7b416b4fbb3929aa
2013-12-12 23:54:43 -08:00
The Android Open Source Project
1b5143bfd6 am de8c8069: Merge commit \'1ee45c2d2d816ee912624d81ff1b0aaa98e8fa74\' into HEAD
* commit 'de8c80692b0b2fcef705ba9b417477d2bba81e75':
2013-12-05 17:26:03 -08:00
The Android Open Source Project
de8c80692b Merge commit '1ee45c2d2d816ee912624d81ff1b0aaa98e8fa74' into HEAD 2013-12-05 12:38:18 -08:00
Jesse Hall
46cfde3b65 am 708602cc: Merge "DispSync: remove delay when enabling vsync events"
* commit '708602ccaad0f6e896c4bd4457503614b9ee81d0':
  DispSync: remove delay when enabling vsync events
2013-12-02 21:19:56 -08:00
Jesse Hall
708602ccaa Merge "DispSync: remove delay when enabling vsync events" 2013-12-03 05:12:31 +00:00
Jamie Gennis
629b987818 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-12-02 21:06:09 -08:00
Nick Kralevich
651dc7440b am bef08b8d: Merge "Handle policy reloads within installd rather than restarting it."
* commit 'bef08b8d1b30976ff273fc9041bc8d934f52fea9':
  Handle policy reloads within installd rather than restarting it.
2013-11-27 13:16:46 -08:00
Nick Kralevich
bef08b8d1b Merge "Handle policy reloads within installd rather than restarting it." 2013-11-27 21:09:13 +00: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
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
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
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
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
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
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
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
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
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
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
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
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
a54a8b63d1 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
2013-10-23 15:17:29 -07:00
Jesse Hall
487753868a 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
2013-10-23 15:17:29 -07:00
Jesse Hall
93fcb82361 Merge "Add a boardconfig to force HWC composition of virtual displays" into klp-dev 2013-10-23 22:12:54 +00:00
Jesse Hall
c5807f90f8 Merge "Use implementation-defined format when HWC writes to output buffer" into klp-dev 2013-10-23 22:12:37 +00:00
Shuo Gao
0a885309aa 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
2013-10-22 22:36:46 -07:00
Michael Wright
47f0b9894b am 3223217a: Only consume touches up until the frame time
* commit '3223217aed6dcfa55b5b952cd6be71f70e41ba63':
  Only consume touches up until the frame time
2013-10-21 17:23:55 -07:00