The Android Automerger
988df07865
merge in lmp-mr1-release history after reset to 53aad5e7de
2014-10-15 06:11:48 -07: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
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
Dmitriy Ivanov
26a2814963
Merge "Link sigchain to surfaceflinger main executable"
2014-10-14 17:37:53 +00:00
The Android Automerger
aeb3f1d837
merge in lmp-mr1-release history after reset to 2e5f8eaa7d
2014-10-14 06:11:29 -07:00
Lajos Molnar
e7e61beffc
am 3454f123
: media: add kMetadataBufferTypeGraphicBuffer
...
* commit '3454f123d0a10bd0ce0760828996aa26c80a8fd4':
media: add kMetadataBufferTypeGraphicBuffer
2014-10-14 08:27:07 +00:00
Lajos Molnar
3454f123d0
media: add kMetadataBufferTypeGraphicBuffer
...
Bug: 17935149
Change-Id: I1c26d1e83d8fa0a9ccdb25f6f3b19a86b1dc6f37
2014-10-13 22:58:03 -07:00
The Android Automerger
4b482de115
merge in lmp-mr1-release history after reset to 2e5f8eaa7d
2014-10-13 06:11:18 -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
1222c8944a
am ffb49774
: Improve ANR diagnostics.
...
* commit 'ffb497743831ae4857b674629b58ea3c46d01431':
Improve ANR diagnostics.
2014-10-12 16:01:36 +00:00
The Android Automerger
fa5593f60a
merge in lmp-mr1-release history after reset to 16410d458f
2014-10-12 06:10:26 -07:00
The Android Automerger
92d28005f9
merge in lmp-mr1-release history after reset to 16410d458f
2014-10-11 06:10:25 -07: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
The Android Automerger
488dded468
merge in lmp-mr1-release history after reset to 5acc751ffe
2014-10-09 06:10:56 -07:00
Narayan Kamath
4335d35c71
am 9ea09757
: Fix broken error check in Parcel::readBlob
...
* commit '9ea09757fa63ad2a9bea9c846b51c1210d69c79f':
Fix broken error check in Parcel::readBlob
2014-10-09 12:50:12 +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
The Android Automerger
059c6ea2ce
merge in lmp-mr1-release history after reset to 5acc751ffe
2014-10-08 06:13:14 -07: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
a046f506a5
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 00:03:48 +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
The Android Automerger
5e0f02413e
merge in lmp-mr1-release history after reset to 366998d871
2014-10-07 06:11:36 -07: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
5cc3b8b4c8
am 78639c22
: Merge "Parcel: extra validation/debug code for writeDupFileDescriptor" into lmp-dev
...
* commit '78639c22acfa5e56d87fd6fe8340d083536b29fc':
Parcel: extra validation/debug code for writeDupFileDescriptor
2014-10-06 22:45:57 +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
The Android Automerger
7fe8c35f30
merge in lmp-mr1-release history after reset to 93176114cf
2014-10-06 06:11:59 -07:00
The Android Automerger
acbdeb410f
merge in lmp-mr1-release history after reset to 93176114cf
2014-10-05 06:10:52 -07:00
The Android Automerger
1d1e87a791
merge in lmp-mr1-release history after reset to 93176114cf
2014-10-04 06:11:10 -07: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
021543fc65
am a7eb4b74
: Merge "Fix sockfd leakage in SensorService." into lmp-dev
...
* commit 'a7eb4b74f74423dafd88adf94a7984ae927c3a23':
Fix sockfd leakage in SensorService.
2014-10-03 21:50:52 +00:00
Aravind Akella
a7eb4b74f7
Merge "Fix sockfd leakage in SensorService." into lmp-dev
2014-10-03 21:45:37 +00:00
Michael Lentine
fb992b7753
am 6c925ede
: Fixed discrepancy between crop and frame transparencies.
...
* commit '6c925ede620f4080227bb1fe8a41e4b4502348f8':
Fixed discrepancy between crop and frame transparencies.
2014-10-03 21:03:11 +00:00
Michael Lentine
6c925ede62
Fixed discrepancy between crop and frame transparencies.
...
Bug: 17662777
Change-Id: I0d65d9b912a37a60e4c1d2e2e198f7709460917c
2014-10-03 19:02:30 +00:00
Riley Andrews
498f852678
am 3d1b86db
: am 6747be9f
: Generate the SurfaceFlinger shader cache on initialization
...
* commit '3d1b86db8831820ffe9407d55c36db5e9b87b009':
Generate the SurfaceFlinger shader cache on initialization
2014-10-03 17:39:58 +00:00
Riley Andrews
3d1b86db88
am 6747be9f
: Generate the SurfaceFlinger shader cache on initialization
...
* commit '6747be9fab9981ec24729cede5e0fe779e8b8914':
Generate the SurfaceFlinger shader cache on initialization
2014-10-03 17:31:18 +00:00
Riley Andrews
8dcdf7961b
am 6747be9f
: Generate the SurfaceFlinger shader cache on initialization
...
* commit '6747be9fab9981ec24729cede5e0fe779e8b8914':
Generate the SurfaceFlinger shader cache on initialization
2014-10-03 17:26:52 +00:00
Riley Andrews
6747be9fab
Generate the SurfaceFlinger shader cache on initialization
...
Blobcache is not yet enabled for surfaceflinger (as it should be).
As a temporary workaround, generate all needed shaders during
surfaceflinger initialization instead of doing the compilation
on-demand during ui transitions.
Change-Id: I14455b20a3f85f177d85c9c8b76d8ccc35379b39
2014-10-03 17:21:15 +00:00