summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* always pass the BufferQueue explicitely to consumersMathias Agopian2013-07-1213-28/+39
| | | | Change-Id: I883b0a7b19d8e722f9ab714ba6f49e658b02ca86
* resolved conflicts for merge of 00aea5c5 to masterMathias Agopian2013-07-126-31/+38
|\ | | | | | | Change-Id: Ie1769be863ee2d411eae451907a928db57882e14
| * am ac9a96da: fix a dead-lock in sensorserviceMathias Agopian2013-07-126-31/+38
| |\ | | | | | | | | | | | | * commit 'ac9a96da65f6eae4513654adaad8a457d1c1575c': fix a dead-lock in sensorservice
| | * fix a dead-lock in sensorserviceMathias Agopian2013-07-126-31/+38
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | sensorservice would deadlock if for some reason a sensor failed to enable. simplifed the code a bit, and made it behave a little closer to mr1.1 -- I couldn't convince myself that some changes in how locks were used were correct. Bug: 9794362 Change-Id: I6110f5dbb67e543f1c71d127de2299232badb36a
* | | Fix cmd line arguments for usagestats.Dianne Hackborn2013-07-121-1/+1
| | | | | | | | | | | | Change-Id: I9a1436aa1d1665924ba62a568bb4b66d67ae2814
* | | am 9201798c: (-s ours) Reconcile with jb-mr2-zeroday-release - do not mergeThe Android Open Source Project2013-07-110-0/+0
|\ \ \ | |/ / | | | | | | * commit '9201798cd99d0578fb781aea03635304e49ee3f3':
| * | Reconcile with jb-mr2-zeroday-release - do not mergeThe Android Open Source Project2013-07-100-0/+0
| |\ \ | | | | | | | | | | | | Change-Id: I5445989fd1dd6e851d3efe060cf3fc4ae1d104fb
| | * \ merge in jb-mr2-zeroday-release history after reset to jb-mr2-devThe Android Automerger2013-07-100-0/+0
| | |\ \ | | | |/ | | |/|
* | | | am 47f31b19: (-s ours) Reconcile with jb-mr2-release - do not mergeThe Android Open Source Project2013-07-110-0/+0
|\ \ \ \ | |/ / / | | | | | | | | | | | | * commit '47f31b19811a177baa1ae868282374970295caeb': Find non-extension GLES wrappers in eglGetProcAddress
| * | | Reconcile with jb-mr2-release - do not mergeThe Android Open Source Project2013-07-090-0/+0
| |\ \ \ | | | | | | | | | | | | | | | Change-Id: Id26b917342f6ee70c32c2713d07944dae1c10e01
| | * | | Find non-extension GLES wrappers in eglGetProcAddressJesse Hall2013-07-093-1/+32
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This allows apps to find OpenGL ES 3.0 functions using eglGetProcAddress() instead of dlopen/dlsym. Bug: 9681677 Change-Id: I7ce6e1636bc47d6b0bf20a4e46bd67235714d129
* | | | | am 54d97c88: am 9da67a94: am 67481607: Merge "Revert "Second try at adding a ↵Elliott Hughes2013-07-111-9/+0
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | compatibility symbol for the MemoryBase constructor."" * commit '54d97c88b57d2c341f0629c9648d4400a34e4f41': Revert "Second try at adding a compatibility symbol for the MemoryBase constructor."
| * | | | am 9da67a94: am 67481607: Merge "Revert "Second try at adding a ↵Elliott Hughes2013-07-091-9/+0
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | compatibility symbol for the MemoryBase constructor."" * commit '9da67a9427f695128b5da61c8f987fd9198a5e05': Revert "Second try at adding a compatibility symbol for the MemoryBase constructor."
| | * \ \ \ am 67481607: Merge "Revert "Second try at adding a compatibility symbol for ↵Elliott Hughes2013-07-091-9/+0
| | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | the MemoryBase constructor."" * commit '674816078588d0951c3c9bdaf26ecc9e9b3f2e0a': Revert "Second try at adding a compatibility symbol for the MemoryBase constructor."
| | | * \ \ \ Merge "Revert "Second try at adding a compatibility symbol for the ↵Elliott Hughes2013-07-091-9/+0
| | | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | MemoryBase constructor.""
| | | | * | | | Revert "Second try at adding a compatibility symbol for the MemoryBase ↵Elliott Hughes2013-07-091-9/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | constructor." This reverts commit ddd286301b466b5cd10cfcdc0a5ee5729ef2e385, because the third-party library in question has now been fixed. Change-Id: Ic195a913f90b36268ed9d6e60be520decb4e198d
* | | | | | | | Merge "resolved conflicts for merge of 5477d0e4 to master"Jesse Hall2013-07-113-24/+55
|\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ resolved conflicts for merge of 5477d0e4 to masterJesse Hall2013-07-113-24/+55
| |\ \ \ \ \ \ \ \ | | |/ / / / / / / | | | | | | | | | | | | | | | | | | Change-Id: I7ca75a44018a68bf3a7ac1de17a3ef568a48d2ac
| | * | | | | | | am c07b5206: Find non-extension GLES wrappers in eglGetProcAddressJesse Hall2013-07-093-1/+32
| | |\ \ \ \ \ \ \ | | | | |_|_|_|/ / | | | |/| | | | | | | | | | | | | | | | | | | | | | | * commit 'c07b52060acd627c8510c1a9151e0753fce76330': Find non-extension GLES wrappers in eglGetProcAddress
| | | * | | | | | Find non-extension GLES wrappers in eglGetProcAddressJesse Hall2013-07-043-1/+32
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This allows apps to find OpenGL ES 3.0 functions using eglGetProcAddress() instead of dlopen/dlsym. Bug: 9681677 Change-Id: I7ce6e1636bc47d6b0bf20a4e46bd67235714d129
* | | | | | | | | Merge "Pay attention to buffer timestamps"Andy McFadden2013-07-1114-50/+148
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | |
| * | | | | | | | Pay attention to buffer timestampsAndy McFadden2013-07-1014-50/+148
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When acquiring a buffer, SurfaceFlinger now computes the expected presentation time and passes it to the BufferQueue acquireBuffer() method. If it's not yet time to display the buffer, acquireBuffer() returns PRESENT_LATER instead of a buffer. The current implementation of the expected-present-time computation uses approximations and guesswork. Bug 7900302 Change-Id: If9345611c5983a11a811935aaf27d6388a5036f1
* | | | | | | | | Merge "fix SF buffer cropping"Mathias Agopian2013-07-105-38/+79
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | fix SF buffer croppingMathias Agopian2013-07-105-38/+79
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When a buffer had a crop (meaning its content is scaled to the window size) and a window crop was defined, the resulting crop couldn't be expressed properly because h/w composer's API was limited to integers, since this is fixed in h/w composer 1.3, we take adventage of this to make sure we get the correct crop. this bug could result in the buffer being scaled by an incorrect ratio and be slightly offset; moreover, it would produce different results from the GL code path, which is always correct. Change-Id: I8e20e00b6e26177d14f4ab4d2cd581e26c818892
* | | | | | | | | | Renaming dalvik.vm.lib to persist.sys.dalvik.vm.libBrian Carlstrom2013-07-101-7/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: If31695e04bb813eb75b2fdd00e5d70ced4fbb0e9
* | | | | | | | | | Update to follow procstats options changes.Dianne Hackborn2013-07-091-2/+1
|/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I6f016c944cfcd01bbbcf3cf37bc7ff05482f0012
* | | | | | | | | fix a bug where surfaceflinger and system_server could deadlockMathias Agopian2013-07-081-10/+100
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | because surfaceflinger handles screenshot in a different thread from the binder thread that requested it and because the IGraphicBufferProducer is a synchronous interface calling back into the system server; it is possible for the latter to run out of binder threads (b/c it holds a lock while calling into SF). The solution is to make sure all calls on IGraphicBufferProducer happen on the incoming binder thread. We achieve this by creating a IGBP wrapper which is given to the screenshot code. Bug: 8734824 Change-Id: I2be85660d9dc65d239d68f6d3ab3c973c13b34cc
* | | | | | | | | Merge "Refactor SF. Move all GL operations in their own class."Mathias Agopian2013-07-0817-476/+714
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Refactor SF. Move all GL operations in their own class.Mathias Agopian2013-07-0317-476/+714
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | this is the first step to add support for GLES 2.x, this change breaks the dependency of SF on GLES 1.x by moving all operation into their own class. Bug: 8679321 Change-Id: I0d2741eca2cefe67dfd9cf837cac10c4d126928b
* | | | | | | | | | improve sensorservice's dumpsysMathias Agopian2013-07-086-46/+76
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | it now displays the reported trigger mode properly, as well as the number and type of the last received data Change-Id: I2ff64b32ab71f1332bc2e09671c8c02bb9550490
* | | | | | | | | | Merge "simplify some unnecessary complex code"Mathias Agopian2013-07-083-16/+5
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | simplify some unnecessary complex codeMathias Agopian2013-07-083-16/+5
| |/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | getSensorType() ran in O(n) instead of O(1). fix that. Change-Id: Idcf29e46fc34db32604a0d8e5a9156486783b74f
* | | | | | | | | | Debug code for detecting all black pixels screenshotsMathias Agopian2013-07-082-0/+39
| |/ / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 9120292 Change-Id: If60db32524db973bb1f905ba3cb415c2a1cd7e71
* | | | | | | | | Merge "mv libcpustats from frameworks/native to frameworks/av"Glenn Kasten2013-07-086-568/+0
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | mv libcpustats from frameworks/native to frameworks/avGlenn Kasten2013-06-186-568/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | OK to lose history Change-Id: I18bfd988f19d037e480c27134eea21c8edcbfbf3
* | | | | | | | | | binder: add polling / single-threaded operationTodd Poynor2013-07-042-51/+92
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is currently safe to do only for processes that disallow any binder threads to be created: setThreadPoolMaxThreadCount(0). Change-Id: I8a27f3cf26f4d51edb7f222af487ac256cbcab65
* | | | | | | | | | Update to use --include-committed for procstats.Dianne Hackborn2013-07-031-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I5ce737b624c5617c94054d6bedebca754fbf16a9
* | | | | | | | | | Add support for mmc trace eventsKen Sumrall2013-07-031-0/+3
| |/ / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I1d9f2a85e50f8e30d418fb97c01ce7b0fbb680bd
* | | | | | | | | am 8b931916: (-s ours) am f4f2bd21: Tweak for forward compatibilityJean-Baptiste Queru2013-07-020-0/+0
|\ \ \ \ \ \ \ \ \ | | |/ / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | * commit '8b9319162d4f574fc45f88e6f9e28e62a4b5da78': Tweak for forward compatibility
| * | | | | | | | am f4f2bd21: Tweak for forward compatibilityJean-Baptiste Queru2013-07-021-0/+6
| |\ \ \ \ \ \ \ \ | | | |_|/ / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | * commit 'f4f2bd21d5b57f1598172ddbc44817c10785bdb3': Tweak for forward compatibility
| | * | | | | | | Tweak for forward compatibilityJean-Baptiste Queru2013-07-021-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I6be78b607789c469f4ffad849a493d78e2539450
* | | | | | | | | do not build libinput in PDKkeunyoung2013-07-021-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - skia is not available in PDK, and it causes build break. bug: 9528927 Change-Id: I89663e4a4bd52858506e3b52fbf8ca85d9992363
* | | | | | | | | Merge "Move input library code from frameworks/base."Jeff Brown2013-07-0225-0/+8514
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Move input library code from frameworks/base.Jeff Brown2013-07-0125-0/+8514
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I4983db61b53e28479fc90d9211fafff68f7f49a6
* | | | | | | | | | improve GLES jumptablesMathias Agopian2013-07-016-133/+50
|/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | in the common case this saves one instructions per jump (which will help with the i-cache). this change also gets rid of the "use slow tls" option, which was useless. So at least now architectures that don't have assembly bindings will perform much better. Change-Id: I31be6c06ad2136b50ef3a1ac14682d7812ad40d2
* | | | | | | | | Merge "SurfaceFlinger: fix releaseBuffer in updateTexImage"Lajos Molnar2013-06-281-1/+1
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | SurfaceFlinger: fix releaseBuffer in updateTexImageLajos Molnar2013-06-271-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Allow releasing a buffer acquired in the past. Change-Id: I3f27f1caec109c1a47286fc4d2235c6e1afe9022 Signed-off-by: Lajos Molnar <lajos@google.com> Bug: 9516405
* | | | | | | | | | Add checkin dumps to bug reports.Dianne Hackborn2013-06-261-0/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is a duplicate of the associated human-readable dumps of these services, but much better for automated parsing. Change-Id: I902b768b03aeac1472f03f96913f9b8ada5dba9c
* | | | | | | | | | Merge "Small clarifications to EGL_ANDROID_presentation_time"Jesse Hall2013-06-261-3/+18
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Small clarifications to EGL_ANDROID_presentation_timeJesse Hall2013-06-261-3/+18
| |/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I4365a981776ab0a5719c268258b87ff1418f9aeb