summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Rename ISurfaceTexture and SurfaceTextureAndy McFadden2012-12-1839-292/+291
| | | | | | | | | | The C++ class names don't match what the classes do, so rename ISurfaceTexture to IGraphicBufferProducer, and SurfaceTexture to GLConsumer. Bug 7736700 Change-Id: Ia03e468888025b5cae3c0ee1995434515dbea387
* Merge "Added some comments"Andy McFadden2012-12-174-0/+53
|\
| * Added some commentsAndy McFadden2012-12-174-0/+53
| | | | | | | | | | | | | | Added a quick intro section at the top of the class. Also noted the proposed new name for the class. Change-Id: I3f79663527544aa4e910db0e5a1374b54d16ba2f
* | Merge "Add NULL check to CallStack::toString"Marco Nelissen2012-12-171-1/+3
|\ \ | |/ |/|
| * Add NULL check to CallStack::toStringMarco Nelissen2012-12-171-1/+3
| | | | | | | | | | | | | | CallStack::toString() has a 0 default argument, which ends up getting passed to strlen(), resulting in a crash. Change-Id: If706aff8c400983670f49cdbb66e11191ac76e0e
* | am 8d9f0118: am fdd8551f: Merge "Fix build"Andrew Hsieh2012-12-161-1/+4
|\ \ | | | | | | | | | | | | * commit '8d9f0118926d54b5a5fc1508a7c43aa661839f1f': Fix build
| * \ am fdd8551f: Merge "Fix build"Andrew Hsieh2012-12-161-1/+4
| |\ \ | | | | | | | | | | | | | | | | * commit 'fdd8551fe83754846cb91e2d7325ef90d2e0fb28': Fix build
| | * \ Merge "Fix build"Andrew Hsieh2012-12-161-1/+4
| | |\ \
| | | * | Fix buildAndrew Hsieh2012-12-171-1/+4
| | |/ / | | | | | | | | | | | | Change-Id: Ie011cbf74a08f760ccd93ca37fa2b437b7063462
* | | | am d8f2daad: am acfcd62a: Merge "Revert "Fix typo""Andrew Hsieh2012-12-151-1/+1
|\ \ \ \ | |/ / / | | | | | | | | | | | | * commit 'd8f2daada3a828c5d9e6dfa29f53ab054618e129': Revert "Fix typo"
| * | | am acfcd62a: Merge "Revert "Fix typo""Andrew Hsieh2012-12-151-1/+1
| |\ \ \ | | |/ / | | | | | | | | | | | | * commit 'acfcd62aa9300087d3e8cca79e59b0abdcaaee35': Revert "Fix typo"
| | * | Merge "Revert "Fix typo""Andrew Hsieh2012-12-151-1/+1
| | |\ \
| | | * | Revert "Fix typo"Andrew Hsieh2012-12-151-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit c118edfc1ab9a608537ebc2f2ec936216f15a36c Need to go together with https://android-review.googlesource.com/#/c/48117/ Change-Id: Ib413be1035cfb1d18cc9cf4099694a308dadf8f5
* | | | | am 4bb20303: am 670c570e: Merge "Fix typo"Andrew Hsieh2012-12-150-0/+0
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | * commit '4bb20303d95e7d6242e648ce506ab939420dbe71': Fix typo
| * | | | am 670c570e: Merge "Fix typo"Andrew Hsieh2012-12-151-1/+1
| |\ \ \ \ | | |/ / / | | | | | | | | | | | | | | | * commit '670c570e75e399432e96c9fd1dfa3fb92869f10c': Fix typo
| | * | | Merge "Fix typo"Andrew Hsieh2012-12-151-1/+1
| | |\ \ \ | | | |/ /
| | | * | Fix typoAndrew Hsieh2012-12-161-1/+1
| | |/ / | | | | | | | | | | | | | | | | | | | | Changed ANDROID_BITMAP_RESUT_SUCCESS -> ANDROID_BITMAP_RESULT_SUCCESS Change-Id: I4e15e946107ea6f3d0955f72e97894512743c6ca
* | | | App home directories are now 0700 for targetSdkVersion > 17Nick Kralevich2012-12-144-15/+29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Have installd set an app's home directory permissions to 0700 if the app has targetSdkVersion > 17. Bug: 7208882 Change-Id: Iaa4fc42fec69bc1abdfae53704d6264dd6fa965f
* | | | Merge "Fix typo"Andrew Hsieh2012-12-131-1/+1
|\ \ \ \
| * | | | Fix typoAndrew Hsieh2012-12-121-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Changed ANDROID_BITMAP_RESUT_SUCCESS -> ANDROID_BITMAP_RESULT_SUCCESS Change-Id: I4e15e946107ea6f3d0955f72e97894512743c6ca
* | | | | Merge "utils: fix warnings for unused parameters"Igor Murashkin2012-12-123-6/+6
|\ \ \ \ \
| * | | | | utils: fix warnings for unused parametersIgor Murashkin2012-12-053-6/+6
| | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ibfb755a30ba2923669060fe0aed019beecbe38a1
* | | | | | Merge "stop using a deprecated SurfaceTextureClient ctor"Jamie Gennis2012-12-122-3/+3
|\ \ \ \ \ \
| * | | | | | stop using a deprecated SurfaceTextureClient ctorJamie Gennis2012-12-122-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I8c8282a0debd551db290dd6849faf272a88c704c
* | | | | | | Merge "remove unused code."Nick Kralevich2012-12-123-54/+0
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | |
| * | | | | | remove unused code.Nick Kralevich2012-12-123-54/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Iacc8b2664a0e404dfa554f223a44126c41581ae4
* | | | | | | Merge "SurfaceTextureClient: remove a deprecated ctor"Jamie Gennis2012-12-122-14/+0
|\ \ \ \ \ \ \
| * | | | | | | SurfaceTextureClient: remove a deprecated ctorJamie Gennis2012-12-122-14/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ibf2746fdca26851677cd90199c60eab80f6d0c73
* | | | | | | | Merge "SurfaceFlinger: Move GraphicBufferAlloc to libgui"Jamie Gennis2012-12-126-15/+15
|\ \ \ \ \ \ \ \ | |_|_|_|/ / / / |/| | | | | | |
| * | | | | | | SurfaceFlinger: Move GraphicBufferAlloc to libguiJamie Gennis2012-12-116-15/+15
| |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This change moves the GraphicBufferAlloc class from SurfaceFlinger to libgui. Change-Id: Idf31d2004efa2651b60590733f73c4a7b831e8a9
* | | | | | | Avoid unnecessary texture bindAndy McFadden2012-12-115-40/+51
|/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In SurfaceFlingerConsumer, check to see if native fence sync is enabled. If so, defer the texture binding step to Layer::onDraw. Change-Id: I7d4034a31c0143207eea2509dfa13ef3820f9b8c
* | | | | | Merge "Refactor SurfaceTexture a bit."Andy McFadden2012-12-119-213/+429
|\ \ \ \ \ \
| * | | | | | Refactor SurfaceTexture a bit.Andy McFadden2012-12-119-213/+429
| | |_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Rearranges updateTexImage() so that the SurfaceFlinger-specific behavior is in a new SurfaceFlingerConsumer subclass. SurfaceTexture behavior should not be altered. Instead of acquire-bind-release we now do acquire-release-bind, but since it's all done with the lock held there shouldn't be any externally-visible change. Change-Id: Ia566e4727945e2cfb9359fc6d2a8f8af64d7b7b7
* | | | | | am 0c6fff72: (-s ours) Reconcile with jb-mr1.1-release - do not mergeThe Android Open Source Project2012-12-110-0/+0
|\ \ \ \ \ \ | |/ / / / / |/| | | / / | | |_|/ / | |/| | | * commit '0c6fff72f78e4f80b28ccccac9584255591dd1a2':
| * | | | Reconcile with jb-mr1.1-release - do not mergeThe Android Open Source Project2012-12-110-0/+0
| |\ \ \ \ | | | | | | | | | | | | | | | | | | Change-Id: I946e9036a50464f974bc2d12df9d8b119f86fa00
| | * \ \ \ merge in jb-mr1.1-release history after reset to jb-mr1.1-devThe Android Automerger2012-12-100-0/+0
| | |\ \ \ \
* | | \ \ \ \ am 884e3bc2: (-s ours) am 6426bd62: am f53f9c6d: [DO NOT MERGE] ↵Jamie Gennis2012-12-100-0/+0
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | GraphicBufferAllocator: stall alloc for async frees * commit '884e3bc29ed190a856f7562a73548868a7ecef2f': [DO NOT MERGE] GraphicBufferAllocator: stall alloc for async frees
| * | | | | | am 6426bd62: am f53f9c6d: [DO NOT MERGE] GraphicBufferAllocator: stall alloc ↵Jamie Gennis2012-12-101-52/+108
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | for async frees * commit '6426bd62676c743b0b5bdc397bcab5c669c6e51f': [DO NOT MERGE] GraphicBufferAllocator: stall alloc for async frees
| | * \ \ \ \ \ am f53f9c6d: [DO NOT MERGE] GraphicBufferAllocator: stall alloc for async freesJamie Gennis2012-12-101-52/+108
| | |\ \ \ \ \ \ | | | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | * commit 'f53f9c6d3668490f6c68f5c094c28f645c1b3da3': [DO NOT MERGE] GraphicBufferAllocator: stall alloc for async frees
| | | * | | | | [DO NOT MERGE] GraphicBufferAllocator: stall alloc for async freesJamie Gennis2012-12-101-52/+108
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This change makes GraphicBufferAllocator::alloc wait for pending async frees to complete before attempting to allocate a gralloc buffer if there are more than 8 pending async frees. Bug: 7696861 Change-Id: I1fae86e13edefcaa153b8ce9fd057f335716059e
* | | | | | | | am 064d2529: (-s ours) Reconcile with jb-mr1.1-release - do not mergeThe Android Open Source Project2012-12-100-0/+0
|\ \ \ \ \ \ \ \ | |/ / / / / / / | | | | | | | | | | | | | | | | * commit '064d252918c23cc4c90f8bc62f9ae47ba7afa4d5':
| * | | | | | | Reconcile with jb-mr1.1-release - do not mergeThe Android Open Source Project2012-12-100-0/+0
| |\ \ \ \ \ \ \ | | | |_|/ / / / | | |/| | | | | | | | | | | | | Change-Id: I97991f966ea0d3a6f3bad87c82d9926d55e6d63c
| | * | | | | | merge in jb-mr1.1-release history after reset to jb-mr1.1-devThe Android Automerger2012-12-070-0/+0
| | |\ \ \ \ \ \ | | | |_|/ / / / | | |/| | | | |
* | | | | | | | atrace: fix the help stringJamie Gennis2012-12-071-0/+2
| |_|_|_|/ / / |/| | | | | | | | | | | | | | | | | | | | Change-Id: I19f0093d65d64e669ad71c600c103f4080bfa2c2
* | | | | | | SurfaceFlinger: work around a driver bugJamie Gennis2012-12-071-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I4490f308b12e9b6fda2ea7255eb19d867d6d008c
* | | | | | | atrace: clean up tracing option enablingJamie Gennis2012-12-072-232/+303
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This change switches atrace to use a table-driven approach to enabling and disabling options. It unifies how framework and kernel tracing are enabled, and causes userland tracing options to be picked up by currently running processes. Change-Id: Iba2a3012ca0a67c4defdd076bce597db26e9f539
* | | | | | | am 50f8d285: am d4e70620: am 72c3f7d8: Revert "ConsumerBase: free buffers ↵Jamie Gennis2012-12-071-24/+10
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | outside the lock" * commit '50f8d2856b6644059b31684687842bf9c1f2e814': Revert "ConsumerBase: free buffers outside the lock"
| * | | | | | am d4e70620: am 72c3f7d8: Revert "ConsumerBase: free buffers outside the lock"Jamie Gennis2012-12-071-24/+10
| |\ \ \ \ \ \ | | | |_|/ / / | | |/| | | | | | | | | | | | | | | | | | * commit 'd4e706208c99ff1716fb0009ec867ff29ff04a7c': Revert "ConsumerBase: free buffers outside the lock"
| | * | | | | am 72c3f7d8: Revert "ConsumerBase: free buffers outside the lock"Jamie Gennis2012-12-071-24/+10
| | |\ \ \ \ \ | | | |/ / / / | | | | | | | | | | | | | | | | | | | | | * commit '72c3f7d88160b7c279f90f0efe3c1cb12cd140ae': Revert "ConsumerBase: free buffers outside the lock"
| | | * | | | Revert "ConsumerBase: free buffers outside the lock"Jamie Gennis2012-12-071-24/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit b21a4e3b5f7f07ed160ca6e1809313e2a8e2a6a4.
generated by cgit v1.1 at 2025-06-01 03:33:46 +0000