Arve Hjønnevåg
d06f6b0014
am 67903293
: Fix "Binder: Make sure binder objects do not overlap" to work old binder kernel interface
...
* commit '6790329358d1c84af2fe9ba093bcfc1c6176e758':
Fix "Binder: Make sure binder objects do not overlap" to work old binder kernel interface
2014-02-20 00:00:49 +00:00
Arve Hjønnevåg
6790329358
Fix "Binder: Make sure binder objects do not overlap" to work old binder kernel interface
...
DO NOT MERGE into any branch that uses the new interface
Change-Id: Id54308a89327e69a389ac5916c052ad97f57cb28
2014-02-19 15:35:52 -08:00
Arve Hjønnevåg
d437364ec1
am f50b9eaa
: Binder: Make sure binder objects do not overlap
...
* commit 'f50b9eaaeeaeae16981f11b05d3f3a6fb0dea30d':
Binder: Make sure binder objects do not overlap
2014-02-19 21:45:25 +00:00
Arve Hjønnevåg
f50b9eaaee
Binder: Make sure binder objects do not overlap
...
Fixes crashing part of bug 11355082.
The driver still leaks references.
Change-Id: Ibc6a63b151c1fc1f7666237f25255ba781e02071
2014-02-15 03:44:17 +00:00
Jesse Hall
f65ebc3be4
am f5bcb391
: Merge "SurfaceFlinger: mFbProducerSlot initailization"
...
* commit 'f5bcb391c5a4282fa5fe14856faf1423a2bc44c5':
SurfaceFlinger: mFbProducerSlot initailization
2014-01-28 18:22:35 +00:00
Jesse Hall
f5bcb391c5
Merge "SurfaceFlinger: mFbProducerSlot initailization"
2014-01-28 18:17:46 +00:00
mayank parshar
fdfde88d0b
SurfaceFlinger: mFbProducerSlot initailization
...
b/12487813
SurfaceFlinger crash is observed during simulation of
Secondary display
Note: change 14e8b01a76
removed the initialization leading to the crash when
simulating secondary display. Restore the initialization
to solve the problem.
Change-Id: Iae5845fb82735e01de5cc0dc582d13c27e3c614f
Signed-off-by: mayank parshar <mayankp@broadcom.com>
Signed-off-by: Pierre Couillaud <pierre@broadcom.com>
2014-01-28 09:33:33 -08:00
Colin Cross
689a7f30cc
am 851b2cb1
: Merge "Make libEGL build cleanly under 64-bit"
...
* commit '851b2cb18c329e0d19f9f56f68425b714007a274':
Make libEGL build cleanly under 64-bit
2014-01-28 02:27:41 +00:00
Colin Cross
851b2cb18c
Merge "Make libEGL build cleanly under 64-bit"
2014-01-28 02:22:11 +00:00
Dan Stoza
4864e85430
Make libEGL build cleanly under 64-bit
...
Change-Id: I255dfb70b166b7469d59352b1acfc7aececa07de
2014-01-27 18:16:50 -08:00
Colin Cross
a21ba5856b
am 55f0668f
: Merge "frameworks/native: convert LOCAL_MODULE_PATH to LOCAL_MODULE_RELATIVE_PATH"
...
* commit '55f0668ffd6fd7889e027b3072bf173a7ee48f08':
frameworks/native: convert LOCAL_MODULE_PATH to LOCAL_MODULE_RELATIVE_PATH
2014-01-28 00:59:40 +00:00
Colin Cross
55f0668ffd
Merge "frameworks/native: convert LOCAL_MODULE_PATH to LOCAL_MODULE_RELATIVE_PATH"
2014-01-28 00:48:32 +00:00
Colin Cross
df50868a32
frameworks/native: convert LOCAL_MODULE_PATH to LOCAL_MODULE_RELATIVE_PATH
...
LOCAL_MODULE_PATH doesn't work for multiarch builds, replace it
with LOCAL_MODULE_RELATIVE_PATH.
Change-Id: I4e4ceec61d026bbe74ba604554c06104bde42e5e
2014-01-27 12:39:29 -08:00
Jesse Hall
8c303f7e64
am fcf9c1ba
: Merge "SurfaceFlinger: mFbFence initialization"
...
* commit 'fcf9c1bafb251c186191b9d066ed00d0b59b962a':
SurfaceFlinger: mFbFence initialization
2014-01-26 08:45:40 -08:00
Jesse Hall
fcf9c1bafb
Merge "SurfaceFlinger: mFbFence initialization"
2014-01-26 08:15:15 +00:00
mayank parshar
b988f85fc4
SurfaceFlinger: mFbFence initialization
...
MobC00383030
b/12487813
SurfaceFlinger crash is observed while connecting
to Wi-Fi display.
Note: change 14e8b01a76
removed the initialization leading to the crash when
running through the HWC composition path. Restore the
initialization to solve the problem.
Change-Id: I581defc7135ac512080c0da06a62b1dae7d218c4
Signed-off-by: mayank parshar <mayankp@broadcom.com>
Signed-off-by: Pierre Couillaud <pierre@broadcom.com>
2014-01-25 06:35:24 -08:00
Colin Cross
e3aeefd1f8
am af29b77a
: Merge "libGLES_android: fix 64-bit compile errors"
...
* commit 'af29b77ab7dab5a1b5af27e7f7eeeb14584c101c':
libGLES_android: fix 64-bit compile errors
2014-01-24 16:42:36 -08:00
Colin Cross
af29b77ab7
Merge "libGLES_android: fix 64-bit compile errors"
2014-01-25 00:38:16 +00:00
Colin Cross
444839b842
libGLES_android: fix 64-bit compile errors
...
Fix size of vertex_t on 64-bit architectures
Fix __get_tls casts, the TLS area is a void**
Cast through uintptr_t to store integers in a pointer
Use %zu to print size_t
Change-Id: I91079ec76025237e6d2081784c5348518b0ce122
2014-01-24 14:44:57 -08:00
Jesse Hall
e5f7bf7471
am b6c21004
: Merge "Implement per-display EGLConfig and configless EGLContext"
...
* commit 'b6c2100458bd4dda880ec24dc7d1f39825d5243d':
Implement per-display EGLConfig and configless EGLContext
2014-01-03 10:30:11 -08:00
Jesse Hall
6c7dcfa956
am 662d3134
: Merge "Move EGLConfig selection to RenderEngine"
...
* commit '662d3134cb3fe3f18a0a6bfbc24368c2291c8e19':
Move EGLConfig selection to RenderEngine
2014-01-03 10:30:10 -08:00
Jesse Hall
b6c2100458
Merge "Implement per-display EGLConfig and configless EGLContext"
2014-01-03 18:25:07 +00:00
Jesse Hall
662d3134cb
Merge "Move EGLConfig selection to RenderEngine"
2014-01-03 18:24:30 +00:00
Jesse Hall
19e872912a
Implement per-display EGLConfig and configless EGLContext
...
Bug: 12230666
Change-Id: Icca608b108cbdcab9cf01a9236d8cdbda000a836
Signed-off-by: Jesse Hall <jessehall@google.com>
2013-12-23 21:53:39 -08:00
Jesse Hall
05f8c703d4
Move EGLConfig selection to RenderEngine
...
Bug: 12230666
Change-Id: I8d1111a7e0fd9d9e2525e6a80da8ce46d7dd085d
Signed-off-by: Jesse Hall <jessehall@google.com>
2013-12-23 21:53:39 -08:00
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