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
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
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
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
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
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
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
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
27d0e598fd
am 465c8f13
: am 2e5f8eaa
: am ffb49774
: Improve ANR diagnostics.
...
* commit '465c8f1387b231133fb29bdeb0eb685c30e8da00':
Improve ANR diagnostics.
2014-10-12 16:12:42 +00: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
25c5d725f0
am 328f9c25
: am 16410d45
: am 9ea09757
: Fix broken error check in Parcel::readBlob
...
* commit '328f9c259ba9d3586a2496d887a96b610d112b7b':
Fix broken error check in Parcel::readBlob
2014-10-10 18:42:19 +00: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
Jesse Hall
3dbf96cf06
am 20fca75f
: am b7702c5c
: Merge "BufferQueueProducer: Throttle EGL frame production." into lmp-mr1-dev
...
* commit '20fca75fbd9141ebae6c9a28f5c09a837eb9caad':
BufferQueueProducer: Throttle EGL frame production.
2014-10-08 17:04:38 +00: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
011f187373
am e19c39dc
: am 5acc751f
: am 7830ef3d
: Change ordering of memory allocation and calling Thread::run().
...
* commit 'e19c39dccd0cdbbcbe27dd90f224b2012b7dfb74':
Change ordering of memory allocation and calling Thread::run().
2014-10-08 13:14:37 +00: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
f570be2ef9
am f3b5cea6
: am 366998d8
: am 78639c22
: Merge "Parcel: extra validation/debug code for writeDupFileDescriptor" into lmp-dev
...
* commit 'f3b5cea662da350684b9fd7a8f486c42e57bee6d':
Parcel: extra validation/debug code for writeDupFileDescriptor
2014-10-07 00:40:24 +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
Jesse Hall
78639c22ac
Merge "Parcel: extra validation/debug code for writeDupFileDescriptor" into lmp-dev
2014-10-06 22:36:54 +00:00
Jesse Hall
ccf851f108
Parcel: extra validation/debug code for writeDupFileDescriptor
...
Temporary extra debug validation for b/17477219: a Parcel recipient is
getting a positive but invalid fd unexpectedly. Trying to track down
where it's coming from.
Debug code for bug: 17477219
Change-Id: Idb1e71621025a3928c7adc88fd44790e1abd2a01
2014-10-06 15:23:56 -07:00
Aravind Akella
5b8d3eed87
am ae29ee0a
: am 93176114
: am a7eb4b74
: Merge "Fix sockfd leakage in SensorService." into lmp-dev
...
* commit 'ae29ee0a9eea291316248a90799ff28f35defeb6':
Fix sockfd leakage in SensorService.
2014-10-03 23:57:35 +00:00
Aravind Akella
ae29ee0a9e
am 93176114
: am a7eb4b74
: Merge "Fix sockfd leakage in SensorService." into lmp-dev
...
* commit '93176114cf34c9874c2db70fd7665e9f95dda9d0':
Fix sockfd leakage in SensorService.
2014-10-03 22:39:19 +00:00
Eric Penner
99a0afbaee
BufferQueueProducer: Throttle EGL frame production.
...
Throttling was previously controlled by a combination of the
driver and the number of buffers in the queue. This patch makes
a more consistent trade-off, which allows two GPU frames pending
but not three. More buffering could improve throughput in the
case of varying frame times, but this also increases latency.
Bug: 17502897
Change-Id: I4ee68019ca94c635294c5959931a555a6c4ef2df
2014-10-03 14:57:09 -07:00
Aravind Akella
93176114cf
am a7eb4b74
: Merge "Fix sockfd leakage in SensorService." into lmp-dev
...
* commit 'a7eb4b74f74423dafd88adf94a7984ae927c3a23':
Fix sockfd leakage in SensorService.
2014-10-03 21:54:29 +00:00
Aravind Akella
a7eb4b74f7
Merge "Fix sockfd leakage in SensorService." into lmp-dev
2014-10-03 21:45:37 +00:00