Dmitriy Ivanov
5cf92d4a85
am cb8a9fcc
: Merge "Switch to libsigchain.a"
...
* commit 'cb8a9fcc56288378d05d80c55396db7981e3828d':
Switch to libsigchain.a
2014-10-21 03:30:18 +00:00
Dmitriy Ivanov
cb8a9fcc56
Merge "Switch to libsigchain.a"
2014-10-21 03:14:18 +00:00
Arve Hjønnevåg
d3d53043f5
am 54d613e3
: am bf46706f
: Merge "dumpstate: Add trusty version if driver is found" into lmp-mr1-dev
...
* commit '54d613e33c3c93382ac846509967bac2faf72047':
dumpstate: Add trusty version if driver is found
2014-10-20 22:12:59 +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
0ea6f91cc1
am db618257
: am 042e5078
: Merge "Link sigchain to surfaceflinger main executable" into lmp-mr1-dev
...
* commit 'db61825743d5ad9069d9a4531c8a8854302f4520':
Link sigchain to surfaceflinger main executable
2014-10-20 18:35:48 +00: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
14942c8396
am 937052fb
: (-s ours) am a069e853
: am 649bafb7
: Merge "bufferqueue: workaround: allow NULL fence with queueBuffer (DO NOT MERGE)" into lmp-dev
...
* commit '937052fb1ce8c2c5580e53d60ac771cb8fe7b532':
bufferqueue: workaround: allow NULL fence with queueBuffer (DO NOT MERGE)
2014-10-20 14:36:43 +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
f35a5ba664
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:13:05 +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
f88c64809a
am f65fba5c
: am 899891ec
: am 0b6acb22
: Add version number to SensorService dump output.
...
* commit 'f65fba5cc9b88decc16660068edf878222ebb146':
Add version number to SensorService dump output.
2014-10-19 21:28:34 +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
433fe2af0d
am 0b6acb22
: Add version number to SensorService dump output.
...
* commit '0b6acb2231baed861488f2d181621272d0658d25':
Add version number to SensorService dump output.
2014-10-19 21:05:16 +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
0e978be998
am 3235d8e4
: am c52e54c4
: Merge "Some more test cleanup."
...
* commit '3235d8e477e1a0ad72d22acfff7d9966f882daa6':
Some more test cleanup.
2014-10-17 17:57:51 +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
55833709ab
am c52e54c4
: Merge "Some more test cleanup."
...
* commit 'c52e54c47184704613d446eb15d051ceb43d82b3':
Some more test cleanup.
2014-10-17 17:53:05 +00:00
Dan Albert
c52e54c471
Merge "Some more test cleanup."
2014-10-17 17:43:58 +00:00
Narayan Kamath
6e6d754ecc
am 39efe3e5
: Clean up unused parameter warnings.
...
* commit '39efe3e5bf6282a4851e0eb3b938060c8f7790ae':
Clean up unused parameter warnings.
2014-10-17 11:22:05 +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
Narayan Kamath
97a3367a1b
Clean up unused parameter warnings.
...
Manual application of change 692018430f115343e36b0680acc659f2a731a5d7.
Change-Id: I100f838d70e591a13abb198dc420000ef114a429
2014-10-17 10:37:08 +01: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
1eee62777d
am 108e6334
: am e9034b45
: Merge "Use LOCAL_CLANG := false for GLES wrappers for now"
...
* commit '108e6334c7520cc9fc2f3694e7d4d62db85a97fb':
Use LOCAL_CLANG := false for GLES wrappers for now
2014-10-16 03:13:15 +00: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
82ba423f1c
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:25 +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
68f35a01d0
am 664a72d3
: am 91c395f6
: am 60fd3fee
: Migrate CA certificates to all users
...
* commit '664a72d3ac5e4389041e3a59ff243a5583a4b823':
Migrate CA certificates to all users
2014-10-16 00:07:09 +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
fad2e3abf0
am 27b780b5
: am 9cc84950
: Merge "Don\'t check if this == NULL."
...
* commit '27b780b517eb18582f978da64febb31ecfa8e4bf':
Don't check if this == NULL.
2014-10-15 22:57:13 +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
759115cd6d
am 9cc84950
: Merge "Don\'t check if this == NULL."
...
* commit '9cc849500df0bba42d3ed19b90c38ff1dffd2262':
Don't check if this == NULL.
2014-10-15 22:52:43 +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
0adea3b792
am 60fd3fee
: Migrate CA certificates to all users
...
* commit '60fd3feecab4336d964ca8e31c7c3220e1afb558':
Migrate CA certificates to all users
2014-10-15 19:26:36 +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
a1c1a99e7d
am f0ca2ade
: am 53aad5e7
: am 3454f123
: media: add kMetadataBufferTypeGraphicBuffer
...
* commit 'f0ca2ade534275f624daea5ae3ba907a5c63afa6':
media: add kMetadataBufferTypeGraphicBuffer
2014-10-14 22:29:56 +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
86636a988f
am 88e5118f
: am 26a28149
: Merge "Link sigchain to surfaceflinger main executable"
...
* commit '88e5118f07f38c96d5b438a44c42b0951c65ba0d':
Link sigchain to surfaceflinger main executable
2014-10-14 19:05:26 +00:00
Dmitriy Ivanov
9b9d1a4ee5
am 26a28149
: Merge "Link sigchain to surfaceflinger main executable"
...
* commit '26a2814963de75f14dfbe7cf3d45e993727891cf':
Link sigchain to surfaceflinger main executable
2014-10-14 18:21:44 +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