summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge "Fix crash when user provides large values in the Parcel." into ↵Michael Lentine2014-10-312-4/+18
|\ | | | | | | lmp-mr1-dev
| * Fix crash when user provides large values in the Parcel.Michael Lentine2014-10-312-4/+18
| | | | | | | | | | Bug: 18102648 Change-Id: Ie6a24718e586a34424238363de80f9545951514f
* | Merge "Fix output of pointers for 64bit devices." into lmp-mr1-devMichael Lentine2014-10-311-2/+2
|\ \ | |/
| * Fix output of pointers for 64bit devices.Michael Lentine2014-10-311-2/+2
| | | | | | | | Change-Id: I279c1cf8d4c126b98f4a92ca807ade3749d01ff0
* | Merge "surfaceflinger: fix -Wunused-parameter warning" into lmp-mr1-devJesse Hall2014-10-311-1/+1
|\ \
| * | surfaceflinger: fix -Wunused-parameter warningJesse Hall2014-10-311-1/+1
| | | | | | | | | | | | | | | | | | | | | warning: unused parameter 'mustRecompose' [-Wunused-parameter] Change-Id: I6b8c671189639d851bfa5548742de988d6fa2687 (cherry picked from d2e514f71709e6af3dbc754e59686129737f2300)
* | | Merge "surfaceflinger: fix -Wsign-compare warnings" into lmp-mr1-devJesse Hall2014-10-311-3/+3
|\ \ \ | |/ /
| * | surfaceflinger: fix -Wsign-compare warningsJesse Hall2014-10-311-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | warning: comparison of integers of different signs: 'int' and 'size_t' (aka 'unsigned int') [-Wsign-compare] arning: comparison of integers of different signs: 'int32_t' (aka 'int') and 'const uint32_t' (aka 'const unsigned int') [-Wsign-compare] Change-Id: I823257aa7218c5fd492a3277853210db539bb2e2 (cherry picked from f9bfdc6c9449143eed674c03e15dd8278296d32b)
* | | Merge "surfaceflinger: fix -Woverloaded-virtual warning" into lmp-mr1-devJesse Hall2014-10-311-2/+2
|\ \ \ | |/ /
| * | surfaceflinger: fix -Woverloaded-virtual warningJesse Hall2014-10-311-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | warning: 'android::LayerDim::isOpaque' hides overloaded virtual function [-Woverloaded-virtual] Change-Id: Ie27a6c943f485bc89ce11e424a4e7d99805d4dd0 (cherry picked from commit 382574d116759ccc19463c03db841e3d6e2d4424)
* | | Merge "surfaceflinger: fix -Wmismatched-tags warnings" into lmp-mr1-devJesse Hall2014-10-313-3/+3
|\ \ \ | |/ / | | / | |/ |/|
| * surfaceflinger: fix -Wmismatched-tags warningsJesse Hall2014-10-313-3/+3
| | | | | | | | | | | | | | | | | | | | | | warning: struct 'HWComposer' was previously declared as a class [-Wmismatched-tags] warning: class 'DisplayInfo' was previously declared as a struct [-Wmismatched-tags] Change-Id: I13db9f8aab3a957ce8ff8d64598dae1807d6fe7e (cherry picked from commit 646f54105018e99ef4a30ee41f01f7d1ab66c38e)
* | Merge "Initialize ARect fields in default ctor" into lmp-mr1-devDan Stoza2014-10-291-0/+1
|\ \ | |/ |/|
| * Initialize ARect fields in default ctorDmitriy Ivanov2014-10-281-0/+1
| | | | | | | | | | | | | | So that we can use Rect() for update and such. Bug: 18095940 Change-Id: I03ed87121d2d279f22013b75e95dd7254551ca1f
* | GLConsumer: correct EGL_NO_DISPLAY to EGL_NO_CONTEXTJesse Hall2014-10-291-1/+1
| | | | | | | | | | Change-Id: I4dcb57a0db9ee3c5222cd453c9213859384212b0 (cherry picked from commit 46a1f6b40e1f7677cd41cd30f729ff66c7c21517)
* | Don't run large virtual displays through HWCDan Stoza2014-10-282-1/+22
|/ | | | | | | | | | | This change watches for a MAX_VIRTUAL_DISPLAY_DIMENSION value, which will be set (if necessary) in BoardConfig.mk. If the value is set, any virtual displays that have a width or a height greater than that dimension will bypass the hardware composer HAL and be handled only by SurfaceFlinger. Bug: 17701816 Change-Id: Ia6ca44dfd6a7a9bc0f054493d3f13006bc32fa14
* atrace: fix Sync Manager tracing preventing enabling of kernel sync tracingPatrick Auchter2014-10-271-1/+1
| | | | | | | | | | | Both Sync Manager tracing and kernel sync tracing were using "sync" to enable tracing and since Sync Manager was found first, this prevented enabling kernel sync tracing. To fix this, use "syncman" to enable Sync Manager tracing. Change-Id: Id3b799e01e5041c582cd752c8c40d3e36954f821 Signed-off-by: Iliyan Malchev <malchev@google.com>
* Merge "Add glFlush in surfaceflinger screenshot code." into lmp-mr1-devRiley Andrews2014-10-243-0/+7
|\
| * Add glFlush in surfaceflinger screenshot code.Riley Andrews2014-10-233-0/+7
| | | | | | | | | | | | | | | | | | | | | | | | After creating a syncKHR object with type EGL_SYNC_NATIVE_FENCE_ANDROID, glFlush must be called before the EGL_SYNC_NATIVE_FENCE_FD_ANDROID attribute is populated with a sync fd. We currently call eglDupNativeFenceFDANDROID before issuing the flush. Bug 18052459 Taken verbatim from matthew.k.gumbel@intel.com. Change-Id: I3781d14f92862076e2bca7d27341a6dc6e7e3775
* | am afe2b1fa: surfaceflinger: don\'t close fence fds after passing to queueBufferJesse Hall2014-10-221-3/+1
|\ \ | |/ | | | | | | * commit 'afe2b1fadd29149ceed639357e44e06e97c3a5ca': surfaceflinger: don't close fence fds after passing to queueBuffer
| * surfaceflinger: don't close fence fds after passing to queueBufferJesse Hall2014-10-211-3/+1
| | | | | | | | | | | | | | | | | | | | | | | | ANativeWindow::queueBuffer takes ownership of the fence fd passed to it, and will close it before returning. SurfaceFlinger's screenshot code was also closing the syncFd it passed to queueBuffer. Most of the time this meant the second close() silently failed, but in a rare race condition the file descriptor could be reused between the two close()s. Bug: 17946343 Change-Id: Ib74fcb1dce52cc21328059c99b7c4c76f41aa3a5
* | Merge "Adding eglInitialize and eglTerminate image creation and deletion." ↵Michael Lentine2014-10-211-0/+4
|\ \ | | | | | | | | | into lmp-mr1-dev
| * | Adding eglInitialize and eglTerminate image creation and deletion.Michael Lentine2014-10-091-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | Merge "dumpstate: Add trusty version if driver is found" into lmp-mr1-devArve Hjønnevåg2014-10-201-0/+24
|\ \ \
| * | | dumpstate: Add trusty version if driver is foundArve Hjønnevåg2014-10-161-0/+24
| | | | | | | | | | | | | | | | Change-Id: I7780ea8e1d777c222a73408f70d8a6d49dee1d92
* | | | Merge "Link sigchain to surfaceflinger main executable" into lmp-mr1-devDmitriy Ivanov2014-10-202-3/+27
|\ \ \ \
| * | | | Link sigchain to surfaceflinger main executableDmitriy Ivanov2014-10-162-3/+27
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | And export necessary symbols to preempt calls from libart.so Bug: 15345057 Bug: 15426766 (cherry picked from commit f3da24d8cf02d7c74ff7c24eae0154a21a192fda) Change-Id: I03b632e0bf2cbaf4a0e68cd0af4e991f7f6b08e4
* | | | am 649bafb7: Merge "bufferqueue: workaround: allow NULL fence with ↵Jesse Hall2014-10-201-1/+6
|\ \ \ \ | | |_|/ | |/| | | | | | | | | | | | | | | | | | queueBuffer (DO NOT MERGE)" into lmp-dev * commit '649bafb7ba2c3204295bc3451ff7af7e28e714ed': bufferqueue: workaround: allow NULL fence with queueBuffer (DO NOT MERGE)
| * | | Merge "bufferqueue: workaround: allow NULL fence with queueBuffer (DO NOT ↵Jesse Hall2014-10-201-1/+6
| |\ \ \ | | | | | | | | | | | | | | | MERGE)" into lmp-dev
| | * | | bufferqueue: workaround: allow NULL fence with queueBuffer (DO NOT MERGE)Jesse Hall2014-10-191-1/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | | am 0b6acb22: Add version number to SensorService dump output.Aravind Akella2014-10-191-1/+2
|\ \ \ \ \ | |/ / / / | | | / / | |_|/ / |/| | | * commit '0b6acb2231baed861488f2d181621272d0658d25': Add version number to SensorService dump output.
| * | | Add version number to SensorService dump output.Aravind Akella2014-10-191-1/+2
| |/ / | | | | | | | | | Change-Id: I64f9482ade523ec3fafe14bff14db7196e32413f
* | | am 60fd3fee: Migrate CA certificates to all usersRobin Lee2014-10-153-35/+144
|\ \ \ | |/ / | | | | | | | | | * commit '60fd3feecab4336d964ca8e31c7c3220e1afb558': Migrate CA certificates to all users
| * | Migrate CA certificates to all usersRobin Lee2014-10-153-35/+144
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | am 3454f123: media: add kMetadataBufferTypeGraphicBufferLajos Molnar2014-10-141-0/+18
|\ \ \ | |/ / | | | | | | | | | * commit '3454f123d0a10bd0ce0760828996aa26c80a8fd4': media: add kMetadataBufferTypeGraphicBuffer
| * | media: add kMetadataBufferTypeGraphicBufferLajos Molnar2014-10-131-0/+18
| | | | | | | | | | | | | | | Bug: 17935149 Change-Id: I1c26d1e83d8fa0a9ccdb25f6f3b19a86b1dc6f37
* | | am ffb49774: Improve ANR diagnostics.Jeff Brown2014-10-122-51/+71
|\ \ \ | |/ / | | | | | | | | | * commit 'ffb497743831ae4857b674629b58ea3c46d01431': Improve ANR diagnostics.
| * | Improve ANR diagnostics.Jeff Brown2014-10-102-51/+71
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | am 9ea09757: Fix broken error check in Parcel::readBlobNarayan Kamath2014-10-091-1/+1
|\ \ \ | |/ / | | / | |/ |/| * commit '9ea09757fa63ad2a9bea9c846b51c1210d69c79f': Fix broken error check in Parcel::readBlob
| * Fix broken error check in Parcel::readBlobNarayan Kamath2014-10-081-1/+1
| | | | | | | | | | | | | | | | | | | | | | mmap returns MAP_FAILED (which is -1) and not NULL on failure. Diagnosed by cferris. bug: 17909809 Change-Id: I609788ebf94742ef88af002d2d3f3bc9b9e520ac
* | Merge "BufferQueueProducer: Throttle EGL frame production." into lmp-mr1-devJesse Hall2014-10-082-1/+17
|\ \
| * | BufferQueueProducer: Throttle EGL frame production.Eric Penner2014-10-032-1/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | am 7830ef3d: Change ordering of memory allocation and calling Thread::run().Aravind Akella2014-10-081-2/+2
|\ \ \ | | |/ | |/| | | | | | | * commit '7830ef3dd0ff3749d974c2dd85a8fa59dc47aeca': Change ordering of memory allocation and calling Thread::run().
| * | Change ordering of memory allocation and calling Thread::run().Aravind Akella2014-10-071-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | In some cases this is causing a crash as device.poll is called with NULL. Bug: 17896339 Change-Id: Id431599f2c661338c355c7081b6602f8449a9198
* | | am 78639c22: Merge "Parcel: extra validation/debug code for ↵Jesse Hall2014-10-071-0/+25
|\ \ \ | |/ / | | | | | | | | | | | | | | | writeDupFileDescriptor" into lmp-dev * commit '78639c22acfa5e56d87fd6fe8340d083536b29fc': Parcel: extra validation/debug code for writeDupFileDescriptor
| * | Merge "Parcel: extra validation/debug code for writeDupFileDescriptor" into ↵Jesse Hall2014-10-061-0/+25
| |\ \ | | | | | | | | | | | | lmp-dev
| | * | Parcel: extra validation/debug code for writeDupFileDescriptorJesse Hall2014-10-061-0/+25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | am a7eb4b74: Merge "Fix sockfd leakage in SensorService." into lmp-devAravind Akella2014-10-034-40/+142
|\ \ \ \ | |/ / / | | | / | |_|/ |/| | * commit 'a7eb4b74f74423dafd88adf94a7984ae927c3a23': Fix sockfd leakage in SensorService.
| * | Merge "Fix sockfd leakage in SensorService." into lmp-devAravind Akella2014-10-034-40/+142
| |\ \ | | |/ | |/|
| | * Fix sockfd leakage in SensorService.Aravind Akella2014-10-024-40/+142
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | i) Call removeFd() only if the fd in the BitTube has been previously added to the Looper. Use a flag to determine whether the fd has been previously added or not. ii) Increment mPendingFlushEventsToSend after holding a connectionLock. iii) Store the number of acks that are pending in SensorEventQueue and send them all at once. Bug: 17472228 Change-Id: I1ec834fea1112a9cfbd9cddd2198438793698502
generated by cgit v1.1 at 2025-01-25 20:35:03 +0000