OSDN Git Service
Jesse Hall [Fri, 3 Jan 2014 18:36:28 +0000 (18:36 +0000)]
am
4c37d088: am
6c7dcfa9: am
662d3134: Merge "Move EGLConfig selection to RenderEngine"
* commit '
4c37d0886ca06c290e205cad2798406361bbbf53':
Move EGLConfig selection to RenderEngine
Jesse Hall [Fri, 3 Jan 2014 18:31:53 +0000 (18:31 +0000)]
am
6c7dcfa9: am
662d3134: Merge "Move EGLConfig selection to RenderEngine"
* commit '
6c7dcfa956847a9f061fd1b2baa9dc43585599af':
Move EGLConfig selection to RenderEngine
Jesse Hall [Fri, 3 Jan 2014 18:30:10 +0000 (10:30 -0800)]
am
662d3134: Merge "Move EGLConfig selection to RenderEngine"
* commit '
662d3134cb3fe3f18a0a6bfbc24368c2291c8e19':
Move EGLConfig selection to RenderEngine
Jesse Hall [Fri, 3 Jan 2014 18:24:30 +0000 (18:24 +0000)]
Merge "Move EGLConfig selection to RenderEngine"
Jesse Hall [Tue, 24 Dec 2013 04:44:38 +0000 (20:44 -0800)]
Move EGLConfig selection to RenderEngine
Bug:
12230666
Change-Id: I8d1111a7e0fd9d9e2525e6a80da8ce46d7dd085d
Signed-off-by: Jesse Hall <jessehall@google.com>
RoboErik [Thu, 19 Dec 2013 21:15:04 +0000 (21:15 +0000)]
Merge "b/
12068020 add nonce to InputDeviceDescriptor"
RoboErik [Thu, 19 Dec 2013 19:54:29 +0000 (11:54 -0800)]
b/
12068020 add nonce to InputDeviceDescriptor
Adds a nonce field to allow generation of unique descriptors for
input devices.
Change-Id: I978b6c5e9edc9e0a6aa60f85cd8d4efc42ac2999
Brian Carlstrom [Thu, 19 Dec 2013 07:58:30 +0000 (07:58 +0000)]
am
285bfefb: am
c1bf6fa9: am
7fea2361: Merge "Track Looper decoupling from ALooper"
* commit '
285bfefb01f24e98348628c115eb6c524417ea82':
Track Looper decoupling from ALooper
Brian Carlstrom [Thu, 19 Dec 2013 07:25:24 +0000 (07:25 +0000)]
am
c1bf6fa9: am
7fea2361: Merge "Track Looper decoupling from ALooper"
* commit '
c1bf6fa9495b21f25e7ab1a491b918df71be6e1a':
Track Looper decoupling from ALooper
Brian Carlstrom [Thu, 19 Dec 2013 07:21:51 +0000 (23:21 -0800)]
am
7fea2361: Merge "Track Looper decoupling from ALooper"
* commit '
7fea23613a8bcfae2d6f13234c3f0d7c9c3ef570':
Track Looper decoupling from ALooper
Brian Carlstrom [Thu, 19 Dec 2013 07:13:03 +0000 (07:13 +0000)]
Merge "Track Looper decoupling from ALooper"
Nick Kralevich [Tue, 17 Dec 2013 23:18:58 +0000 (23:18 +0000)]
am
e2d412f0: am
e7394ba8: am
c02c35fb: Merge "restorecon /data/media when re-creating it for multi-user upgrade."
* commit '
e2d412f0466ac6a1a33e2c2563ed2192b58bfa87':
restorecon /data/media when re-creating it for multi-user upgrade.
Nick Kralevich [Tue, 17 Dec 2013 23:12:20 +0000 (23:12 +0000)]
am
e7394ba8: am
c02c35fb: Merge "restorecon /data/media when re-creating it for multi-user upgrade."
* commit '
e7394ba8bd9cd90a0fb72f6c50522a41cd7877fd':
restorecon /data/media when re-creating it for multi-user upgrade.
Nick Kralevich [Tue, 17 Dec 2013 23:08:30 +0000 (15:08 -0800)]
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.
Nick Kralevich [Tue, 17 Dec 2013 23:02:36 +0000 (23:02 +0000)]
Merge "restorecon /data/media when re-creating it for multi-user upgrade."
Stephen Smalley [Tue, 17 Dec 2013 21:04:20 +0000 (16:04 -0500)]
restorecon /data/media when re-creating it for multi-user upgrade.
Change-Id: I112c61863f2104d1962697c54cff25106e9b48a0
Signed-off-by: Stephen Smalley <sds@tycho.nsa.gov>
Christopher Tate [Mon, 16 Dec 2013 23:04:10 +0000 (15:04 -0800)]
Fix MCC/MNC typo
Manual merge of https://android-review.googlesource.com/70831 across
the header refactoring.
Change-Id: I28b6a61e89b68d914124122882976a9d2f81a609
Brian Carlstrom [Fri, 13 Dec 2013 07:13:18 +0000 (23:13 -0800)]
Track Looper decoupling from ALooper
Change-Id: I612f0de7002e24948a4cbbea7b416b4fbb3929aa
Dan Stoza [Wed, 11 Dec 2013 23:21:11 +0000 (15:21 -0800)]
libgui: Add a test suite for SRGB testing
This is the start of an SRGB test suite. Currently it has a test for
SRGB texture reads in GLES3.
Change-Id: I553ee2691dc92b98cae7a003084d4e2823d40d95
Narayan Kamath [Wed, 11 Dec 2013 19:35:52 +0000 (19:35 +0000)]
Merge changes I25acff1d,Iae67e62f
* changes:
Add libutils dependency for libandroidfw host build.
Reimplement ZipFileRO in terms of libziparchive.
Narayan Kamath [Wed, 11 Dec 2013 16:48:07 +0000 (16:48 +0000)]
Add libutils dependency for libandroidfw host build.
(cherry picked from commit
070274ec0ccb8643c52e41e4119f356f0f51bc36)
Change-Id: I25acff1d36b3adce14b2576485bda93c914d7f5d
Todd Poynor [Wed, 11 Dec 2013 06:30:39 +0000 (06:30 +0000)]
am
2a83daa8: dumpstate: dump console-ramoops instead of last_kmsg if present
* commit '
2a83daa8a3e1eab292dc1464bbe78f025f4bc0e9':
dumpstate: dump console-ramoops instead of last_kmsg if present
Todd Poynor [Fri, 22 Nov 2013 23:44:22 +0000 (15:44 -0800)]
dumpstate: dump console-ramoops instead of last_kmsg if present
Change-Id: I41a922b33f0b6b4e8e150a92e46032501a165e33
Aravind Akella [Tue, 10 Dec 2013 20:12:29 +0000 (20:12 +0000)]
Merge "Bug fix for SensorFusion data rate."
Aravind Akella [Fri, 6 Dec 2013 00:24:59 +0000 (16:24 -0800)]
Bug fix for SensorFusion data rate.
SensorFusion is always returning data at the slowest possible sampling rate (5 Hz). batch() is getting called twice, first time with the requested rate and second time with the slowest rate (which overwrites the requested rate). Fix batch call in SensorFusion::activate()
Bug:
12064319
Change-Id: If62f3e514233f69810336fd22b136b4395b667d3
Dan Stoza [Mon, 9 Dec 2013 18:38:51 +0000 (18:38 +0000)]
Merge "libgui: Split SurfaceTexture tests into more files"
Dan Stoza [Tue, 3 Dec 2013 20:37:36 +0000 (12:37 -0800)]
libgui: Split SurfaceTexture tests into more files
Extract the many different test fixtures and suites in SurfaceTexture_test.cpp
into separate files. No real functional changes, just tweaking headers to keep
things building (and adding a few copyright headers I forgot last time).
Change-Id: Id801bd5d617f0cc61d22508fb9b71b41694bdecf
Narayan Kamath [Tue, 3 Dec 2013 13:16:03 +0000 (13:16 +0000)]
Reimplement ZipFileRO in terms of libziparchive.
This lets us share zip archive processing code with both
the runtime (Art, dalvik) and critical java code
(StrictJarFile).
This change also moves several utility methods to ZipUtils
and dedups code across several zip inflation methods.
One of the side effects of this change is that several
processing loops are now O(n) instead of O(n^2).
bug:
10193060
(cherry picked from commit
afd31e08299008fdc5c2813f21b2573f29dc53df)
Change-Id: Iae67e62f1dc6dfc3f43e29bc38e3ffd1cb14d191
The Android Open Source Project [Fri, 6 Dec 2013 01:43:29 +0000 (01:43 +0000)]
The Android Open Source Project [Fri, 6 Dec 2013 01:26:03 +0000 (17:26 -0800)]
The Android Open Source Project [Thu, 5 Dec 2013 20:38:18 +0000 (12:38 -0800)]
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
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
Jesse Hall [Tue, 3 Dec 2013 05:12:31 +0000 (05:12 +0000)]
Merge "DispSync: 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
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.
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.
Nick Kralevich [Wed, 27 Nov 2013 21:09:12 +0000 (21:09 +0000)]
Merge "Handle policy reloads within installd rather than restarting it."
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
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
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
The Android Open Source Project [Sat, 23 Nov 2013 20:29:35 +0000 (12:29 -0800)]
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
Dima Zavin [Sat, 23 Nov 2013 04:41:17 +0000 (04:41 +0000)]
Merge "Remove incompatible ashmem.h"
The Android Open Source Project [Sat, 23 Nov 2013 01:41:41 +0000 (17:41 -0800)]
The Android Open Source Project [Fri, 22 Nov 2013 19:20:20 +0000 (11:20 -0800)]
Merge commit '
afd0debe4bdf47dc0f968282ca1261842bb65d60' into HEAD
Change-Id: Ic9aed2c57bdfeb250ce2dd7f0e9289ba5b6e936a
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.
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.
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
Elliott Hughes [Thu, 21 Nov 2013 20:42:32 +0000 (20:42 +0000)]
Merge "Remove 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
Igor Murashkin [Mon, 18 Nov 2013 20:26:56 +0000 (12:26 -0800)]
gui: Remove BufferQueue::MIN_UNDEQUEUED_BUFFERS
Change-Id: I7c0cc36046dbbdb9c0e85acfe5027293d1131275
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
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
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
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
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
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
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
Changwan Ryu [Wed, 6 Nov 2013 18:22:41 +0000 (18:22 +0000)]
Merge "Extend OpenMAX IL definitions to support AC3"
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
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
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
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
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
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
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
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
Jamie Gennis [Mon, 4 Nov 2013 22:47:31 +0000 (22:47 +0000)]
Merge "DispSync: remove delay when enabling vsync events" into klp-dev
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
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
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
Jesse Hall [Thu, 31 Oct 2013 04:02:24 +0000 (04:02 +0000)]
Merge "fix corruption in Vector<> when malloc falied"
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
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
Igor Murashkin [Wed, 30 Oct 2013 21:09:39 +0000 (21:09 +0000)]
Merge "EGL: rename CallStack::dump into CallStack::log" into klp-dev
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
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
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
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
Aravind Akella [Fri, 25 Oct 2013 23:16:59 +0000 (23:16 +0000)]
Merge "Bug fixes for SensorService" into klp-dev
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
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
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:
11325707,
11376538
Change-Id: Idb856302463649a99d3d5d0c965bb06ba06b8e1d
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
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
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
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
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
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
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
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
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
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
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
Todd Poynor [Wed, 23 Oct 2013 01:29:44 +0000 (18:29 -0700)]
batteryservice: remove now unused struct BatteryExtraProperties
Change-Id: Ibbb1eba95a800d2198e7524149ce38beb13dd7c9
Todd Poynor [Fri, 4 Oct 2013 21:03:27 +0000 (14:03 -0700)]
batteryservice: remove BatteryProperties fields not sent to BatteryService
Change-Id: I1116ebf0e21117fd37df7bfc41cb8ebaf9361faa
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
Michael Wright [Tue, 22 Oct 2013 00:26:57 +0000 (00:26 +0000)]
Merge "Add MAX_CONTROLLER_LEDS constant"
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