Michael Lentine
15b2ecf599
am dcc959be
: Merge "Adding eglInitialize and eglTerminate image creation and deletion." into lmp-mr1-dev
...
* commit 'dcc959beb77099d319a94e3985da2f4ea4064e7b':
Adding eglInitialize and eglTerminate image creation and deletion.
2014-10-21 18:35:24 +00:00
Michael Lentine
dcc959beb7
Merge "Adding eglInitialize and eglTerminate image creation and deletion." into lmp-mr1-dev
2014-10-21 18:20:45 +00:00
Dmitriy Ivanov
8b81ce563f
am cb8a9fcc
: Merge "Switch to libsigchain.a"
...
* commit 'cb8a9fcc56288378d05d80c55396db7981e3828d':
Switch to libsigchain.a
2014-10-21 03:30:55 +00:00
Dmitriy Ivanov
cb8a9fcc56
Merge "Switch to libsigchain.a"
2014-10-21 03:14:18 +00:00
Arve Hjønnevåg
54d613e33c
am bf46706f
: Merge "dumpstate: Add trusty version if driver is found" into lmp-mr1-dev
...
* commit 'bf46706f366f0446e60971e32acfcd221b7f19cf':
dumpstate: Add trusty version if driver is found
2014-10-20 22:07:49 +00:00
Arve Hjønnevåg
bf46706f36
Merge "dumpstate: Add trusty version if driver is found" into lmp-mr1-dev
2014-10-20 21:58:27 +00:00
Dmitriy Ivanov
4340a14fbf
Switch to libsigchain.a
...
Use LOCAL_WHOLE_STATIC_LIBRARIES to instruct static linker
to export symbols from the static library.
Change-Id: I0e41cf173be96c52cdad72b1ef4a1bf819e65dd2
2014-10-20 14:17:26 -07:00
Dmitriy Ivanov
db61825743
am 042e5078
: Merge "Link sigchain to surfaceflinger main executable" into lmp-mr1-dev
...
* commit '042e5078f7444a68d22d706b66ba32efc220c263':
Link sigchain to surfaceflinger main executable
2014-10-20 18:28:14 +00:00
Dmitriy Ivanov
042e5078f7
Merge "Link sigchain to surfaceflinger main executable" into lmp-mr1-dev
2014-10-20 17:14:44 +00:00
Jesse Hall
937052fb1c
am a069e853
: am 649bafb7
: Merge "bufferqueue: workaround: allow NULL fence with queueBuffer (DO NOT MERGE)" into lmp-dev
...
* commit 'a069e8532ba272ac5b935e332e426a3dacf827fc':
bufferqueue: workaround: allow NULL fence with queueBuffer (DO NOT MERGE)
2014-10-20 14:31:38 +00:00
Jesse Hall
a069e8532b
am 649bafb7
: Merge "bufferqueue: workaround: allow NULL fence with queueBuffer (DO NOT MERGE)" into lmp-dev
...
* commit '649bafb7ba2c3204295bc3451ff7af7e28e714ed':
bufferqueue: workaround: allow NULL fence with queueBuffer (DO NOT MERGE)
2014-10-20 14:17:18 +00:00
Jesse Hall
649bafb7ba
Merge "bufferqueue: workaround: allow NULL fence with queueBuffer (DO NOT MERGE)" into lmp-dev
2014-10-20 13:59:25 +00:00
Aravind Akella
f65fba5cc9
am 899891ec
: am 0b6acb22
: Add version number to SensorService dump output.
...
* commit '899891ec95c0581d35f47db7bdea75bd49fdca1b':
Add version number to SensorService dump output.
2014-10-19 21:23:55 +00:00
Aravind Akella
899891ec95
am 0b6acb22
: Add version number to SensorService dump output.
...
* commit '0b6acb2231baed861488f2d181621272d0658d25':
Add version number to SensorService dump output.
2014-10-19 21:14:54 +00:00
Aravind Akella
0b6acb2231
Add version number to SensorService dump output.
...
Change-Id: I64f9482ade523ec3fafe14bff14db7196e32413f
2014-10-19 20:30:58 +00:00
Jesse Hall
5b0cbcf946
bufferqueue: workaround: allow NULL fence with queueBuffer (DO NOT MERGE)
...
On one device there is a bug, not yet root-caused, that causes fence
fds to not make it across binder from producer to consumer in the
IGraphicBufferProducer::queueBuffer call. Rather than returning an
error, which the producer typically treats as a fatal error, this
change allows the buffer to be queued with no fence. This avoids an
application crash at the risk of (likely single-frame) visible
corruption.
Bug: 17946343
Change-Id: I9ca89f94098c455e1e90f5f58d5336c936b04a9c
2014-10-19 04:57:10 +00:00
Dan Albert
3235d8e477
am c52e54c4
: Merge "Some more test cleanup."
...
* commit 'c52e54c47184704613d446eb15d051ceb43d82b3':
Some more test cleanup.
2014-10-17 17:53:10 +00:00
Dan Albert
c52e54c471
Merge "Some more test cleanup."
2014-10-17 17:43:58 +00:00
Narayan Kamath
39efe3e5bf
Clean up unused parameter warnings.
...
Manual application of change 692018430f115343e36b0680acc659f2a731a5d7.
Change-Id: I100f838d70e591a13abb198dc420000ef114a429
(cherry picked from commit 97a3367a1b
)
2014-10-17 10:12:58 +00:00
Dan Albert
ed7d193ae9
Some more test cleanup.
...
Needed to build successfully when libc++ is the default STL.
Also fix a missing include. Not sure how this was getting by before.
Probably some transitive include.
Change-Id: Ie96b79e96b4e154d786fbf2d5ae5cf5892608837
2014-10-16 20:46:05 -07:00
Arve Hjønnevåg
2db0f5f31c
dumpstate: Add trusty version if driver is found
...
Change-Id: I7780ea8e1d777c222a73408f70d8a6d49dee1d92
2014-10-16 16:11:07 -07:00
Dmitriy Ivanov
2b1f2dac93
Link sigchain to surfaceflinger main executable
...
And export necessary symbols to preempt calls from libart.so
Bug: 15345057
Bug: 15426766
(cherry picked from commit f3da24d8cf
)
Change-Id: I03b632e0bf2cbaf4a0e68cd0af4e991f7f6b08e4
2014-10-16 11:43:19 -07:00
Chih-hung Hsieh
108e6334c7
am e9034b45
: Merge "Use LOCAL_CLANG := false for GLES wrappers for now"
...
* commit 'e9034b4502ae6e693ad52fe2e435066dc969a3ab':
Use LOCAL_CLANG := false for GLES wrappers for now
2014-10-16 03:06:42 +00:00
Chih-hung Hsieh
e9034b4502
Merge "Use LOCAL_CLANG := false for GLES wrappers for now"
2014-10-16 02:52:35 +00:00
Robin Lee
664a72d3ac
am 91c395f6
: am 60fd3fee
: Migrate CA certificates to all users
...
* commit '91c395f6c344682f1ae5926766d4d7247dee6df4':
Migrate CA certificates to all users
2014-10-15 23:57:04 +00:00
Robin Lee
91c395f6c3
am 60fd3fee
: Migrate CA certificates to all users
...
* commit '60fd3feecab4336d964ca8e31c7c3220e1afb558':
Migrate CA certificates to all users
2014-10-15 23:25:00 +00:00
Dan Albert
27b780b517
am 9cc84950
: Merge "Don\'t check if this == NULL."
...
* commit '9cc849500df0bba42d3ed19b90c38ff1dffd2262':
Don't check if this == NULL.
2014-10-15 22:52:51 +00:00
Dan Albert
9cc849500d
Merge "Don't check if this == NULL."
2014-10-15 22:45:07 +00:00
Bernhard Rosenkraenzer
d3684aeda5
Use LOCAL_CLANG := false for GLES wrappers for now
...
GLES wrappers built with clang currently result in crashes in libhwui,
UI doesn't come up.
Force gcc for the wrappers until this is investigated and fixed
properly.
Bug: 18003438
Change-Id: I24a17ec019409930883da8040fe2fb05b0fea0c5
Signed-off-by: Bernhard Rosenkraenzer <Bernhard.Rosenkranzer@linaro.org>
2014-10-15 22:23:42 +00:00
Robin Lee
60fd3feeca
Migrate CA certificates to all users
...
Copies the /data/misc/keychain/cacert-* directories to all users on
the device, whereas previously they were simply copied to user 0.
This is a shallow copy so anything that wasn't supposed to be there
will disappear.
Bug: 17811821
Change-Id: Iae5909ab8d5efdb83c9c8fdf0e10ab7060d022cc
2014-10-15 19:04:33 +00:00
Lajos Molnar
f0ca2ade53
am 53aad5e7
: am 3454f123
: media: add kMetadataBufferTypeGraphicBuffer
...
* commit '53aad5e7de7619cbc9b0d9a0a0830fc29c331f8d':
media: add kMetadataBufferTypeGraphicBuffer
2014-10-14 22:24:22 +00:00
Lajos Molnar
53aad5e7de
am 3454f123
: media: add kMetadataBufferTypeGraphicBuffer
...
* commit '3454f123d0a10bd0ce0760828996aa26c80a8fd4':
media: add kMetadataBufferTypeGraphicBuffer
2014-10-14 19:56:24 +00:00
Dmitriy Ivanov
88e5118f07
am 26a28149
: Merge "Link sigchain to surfaceflinger main executable"
...
* commit '26a2814963de75f14dfbe7cf3d45e993727891cf':
Link sigchain to surfaceflinger main executable
2014-10-14 18:21:24 +00:00
Dmitriy Ivanov
26a2814963
Merge "Link sigchain to surfaceflinger main executable"
2014-10-14 17:37:53 +00:00
Lajos Molnar
3454f123d0
media: add kMetadataBufferTypeGraphicBuffer
...
Bug: 17935149
Change-Id: I1c26d1e83d8fa0a9ccdb25f6f3b19a86b1dc6f37
2014-10-13 22:58:03 -07:00
Jeff Brown
465c8f1387
am 2e5f8eaa
: am ffb49774
: Improve ANR diagnostics.
...
* commit '2e5f8eaa7dbb43e5a46eda7a3d1d895f7584a122':
Improve ANR diagnostics.
2014-10-12 16:10:21 +00:00
Jeff Brown
2e5f8eaa7d
am ffb49774
: Improve ANR diagnostics.
...
* commit 'ffb497743831ae4857b674629b58ea3c46d01431':
Improve ANR diagnostics.
2014-10-12 16:02:22 +00:00
Jeff Brown
ffb4977438
Improve ANR diagnostics.
...
Print more details about the exact reason that an ANR has occurred.
Also start checking that the window actually has a registered
input connection that is not in a broken state. These windows
are supposed to be cleaned up by the window manager promptly
as if the app had crashed but the pattern of ANRs we are observing
suggests that broken windows might be sticking around longer than
they should.
Bug: 17721767
Change-Id: Ie2803a3fa9642381ecadc198fec15e1b70d93c20
2014-10-10 19:09:39 -07:00
Narayan Kamath
328f9c259b
am 16410d45
: am 9ea09757
: Fix broken error check in Parcel::readBlob
...
* commit '16410d458fdf9915dc8cb82b1bae3949a8100124':
Fix broken error check in Parcel::readBlob
2014-10-10 17:00:18 +00:00
Dmitriy Ivanov
f3da24d8cf
Link sigchain to surfaceflinger main executable
...
And export necessary symbols to preempt calls from libart.so
Bug: 15345057
Bug: 15426766
Change-Id: If0b7f59a59824e30aa0c33dad76c7a44932180de
2014-10-09 15:20:25 -07:00
Narayan Kamath
16410d458f
am 9ea09757
: Fix broken error check in Parcel::readBlob
...
* commit '9ea09757fa63ad2a9bea9c846b51c1210d69c79f':
Fix broken error check in Parcel::readBlob
2014-10-09 19:17:44 +00:00
Michael Lentine
78be65e7bf
Adding eglInitialize and eglTerminate image creation and deletion.
...
Previously it was possible to have the driver's eglTerminate called beofre
eglDestroyImageKHR in GLConsumer. This was because we didn't increment the
refcount for the lifetime of the image. This could lead to a crash or a deadlock
when multiple threads called terminate and destroy simultaneously.
Bug: 17700483
Change-Id: I7010d0f1b3db875332e95630b5e098a5564ba755
2014-10-09 10:26:37 -07:00
Jesse Hall
20fca75fbd
am b7702c5c
: Merge "BufferQueueProducer: Throttle EGL frame production." into lmp-mr1-dev
...
* commit 'b7702c5ce7f010fa5f19646fd79f28ff04e7014b':
BufferQueueProducer: Throttle EGL frame production.
2014-10-08 16:59:38 +00:00
Jesse Hall
b7702c5ce7
Merge "BufferQueueProducer: Throttle EGL frame production." into lmp-mr1-dev
2014-10-08 16:50:13 +00:00
Narayan Kamath
9ea09757fa
Fix broken error check in Parcel::readBlob
...
mmap returns MAP_FAILED (which is -1) and not NULL on
failure.
Diagnosed by cferris.
bug: 17909809
Change-Id: I609788ebf94742ef88af002d2d3f3bc9b9e520ac
2014-10-08 17:37:38 +01:00
Aravind Akella
e19c39dccd
am 5acc751f
: am 7830ef3d
: Change ordering of memory allocation and calling Thread::run().
...
* commit '5acc751ffea2fab38f7fcc4e06866640e70174e4':
Change ordering of memory allocation and calling Thread::run().
2014-10-08 07:51:58 +00:00
Aravind Akella
5acc751ffe
am 7830ef3d
: Change ordering of memory allocation and calling Thread::run().
...
* commit '7830ef3dd0ff3749d974c2dd85a8fa59dc47aeca':
Change ordering of memory allocation and calling Thread::run().
2014-10-08 05:24:50 +00:00
Aravind Akella
7830ef3dd0
Change ordering of memory allocation and calling Thread::run().
...
In some cases this is causing a crash as device.poll is called with
NULL.
Bug: 17896339
Change-Id: Id431599f2c661338c355c7081b6602f8449a9198
2014-10-07 21:20:12 +00:00
Jesse Hall
f3b5cea662
am 366998d8
: am 78639c22
: Merge "Parcel: extra validation/debug code for writeDupFileDescriptor" into lmp-dev
...
* commit '366998d87109578eb8c33d2e94d61fe7f189beb8':
Parcel: extra validation/debug code for writeDupFileDescriptor
2014-10-07 00:34:57 +00:00
Jesse Hall
366998d871
am 78639c22
: Merge "Parcel: extra validation/debug code for writeDupFileDescriptor" into lmp-dev
...
* commit '78639c22acfa5e56d87fd6fe8340d083536b29fc':
Parcel: extra validation/debug code for writeDupFileDescriptor
2014-10-07 00:19:38 +00:00