OSDN Git Service
Colin Cross [Thu, 6 Feb 2014 03:07:47 +0000 (03:07 +0000)]
am
2b957503: am
74be0f7b: Merge "binder: fix all warnings"
* commit '
2b957503b77c938e0698ffa8904e20c38c408d81':
binder: fix all warnings
Colin Cross [Thu, 6 Feb 2014 02:59:37 +0000 (02:59 +0000)]
am
74be0f7b: Merge "binder: fix all warnings"
* commit '
74be0f7be35e7b40a322fa9a407cb49265333a0b':
binder: fix all warnings
Colin Cross [Thu, 6 Feb 2014 02:06:42 +0000 (02:06 +0000)]
Merge "binder: fix all warnings"
Colin Cross [Thu, 6 Feb 2014 01:42:44 +0000 (17:42 -0800)]
binder: fix all warnings
Fix warnings related to casting pointers to ints, using %d or %ld to
print size_t/ssize_t, and unused parameters.
Change-Id: I7a13ba83d402952989c1f795cd9e880a95b98d9e
Dan Stoza [Wed, 5 Feb 2014 18:55:10 +0000 (18:55 +0000)]
Merge "Fix virtual display nesting"
Andrew Hsieh [Wed, 5 Feb 2014 08:06:22 +0000 (08:06 +0000)]
am
bdab63e0: am
055dac1b: Merge "Fixed apparent copy/paste mistake Bug:
11634373"
* commit '
bdab63e06b6bacb60991420891cb06fe3dc5654f':
Fixed apparent copy/paste mistake Bug:
11634373
Andrew Hsieh [Wed, 5 Feb 2014 07:58:00 +0000 (07:58 +0000)]
am
055dac1b: Merge "Fixed apparent copy/paste mistake Bug:
11634373"
* commit '
055dac1b54af46a0608b32e83fcae45e75a4a8f0':
Fixed apparent copy/paste mistake Bug:
11634373
Andrew Hsieh [Wed, 5 Feb 2014 07:16:30 +0000 (07:16 +0000)]
Merge "Fixed apparent copy/paste mistake Bug:
11634373"
David Friedman [Wed, 5 Feb 2014 03:11:33 +0000 (11:11 +0800)]
Fixed apparent copy/paste mistake
Bug:
11634373
Change-Id: I9b0ac4d3b4a9a2999b2013abd39465a062ec51ea
Dan Stoza [Wed, 5 Feb 2014 00:22:36 +0000 (16:22 -0800)]
Fix virtual display nesting
This fixes the cycling rendering loop caused by nesting virtual
displays by preventing them from recomposing if their contents
haven't changed.
Bug:
12101046
Change-Id: I600365c0fd5d3ad93e04295d26cf9de177ffc79b
Siva Velusamy [Tue, 4 Feb 2014 19:25:21 +0000 (19:25 +0000)]
am
67041e68: am
fd6a3ff4: Merge "GLES_trace: fix compile errors on 64 bit architectures"
* commit '
67041e6841d89efb0dbaf4562b601b80be61e1e6':
GLES_trace: fix compile errors on 64 bit architectures
Siva Velusamy [Tue, 4 Feb 2014 19:19:38 +0000 (19:19 +0000)]
am
fd6a3ff4: Merge "GLES_trace: fix compile errors on 64 bit architectures"
* commit '
fd6a3ff4b4dda34f8e6e03989dd7466e4cbd8b0e':
GLES_trace: fix compile errors on 64 bit architectures
Siva Velusamy [Tue, 4 Feb 2014 19:14:06 +0000 (19:14 +0000)]
Merge "GLES_trace: fix compile errors on 64 bit architectures"
Changwan Ryu [Tue, 4 Feb 2014 15:40:03 +0000 (15:40 +0000)]
am
dc425805: (-s ours) am
e636692a: [DO NOT MERGE] Extend OpenMAX IL definitions to support AC3
* commit '
dc425805b27cad16922ebf51b8504bdf7ab4ddfd':
[DO NOT MERGE] Extend OpenMAX IL definitions to support AC3
Changwan Ryu [Tue, 4 Feb 2014 07:31:42 +0000 (07:31 +0000)]
am
e636692a: [DO NOT MERGE] Extend OpenMAX IL definitions to support AC3
* commit '
e636692a2eecead363f06297e7b5b379079331da':
[DO NOT MERGE] Extend OpenMAX IL definitions to support AC3
Arve Hjønnevåg [Tue, 4 Feb 2014 02:10:18 +0000 (02:10 +0000)]
am
8641112a: am
4e7fd950: Merge "Use 64 bit binder interface if TARGET_USES_64_BIT_BINDER _or_ TARGET_IS_64_BIT is set."
* commit '
8641112a1c3d4ff3ed68131d07eed01b715ac906':
Use 64 bit binder interface if TARGET_USES_64_BIT_BINDER _or_ TARGET_IS_64_BIT is set.
Arve Hjønnevåg [Tue, 4 Feb 2014 02:01:45 +0000 (02:01 +0000)]
am
4e7fd950: Merge "Use 64 bit binder interface if TARGET_USES_64_BIT_BINDER _or_ TARGET_IS_64_BIT is set."
* commit '
4e7fd9506103dcc9750788caf1f94b8d1348f37b':
Use 64 bit binder interface if TARGET_USES_64_BIT_BINDER _or_ TARGET_IS_64_BIT is set.
Arve Hjønnevåg [Tue, 4 Feb 2014 00:48:12 +0000 (00:48 +0000)]
Merge "Use 64 bit binder interface if TARGET_USES_64_BIT_BINDER _or_ TARGET_IS_64_BIT is set."
Arve Hjønnevåg [Mon, 3 Feb 2014 22:46:30 +0000 (14:46 -0800)]
Use 64 bit binder interface if TARGET_USES_64_BIT_BINDER _or_ TARGET_IS_64_BIT is set.
Change-Id: I46a29939fa29ec9421ab6dff3285502f69a31745
Arve Hjønnevåg [Mon, 3 Feb 2014 22:11:16 +0000 (22:11 +0000)]
am
c93865de: am
58242fc2: Merge changes Ib0e5a037,I1bd7c38e,Icfc67c2a,I96c64312,I59528054, ...
* commit '
c93865de80a16d3638936890fb42eb175284044b':
ServiceManager: Implement PING_TRANSACTION
ServiceManager: Use 32/64 bit types from new binder header
Binder: Use 64 bit pointers in 32 processes if selected by the target
Add BINDER_IPC_32BIT to CFLAGS unless TARGET_USES_64_BIT_BINDER is true
Binder: Make binder portable
ServiceManager: Fix the binder interface
ServiceManager: Store handles in uint32_t instead of void *
ServiceManager: Generic Fixes
ServiceManager: Add extra error handling
ServiceManager: Fix Android.mk
ServiceManager: Make use of kernel exported structures
Arve Hjønnevåg [Mon, 3 Feb 2014 21:18:35 +0000 (21:18 +0000)]
am
58242fc2: Merge changes Ib0e5a037,I1bd7c38e,Icfc67c2a,I96c64312,I59528054, ...
* commit '
58242fc29881cf29d56ee6e5fde6d73b16d0b67c':
ServiceManager: Implement PING_TRANSACTION
ServiceManager: Use 32/64 bit types from new binder header
Binder: Use 64 bit pointers in 32 processes if selected by the target
Add BINDER_IPC_32BIT to CFLAGS unless TARGET_USES_64_BIT_BINDER is true
Binder: Make binder portable
ServiceManager: Fix the binder interface
ServiceManager: Store handles in uint32_t instead of void *
ServiceManager: Generic Fixes
ServiceManager: Add extra error handling
ServiceManager: Fix Android.mk
ServiceManager: Make use of kernel exported structures
Arve Hjønnevåg [Mon, 3 Feb 2014 21:12:57 +0000 (21:12 +0000)]
Merge changes Ib0e5a037,I1bd7c38e,Icfc67c2a,I96c64312,I59528054, ...
* changes:
ServiceManager: Implement PING_TRANSACTION
ServiceManager: Use 32/64 bit types from new binder header
Binder: Use 64 bit pointers in 32 processes if selected by the target
Add BINDER_IPC_32BIT to CFLAGS unless TARGET_USES_64_BIT_BINDER is true
Binder: Make binder portable
ServiceManager: Fix the binder interface
ServiceManager: Store handles in uint32_t instead of void *
ServiceManager: Generic Fixes
ServiceManager: Add extra error handling
ServiceManager: Fix Android.mk
ServiceManager: Make use of kernel exported structures
Changwan Ryu [Mon, 28 Oct 2013 02:32:47 +0000 (11:32 +0900)]
[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
Arve Hjønnevåg [Wed, 29 Jan 2014 05:35:03 +0000 (21:35 -0800)]
ServiceManager: Implement PING_TRANSACTION
Stop printing "invalid id " to stderr every time a process tries to
connect to the servicemanager.
Change-Id: Ib0e5a0375bfa2dec2c2f9cd668bd5dda46ed6588
Arve Hjønnevåg [Wed, 29 Jan 2014 05:25:12 +0000 (21:25 -0800)]
ServiceManager: Use 32/64 bit types from new binder header
Change-Id: I1bd7c38ed9f43125cf9c63aa533434ee7ca06f80
Arve Hjønnevåg [Wed, 29 Jan 2014 04:12:59 +0000 (20:12 -0800)]
Binder: Use 64 bit pointers in 32 processes if selected by the target
Uses new kernel header where void * has been replaced by binder_uintptr_t
Change-Id: Icfc67c2a279269f700343bd9246fd7cb94efe2c1
Arve Hjønnevåg [Wed, 29 Jan 2014 03:57:02 +0000 (19:57 -0800)]
Add BINDER_IPC_32BIT to CFLAGS unless TARGET_USES_64_BIT_BINDER is true
Change-Id: I96c643123b0314c361b7f48a18d5c22c660d4ff5
Aravind Akella [Fri, 31 Jan 2014 22:49:30 +0000 (22:49 +0000)]
am
e8df30b8: am
ebff73c3: Bug fix for SensorFusion data rate.
* commit '
e8df30b87014457d5d20dc823a42c8016baad929':
Bug fix for SensorFusion data rate.
Aravind Akella [Fri, 31 Jan 2014 22:39:41 +0000 (22:39 +0000)]
am
ebff73c3: Bug fix for SensorFusion data rate.
* commit '
ebff73c37d5f1581702430f4a0348c160b99b57e':
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
Brian Carlstrom [Fri, 31 Jan 2014 16:26:39 +0000 (16:26 +0000)]
am
e0dd0b85: am
af3efe8c: Merge "frameworks/native: Rename persist.sys.dalvik.vm.lib to allow new default"
* commit '
e0dd0b85145f4a9c004019feaeb9bc27ab98f9ad':
frameworks/native: Rename persist.sys.dalvik.vm.lib to allow new default
Brian Carlstrom [Fri, 31 Jan 2014 12:34:20 +0000 (12:34 +0000)]
am
af3efe8c: Merge "frameworks/native: Rename persist.sys.dalvik.vm.lib to allow new default"
* commit '
af3efe8ce7e2eeb7a98552af5cf38d8a9720f018':
frameworks/native: Rename persist.sys.dalvik.vm.lib to allow new default
Serban Constantinescu [Tue, 5 Nov 2013 16:53:55 +0000 (16:53 +0000)]
Binder: Make binder portable
Changes include
- Binder attempts to cast pointers to a int datatype
which is not sufficient on a 64-bit platform.
- This patch introduces new read/write functions into
Parcel that allow pointers to be written using the
uintptr_t datatype for compile-time data type size
selection.
- Change access specifier for the methods above.
- Binder uses the 64bit android_atomic_release_cas64
(aka cmpxchg)
Change-Id: I595280541e0ba1d19c94b2ca2127bf9d96efabf1
Signed-off-by: Matthew Leach <matthew.leach@arm.com>
Signed-off-by: Serban Constantinescu <serban.constantinescu@arm.com>
Serban Constantinescu [Thu, 19 Dec 2013 09:11:41 +0000 (09:11 +0000)]
ServiceManager: Fix the binder interface
This patch adds support for binder transactions on 64bit systems
without breaking the existing 32bit ABI. It has been tested on
the Android emulator and ARMv8 Model.
Most of the changes in this patch just follow the binder ABI.
Change-Id: I8c37b847ea65008d56554d34d4696fe3d22f7533
Signed-off-by: Serban Constantinescu <serban.constantinescu@arm.com>
Serban Constantinescu [Thu, 30 Jan 2014 14:07:34 +0000 (14:07 +0000)]
ServiceManager: Store handles in uint32_t instead of void *
This patch corrects the types used for storing handles.
Change-Id: If9c10782345f1de9e12b4b3fd6be9e02e6b568cd
Signed-off-by: Serban Constantinescu <serban.constantinescu@arm.com>
Serban Constantinescu [Fri, 10 Jan 2014 15:48:29 +0000 (15:48 +0000)]
ServiceManager: Generic Fixes
This patch fixes some of the ServiceManager issues. The following patches
of the series add fixes to the ABI.
Change-Id: Ib479234c8704e12592f1b149ddec67881bc50230
Signed-off-by: Serban Constantinescu <serban.constantinescu@arm.com>
Serban Constantinescu [Thu, 30 Jan 2014 15:16:45 +0000 (15:16 +0000)]
ServiceManager: Add extra error handling
This patch extends the error handling. It also adds a check for a matching
binder version - kernel/userspace.
Change-Id: I43a262934b38c5711536aaa42754fed1ef04b39e
Signed-off-by: Serban Constantinescu <serban.constantinescu@arm.com>
Serban Constantinescu [Thu, 30 Jan 2014 14:58:32 +0000 (14:58 +0000)]
ServiceManager: Fix Android.mk
This patch fixes Android.mk and enables building bctest as an optional
module without any extra hacks.
Change-Id: Icaf8bf9452776db2ea4a2ba75f3abf05b4e2cdab
Signed-off-by: Serban Constantinescu <serban.constantinescu@arm.com>
Serban Constantinescu [Fri, 10 Jan 2014 13:56:27 +0000 (13:56 +0000)]
ServiceManager: Make use of kernel exported structures
This patch switches ServiceManager to use the structures exported in the
kernel headers rather then redefining its own.
struct binder_txn is replaced with struct binder_transaction_data and struct
binder_object with struct flat_binder_object, both defined in the binder driver
header <linux/binder.h>.
Change-Id: I3b3e97918173ea35a289e184774ae06193192da3
Signed-off-by: Serban Constantinescu <serban.constantinescu@arm.com>
Brian Carlstrom [Thu, 30 Jan 2014 21:14:01 +0000 (13:14 -0800)]
frameworks/native: Rename persist.sys.dalvik.vm.lib to allow new default
Bug:
12798969
(cherry picked from commit
0c05d3aca6d63625513d5f42706e81c2d7834fd9)
Change-Id: I3db785c3f8a3d242d7a0127ed5bec9ecca67f52c
Brian Carlstrom [Thu, 30 Jan 2014 21:50:56 +0000 (21:50 +0000)]
Merge "frameworks/native: Rename persist.sys.dalvik.vm.lib to allow new default"
Andy McFadden [Thu, 30 Jan 2014 21:42:02 +0000 (21:42 +0000)]
Merge "Allow "opaque" flag to be updated"
Brian Carlstrom [Thu, 30 Jan 2014 21:14:01 +0000 (13:14 -0800)]
frameworks/native: Rename persist.sys.dalvik.vm.lib to allow new default
Bug:
12798969
Change-Id: I6b40317eceb3d89b0acff88238a9a9ab423c4d78
Andy McFadden [Thu, 30 Jan 2014 01:17:11 +0000 (17:17 -0800)]
Allow "opaque" flag to be updated
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
Dan Stoza [Thu, 30 Jan 2014 00:47:31 +0000 (00:47 +0000)]
Merge "libgui: Fix segfault in SRGB tests"
Dan Stoza [Wed, 29 Jan 2014 22:33:57 +0000 (14:33 -0800)]
libgui: Fix segfault in SRGB tests
Make the test exit cleanly if the output buffer is never mapped.
Bug:
12761226
Change-Id: If789f02198851a17b11ee06f612f9ba7e06da754
John Spurlock [Wed, 29 Jan 2014 19:14:40 +0000 (14:14 -0500)]
Dump system settings for all users
Change-Id: Ic832b19fe698da1984876b2949c3f26990ae5076
Siva Velusamy [Tue, 28 Jan 2014 22:08:46 +0000 (14:08 -0800)]
GLES_trace: fix compile errors on 64 bit architectures
GLES_trace passes some pointers back to the host. Encode them
using int64's rather than int32's
This fix requires an update to the host tool to look at pointers
as 64 bit, and if not found, then fall back to 32 bit integers.
Change-Id: I11ff2ca51290f05913c1b9143cecee1caf015543
Jesse Hall [Tue, 28 Jan 2014 18:26:56 +0000 (18:26 +0000)]
am
ade9a911: am
f65ebc3b: am
f5bcb391: Merge "SurfaceFlinger: mFbProducerSlot initailization"
* commit '
ade9a911d04dbd4bfbd3e80a917ea67a581b4797':
SurfaceFlinger: mFbProducerSlot initailization
Jesse Hall [Tue, 28 Jan 2014 18:24:10 +0000 (18:24 +0000)]
am
f65ebc3b: am
f5bcb391: Merge "SurfaceFlinger: mFbProducerSlot initailization"
* commit '
f65ebc3be4d3a2e4c71c401d0e53f2ad5798be2a':
SurfaceFlinger: mFbProducerSlot initailization
Jesse Hall [Tue, 28 Jan 2014 18:22:35 +0000 (18:22 +0000)]
am
f5bcb391: Merge "SurfaceFlinger: mFbProducerSlot initailization"
* commit '
f5bcb391c5a4282fa5fe14856faf1423a2bc44c5':
SurfaceFlinger: mFbProducerSlot initailization
Jesse Hall [Tue, 28 Jan 2014 18:17:46 +0000 (18:17 +0000)]
Merge "SurfaceFlinger: mFbProducerSlot initailization"
mayank parshar [Thu, 23 Jan 2014 09:38:31 +0000 (15:08 +0530)]
SurfaceFlinger: mFbProducerSlot initailization
b/
12487813
SurfaceFlinger crash is observed during simulation of
Secondary display
Note: change
14e8b01a761180250671f3d6494532d8bd04fa8e
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>
Colin Cross [Tue, 28 Jan 2014 02:35:36 +0000 (02:35 +0000)]
am
0da82a6f: am
689a7f30: am
851b2cb1: Merge "Make libEGL build cleanly under 64-bit"
* commit '
0da82a6f0d5b7f6466aa4622fc4cf1547f208499':
Make libEGL build cleanly under 64-bit
Colin Cross [Tue, 28 Jan 2014 02:29:37 +0000 (02:29 +0000)]
am
689a7f30: am
851b2cb1: Merge "Make libEGL build cleanly under 64-bit"
* commit '
689a7f30ccd2e57eaadecedbe30690e2a44ce23a':
Make libEGL build cleanly under 64-bit
Colin Cross [Tue, 28 Jan 2014 02:27:41 +0000 (02:27 +0000)]
am
851b2cb1: Merge "Make libEGL build cleanly under 64-bit"
* commit '
851b2cb18c329e0d19f9f56f68425b714007a274':
Make libEGL build cleanly under 64-bit
Colin Cross [Tue, 28 Jan 2014 02:22:11 +0000 (02:22 +0000)]
Merge "Make libEGL build cleanly under 64-bit"
Dan Stoza [Fri, 17 Jan 2014 19:38:34 +0000 (11:38 -0800)]
Make libEGL build cleanly under 64-bit
Change-Id: I255dfb70b166b7469d59352b1acfc7aececa07de
Colin Cross [Tue, 28 Jan 2014 01:12:47 +0000 (01:12 +0000)]
am
dec678db: am
a21ba585: am
55f0668f: Merge "frameworks/native: convert LOCAL_MODULE_PATH to LOCAL_MODULE_RELATIVE_PATH"
* commit '
dec678dbd240e5c53afac8c3901d5beb23706378':
frameworks/native: convert LOCAL_MODULE_PATH to LOCAL_MODULE_RELATIVE_PATH
Colin Cross [Tue, 28 Jan 2014 01:02:49 +0000 (01:02 +0000)]
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
Colin Cross [Tue, 28 Jan 2014 00:59:40 +0000 (00:59 +0000)]
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
Colin Cross [Tue, 28 Jan 2014 00:48:31 +0000 (00:48 +0000)]
Merge "frameworks/native: convert LOCAL_MODULE_PATH to LOCAL_MODULE_RELATIVE_PATH"
Colin Cross [Sat, 25 Jan 2014 05:00:32 +0000 (21:00 -0800)]
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
Adam Lesinski [Mon, 27 Jan 2014 18:29:16 +0000 (10:29 -0800)]
Moved androidfw back to frameworks/base
Change-Id: Idd57bbbc86c936cbfd60e02f8ac8d4f8fbc94592
Narayan Kamath [Fri, 24 Jan 2014 13:51:51 +0000 (13:51 +0000)]
AssetManager cookies should be int32_t and not void*.
Cookies are really indices into vectors and arrays, so
they don't need to be void*. We choose int32_t instead
of size_t to allow their width to be well specified.
Change-Id: I319f271bd4f102dee7cb9f00df4c75ea697456f5
Jesse Hall [Sun, 26 Jan 2014 16:50:36 +0000 (16:50 +0000)]
am
25f75c36: am
8c303f7e: am
fcf9c1ba: Merge "SurfaceFlinger: mFbFence initialization"
* commit '
25f75c361098086ffa2b87dcc3f22ac5f64c05be':
SurfaceFlinger: mFbFence initialization
Jesse Hall [Sun, 26 Jan 2014 16:47:45 +0000 (16:47 +0000)]
am
8c303f7e: am
fcf9c1ba: Merge "SurfaceFlinger: mFbFence initialization"
* commit '
8c303f7e64b3de7748922e6f951d9e82bc96badd':
SurfaceFlinger: mFbFence initialization
Jesse Hall [Sun, 26 Jan 2014 16:45:40 +0000 (08:45 -0800)]
am
fcf9c1ba: Merge "SurfaceFlinger: mFbFence initialization"
* commit '
fcf9c1bafb251c186191b9d066ed00d0b59b962a':
SurfaceFlinger: mFbFence initialization
Jesse Hall [Sun, 26 Jan 2014 08:15:15 +0000 (08:15 +0000)]
Merge "SurfaceFlinger: mFbFence initialization"
mayank parshar [Fri, 10 Jan 2014 04:57:45 +0000 (10:27 +0530)]
SurfaceFlinger: mFbFence initialization
MobC00383030
b/
12487813
SurfaceFlinger crash is observed while connecting
to Wi-Fi display.
Note: change
14e8b01a761180250671f3d6494532d8bd04fa8e
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>
Colin Cross [Sat, 25 Jan 2014 00:50:21 +0000 (00:50 +0000)]
am
dd000905: am
e3aeefd1: am
af29b77a: Merge "libGLES_android: fix 64-bit compile errors"
* commit '
dd00090530340de22ca60f79446b5fe3050cd95f':
libGLES_android: fix 64-bit compile errors
Colin Cross [Sat, 25 Jan 2014 00:44:54 +0000 (00:44 +0000)]
am
e3aeefd1: am
af29b77a: Merge "libGLES_android: fix 64-bit compile errors"
* commit '
e3aeefd1f8a5ac0e4b2106fc1cf190ad4f75078c':
libGLES_android: fix 64-bit compile errors
Colin Cross [Sat, 25 Jan 2014 00:42:36 +0000 (16:42 -0800)]
am
af29b77a: Merge "libGLES_android: fix 64-bit compile errors"
* commit '
af29b77ab7dab5a1b5af27e7f7eeeb14584c101c':
libGLES_android: fix 64-bit compile errors
Colin Cross [Sat, 25 Jan 2014 00:38:15 +0000 (00:38 +0000)]
Merge "libGLES_android: fix 64-bit compile errors"
Colin Cross [Fri, 24 Jan 2014 22:35:39 +0000 (14:35 -0800)]
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
Dan Stoza [Fri, 17 Jan 2014 19:38:34 +0000 (11:38 -0800)]
Make libEGL build cleanly under 64-bit
Change-Id: I255dfb70b166b7469d59352b1acfc7aececa07de
Guang Zhu [Wed, 15 Jan 2014 23:57:32 +0000 (15:57 -0800)]
releax wait timeout on start of dumpstate service
Bug:
12181612
Change-Id: If7ae97de1e42890dac37d036ead669ccda65e688
Dan Stoza [Wed, 8 Jan 2014 17:48:13 +0000 (17:48 +0000)]
Merge "libgui: Add a test for SRGB surfaces"
Dan Stoza [Tue, 7 Jan 2014 23:25:02 +0000 (15:25 -0800)]
libgui: Add a test for SRGB surfaces
Add SRGBTest.RenderToSRGBSurface, which validates that passing the
SRGB colorspace attributes to eglCreateWindowSurface actually
results in an SRGB surface by comparing the output values to those
of a standard RGB surface.
Change-Id: I3d5fef8070ed8fa2357ddd1c5fcc849ae3fbd12a
Andy McFadden [Tue, 7 Jan 2014 23:54:17 +0000 (15:54 -0800)]
Improve error message
The previous message indicated that the fault was due to an already-
connected window, which was misleading at times.
Bug
12439318
Change-Id: I1e0a042673dd245d1b0d237af963c52946803eb6
Jesse Hall [Fri, 3 Jan 2014 18:36:29 +0000 (18:36 +0000)]
am
03691218: am
e5f7bf74: am
b6c21004: Merge "Implement per-display EGLConfig and configless EGLContext"
* commit '
03691218ada2fb7e084ad4ae7ddd54f9b28d5611':
Implement per-display EGLConfig and configless EGLContext
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:54 +0000 (18:31 +0000)]
am
e5f7bf74: am
b6c21004: Merge "Implement per-display EGLConfig and configless EGLContext"
* commit '
e5f7bf7471b21226c9a6b875e9e8f2fb2cba72e2':
Implement per-display EGLConfig and configless EGLContext
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:11 +0000 (10:30 -0800)]
am
b6c21004: Merge "Implement per-display EGLConfig and configless EGLContext"
* commit '
b6c2100458bd4dda880ec24dc7d1f39825d5243d':
Implement per-display EGLConfig and configless EGLContext
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:25:07 +0000 (18:25 +0000)]
Merge "Implement per-display EGLConfig and configless EGLContext"
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 05:02:15 +0000 (21:02 -0800)]
Implement per-display EGLConfig and configless EGLContext
Bug:
12230666
Change-Id: Icca608b108cbdcab9cf01a9236d8cdbda000a836
Signed-off-by: Jesse Hall <jessehall@google.com>
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."