Michael Wright
1298c7e527
Merge "Parse LED mappings in keylayout files. DO NOT MERGE" into klp-modular-dev
2014-03-05 00:51:43 +00:00
Michael Wright
962a108856
Parse LED mappings in keylayout files. DO NOT MERGE
...
Change-Id: I2b34939cc0df256e6b872502ea93f2884b4c8334
2014-03-03 13:59:35 -08:00
Simon Wilson
6e79cb81d0
Enable OMAP4 SGX workaround for OMAP3 too
...
Change-Id: I04308d8b7435b4adf1811f75f48f9e8a07a8c8a6
2014-02-28 14:30:39 -08:00
Arve Hjønnevåg
d5a354c6b7
am d06f6b00
: am 67903293
: Fix "Binder: Make sure binder objects do not overlap" to work old binder kernel interface
...
* commit 'd06f6b001484c28a6ede3f1ad83d23dcb9ad3ccf':
Fix "Binder: Make sure binder objects do not overlap" to work old binder kernel interface
2014-02-20 00:04:44 +00:00
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
e45636a867
am d437364e
: am f50b9eaa
: Binder: Make sure binder objects do not overlap
...
* commit 'd437364ec156e07c5fbe3fa27a7cd55e5450e9f6':
Binder: Make sure binder objects do not overlap
2014-02-19 21:47:35 +00: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
Andy McFadden
44c35ec4a9
Allow "opaque" flag to be updated. DO NOT MERGE
...
Moves the "opaque layer" from Layer to Layer::State. This allows
it to be updated as part of a transaction.
Bug 12387406
Change-Id: I0a114ce6adf77cd12fb08f96e0691b76c475768d
2014-02-18 15:55:42 -08: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
Jeff Brown
ed4d28dd70
Add method to apply offset to PointerCoords. (DO NOT MERGE)
...
Change-Id: I3dc2ba22b026e5b8e1c3d90f7366ec09a59ce6b6
2014-02-11 14:43:19 -08:00
Adam Lesinski
0f0ccf07ba
Add new software features
...
Wearable devices are much more stripped down than
handheld and tablet devices. There are system
services that must not be present on wearable
devices. Those services have their own feature
xml files that get copied to the system image
as needed. They are included by default in the
handheld and tablet core feature files in order
to maintain previous behavior.
Wearable devices should always copy the
data/etc/wearable_core_hardware.xml file and
whatever other files that represent required
services (eg. data/etc/android.software.print.xml).
Change-Id: I410442d45854fe54cba1131ce488a5a459ac580a
2014-02-05 19:35:57 +00:00
Changwan Ryu
e636692a2e
[DO NOT MERGE] 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
2014-02-03 14:10:18 +09:00
Aravind Akella
ebff73c37d
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
2014-01-31 22:33:51 +00:00
Jesse Hall
ade9a911d0
am f65ebc3b
: am f5bcb391
: Merge "SurfaceFlinger: mFbProducerSlot initailization"
...
* commit 'f65ebc3be4d3a2e4c71c401d0e53f2ad5798be2a':
SurfaceFlinger: mFbProducerSlot initailization
2014-01-28 18:24:10 +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
0da82a6f0d
am 689a7f30
: am 851b2cb1
: Merge "Make libEGL build cleanly under 64-bit"
...
* commit '689a7f30ccd2e57eaadecedbe30690e2a44ce23a':
Make libEGL build cleanly under 64-bit
2014-01-28 02:29:37 +00: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
dec678dbd2
am a21ba585
: am 55f0668f
: Merge "frameworks/native: convert LOCAL_MODULE_PATH to LOCAL_MODULE_RELATIVE_PATH"
...
* commit 'a21ba5856b6d3bdfcef183e09aa658e69ddb4786':
frameworks/native: convert LOCAL_MODULE_PATH to LOCAL_MODULE_RELATIVE_PATH
2014-01-28 01:02:49 +00: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
25f75c3610
am 8c303f7e
: am fcf9c1ba
: Merge "SurfaceFlinger: mFbFence initialization"
...
* commit '8c303f7e64b3de7748922e6f951d9e82bc96badd':
SurfaceFlinger: mFbFence initialization
2014-01-26 16:47:45 +00: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
dd00090530
am e3aeefd1
: am af29b77a
: Merge "libGLES_android: fix 64-bit compile errors"
...
* commit 'e3aeefd1f8a5ac0e4b2106fc1cf190ad4f75078c':
libGLES_android: fix 64-bit compile errors
2014-01-25 00:44:54 +00: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
03691218ad
am e5f7bf74
: am b6c21004
: Merge "Implement per-display EGLConfig and configless EGLContext"
...
* commit 'e5f7bf7471b21226c9a6b875e9e8f2fb2cba72e2':
Implement per-display EGLConfig and configless EGLContext
2014-01-03 18:31:54 +00:00
Jesse Hall
4c37d0886c
am 6c7dcfa9
: am 662d3134
: Merge "Move EGLConfig selection to RenderEngine"
...
* commit '6c7dcfa956847a9f061fd1b2baa9dc43585599af':
Move EGLConfig selection to RenderEngine
2014-01-03 18:31:53 +00: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
285bfefb01
am c1bf6fa9
: am 7fea2361
: Merge "Track Looper decoupling from ALooper"
...
* commit 'c1bf6fa9495b21f25e7ab1a491b918df71be6e1a':
Track Looper decoupling from ALooper
2013-12-19 07:25:24 +00: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
e2d412f046
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.
2013-12-17 23:12:20 +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