summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge "Create builtin display tokens on demand"Jesse Hall2012-11-272-25/+29
|\
| * Create builtin display tokens on demandJesse Hall2012-11-272-25/+29
|/ | | | | | | | | | | | For hotpluggable builtin displays (currently just HDMI), create the display device IBinder token when the display is connected and destroy it when the display is disconnected. Previously we created the tokens at startup and never changed them. This made it so that when comparing current and drawing state, we couldn't tell whether a display had been disconnected and reconnected. Bug: 7491120 Change-Id: I2ac82b864e10cb1cd0a308782d7e0ab9745c5d81
* am 434e21bf: am 3fdeb48e: Reduce emulator logspamAndy McFadden2012-11-092-2/+4
|\ | | | | | | | | * commit '434e21bfd6b14f8d99b9bcdb829e7252edd574f3': Reduce emulator logspam
| * am 3fdeb48e: Reduce emulator logspamAndy McFadden2012-11-092-2/+4
| |\ | | | | | | | | | | | | * commit '3fdeb48e3c89be15fe3b539a26ec9a3cf28c898c': Reduce emulator logspam
| | * Reduce emulator logspamAndy McFadden2012-11-082-2/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | The emulator doesn't support systrace, but we should point that out at most once per process. Bug 7436352 Change-Id: I06b2c1ea0df6c02c11cd2496423c337f8d7c62a1
* | | am 4bacaec4: am 0b2c9268: bugreport: Add /proc/interrupts dumpDmitry Shmidt2012-11-081-0/+3
|\ \ \ | |/ / | | | | | | | | | * commit '4bacaec4cd5844d67bfa4659393cb7e7fe343d1e': bugreport: Add /proc/interrupts dump
| * | am 0b2c9268: bugreport: Add /proc/interrupts dumpDmitry Shmidt2012-11-071-0/+3
| |\ \ | | |/ | | | | | | | | | * commit '0b2c9268265e9a165551eaa66cb461d3fab8b564': bugreport: Add /proc/interrupts dump
| | * bugreport: Add /proc/interrupts dumpDmitry Shmidt2012-11-071-0/+3
| | | | | | | | | | | | | | | | | | | | | Bug: 7301178 Change-Id: Ifad3b981ac904d4637d69dfc223d5bb2c9d80bda Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
* | | am 61db92e7: am c11f56e5: bugreport: Add wlan FW counters dump for bcmdhdDmitry Shmidt2012-11-081-1/+5
|\ \ \ | |/ / | | | | | | | | | * commit '61db92e72771a42456a3b703f275c4a4e1f8b552': bugreport: Add wlan FW counters dump for bcmdhd
| * | am c11f56e5: bugreport: Add wlan FW counters dump for bcmdhdDmitry Shmidt2012-11-071-1/+5
| |\ \ | | |/ | | | | | | | | | * commit 'c11f56e5615c5d388c072705322df5bcf22c2012': bugreport: Add wlan FW counters dump for bcmdhd
| | * bugreport: Add wlan FW counters dump for bcmdhdDmitry Shmidt2012-11-071-1/+5
| | | | | | | | | | | | | | | | | | | | | Bug: 7494877 Change-Id: I4d24dbcf7596777ec02ab1312c2ab996ba7688f1 Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
* | | am 5e530e02: am a151a19d: Merge "Fix return type of glGetAttribLocation and ↵Andrew Hsieh2012-11-069-21/+21
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | glGetUniformLocation" * commit '5e530e02bc3073a2e2469df3c333ae14f1b37433': Fix return type of glGetAttribLocation and glGetUniformLocation
| * \ \ am a151a19d: Merge "Fix return type of glGetAttribLocation and ↵Andrew Hsieh2012-11-069-21/+21
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | glGetUniformLocation" * commit 'a151a19db2fa07295837027fb5d84c02401cc78d': Fix return type of glGetAttribLocation and glGetUniformLocation
| | * \ \ Merge "Fix return type of glGetAttribLocation and glGetUniformLocation"Andrew Hsieh2012-11-069-21/+21
| | |\ \ \
| | | * | | Fix return type of glGetAttribLocation and glGetUniformLocationAndrew Hsieh2012-11-069-21/+21
| | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | from int to GLint. See: http://www.khronos.org/opengles/sdk/docs/man/xhtml/glGetAttribLocation.xml http://www.khronos.org/opengles/sdk/docs/man/xhtml/glGetUniformLocation.xml Change-Id: I4a9f8e9e34b8c3cca239ae84bfe8f3cdfd94802a
* | | | | Reconcile with jb-mr1.1-release - do not mergeThe Android Open Source Project2012-11-060-0/+0
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | Change-Id: Ic4f86f5a85ccb35cb054ba6294756456cde4b493
| * \ \ \ \ merge in jb-mr1.1-release history after reset to jb-mr1.1-devThe Android Automerger2012-11-060-0/+0
| |\ \ \ \ \
* | \ \ \ \ \ am 20152ac7: am d8e8e662: Reconcile with jb-mr1-factory-release ↵The Android Open Source Project2012-11-060-0/+0
|\ \ \ \ \ \ \ | | |_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | jb-mr1-release - do not merge * commit '20152ac797ab3a26561eb23ce672137c9e24ac8c':
| * | | | | | am d8e8e662: Reconcile with jb-mr1-factory-release jb-mr1-release - do not mergeThe Android Open Source Project2012-11-060-0/+0
| |\ \ \ \ \ \ | | | |_|_|_|/ | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'd8e8e66220cd71486a3b545096a1cdc298dee5fd': partially implement external display clipping Always set vertex alpha when drawing screenshot layers SurfaceFlinger: add animation transactions ugly, temporary, workaroung for a problem where a binder thread spins forever make sure we don't call into the HWC HAL when not needed Fix crashes after HDMI disconnect Fix issue #7271589: Cannot set Ocean HD live wallpaper Revert "Compatibility work around for bad graphics driver dependency." only abort when errors happen on the main display Check that HWC exists before trying to use it Always reset layer acquireFenceFd after commit fix a problem where all hwc layers would have the SKIP flags set we were sometimes not setting fences properly A vendor ril depends on a native screen shot code. Revert "Added display initialization method" fix various issues in SF's EventThread Revert "SurfaceTexture: inherit from ConsumerBase" we were mistakenly optimizing out SF's main transactions in some cases Revert "Minimal changes to support multi-display HWC"
| | | | | | |
| | | \ \ \ \
| | *-. \ \ \ \ Reconcile with jb-mr1-factory-release jb-mr1-release - do not mergeThe Android Open Source Project2012-11-060-0/+0
| | |\ \ \ \ \ \ | | | |_|/ / / / | | |/| | | | | | | | | | | | | Change-Id: I219247f1b0f5d87b4144dc1535039e93fc636a94
| | | | * | | | merge in jb-mr1-release history after reset to jb-mr1-devThe Android Automerger2012-11-050-0/+0
| | | | |\ \ \ \ | | | |/ / / / / | | |/| | / / / | | | | |/ / /
* | | | | | | am e70fbe8b: am 02b95105: fix transitions from hwc to GLES compositionMathias Agopian2012-11-051-4/+4
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | / / | |_|_|_|/ / |/| | | | | * commit 'e70fbe8b32687d9178e828d6023de599be5431c3': fix transitions from hwc to GLES composition
| * | | | | am 02b95105: fix transitions from hwc to GLES compositionMathias Agopian2012-11-051-4/+4
| |\ \ \ \ \ | | |/ / / / | | | | | | | | | | | | | | | | | | * commit '02b95105754b1859a97e234b79f41489a4677c20': fix transitions from hwc to GLES composition
| | * | | | fix transitions from hwc to GLES compositionMathias Agopian2012-11-051-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If we switched from HWC to GLES but the dirty region was empty (could happen if the dirty region is outside of the screen for instance), we need to force a full screen composition. In this change we ignore the dirty region for the purpose of rejecting the whole update and we rely on the fact that it will later be expanded to the whole screen. This was the least risky fix. Bug: 7467760, 7452931 Change-Id: I2132f2f963b00a3ce7150adadb107b0367b3862e
| | | | | |
| \ \ \ \ \
*-. \ \ \ \ \ Reconcile with jb-mr1-factory-release jb-mr1-release - do not mergeThe Android Open Source Project2012-10-310-0/+0
|\ \ \ \ \ \ \ | | |_|_|/ / / | |/| | | / / | | | |_|/ / | | |/| | | Change-Id: I4f96bf28f6585ad8331daeab60e6d23e92cf0c5d
| | * | | | merge in jb-mr1-release history after reset to jb-mr1-devThe Android Automerger2012-10-300-0/+0
| | |\ \ \ \ | | | |_|/ / | | |/| | |
| | | * | | partially implement external display clippingMathias Agopian2012-10-251-0/+25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | we perform external display clipping only on the GL side (ie: not done on the h/w composer side, which is harder and would be too risky). in practice this means that WFD will be clipped properly, while HDMI *may* or may not depending on how hwc is used. Bug: 7149437 Change-Id: I92d4d04220db72b6ffb134c7fa7a93af569723a5
| | | * | | merge in jb-mr1-release history after reset to jb-mr1-devThe Android Automerger2012-10-250-0/+0
| | | |\ \ \
| | | | * \ \ merge in jb-mr1-release history after reset to jb-mr1-devThe Android Automerger2012-10-220-0/+0
| | | | |\ \ \
| | | | | * \ \ merge in jb-mr1-release history after reset to jb-mr1-devThe Android Automerger2012-10-200-0/+0
| | | | | |\ \ \
| | | | | | * \ \ merge in jb-mr1-release history after reset to jb-mr1-devThe Android Automerger2012-10-190-0/+0
| | | | | | |\ \ \
| | | | | | | * \ \ merge in jb-mr1-release history after reset to jb-mr1-devThe Android Automerger2012-10-180-0/+0
| | | | | | | |\ \ \
| | | | | | | | * \ \ merge in jb-mr1-release history after reset to jb-mr1-devThe Android Automerger2012-10-170-0/+0
| | | | | | | | |\ \ \
| | | | | | | | | * \ \ merge in jb-mr1-release history after reset to jb-mr1-devThe Android Automerger2012-10-160-0/+0
| | | | | | | | | |\ \ \
| | | | | | | | | | * \ \ merge in jb-mr1-release history after reset to jb-mr1-devThe Android Automerger2012-10-160-0/+0
| | | | | | | | | | |\ \ \
| * | | | | | | | | | | | | Always set vertex alpha when drawing screenshot layersJesse Hall2012-10-221-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The screenshot is a GL_RGB texture, and the GL_REPLACE texture env mode uses vertex alpha for GL_RGB textures instead of alpha=1.0. Bug: 7340077 Change-Id: I6fbb907023e48f9c422b15a33da79757d6726840
| * | | | | | | | | | | | | SurfaceFlinger: add animation transactionsJamie Gennis2012-10-165-9/+55
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This change adds a transaction flag for WindowManager to indicate that a transaction is being used to animate windows around the screen. SurfaceFlinger will not allow more than one of these transactions to be outstanding at a time to prevent the animation "frames" from being dropped. Bug: 7353840 Change-Id: I6488a6e0e1ed13d27356d2203c9dc766dc6b1759
| * | | | | | | | | | | | | merge in jb-mr1-factory-release history after reset to jb-mr1-devThe Android Automerger2012-10-150-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \
* | \ \ \ \ \ \ \ \ \ \ \ \ \ am 742801c6: am 2281af96: dumpstate: add kernel memory fragmentation ↵Colin Cross2012-10-291-0/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | unusable index * commit '742801c625ecb09fbe14e717fa5d580b3957ed4a': dumpstate: add kernel memory fragmentation unusable index
| * | | | | | | | | | | | | | am 2281af96: dumpstate: add kernel memory fragmentation unusable indexColin Cross2012-10-291-0/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|/ / / / / / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '2281af967dd840aade7bc55b19ea7df0e6da36f2': dumpstate: add kernel memory fragmentation unusable index
| | * | | | | | | | | | | | | dumpstate: add kernel memory fragmentation unusable indexColin Cross2012-10-281-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Dump /d/extfrag/unusable_index in bugreports. It shows the percentage of memory in each zone that is not available for allocations for each order. Change-Id: I2af6680cb609887ea7b3d6107d1aa88bd0206b52
* | | | | | | | | | | | | | | am 78b4977e: Merge "Ensure that Vector::erase() returns a valid iterator" ↵Jason Simmons2012-10-251-1/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into jb-mr1-aah-dev * commit '78b4977efd365d2ad7c9227c3a89e65ab60c3260': Ensure that Vector::erase() returns a valid iterator
| * | | | | | | | | | | | | | Merge "Ensure that Vector::erase() returns a valid iterator" into jb-mr1-aah-devJason Simmons2012-10-251-1/+2
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / | |/| | | | | | | | | | | | |
| | * | | | | | | | | | | | | Ensure that Vector::erase() returns a valid iteratorJason Simmons2012-10-251-1/+2
| | | |_|_|/ / / / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Vector::erase may reallocate the Vector's storage while removing an element. However, erase() calls begin() before calling removeItemsAt(), thus caching a pointer the the Vector's old storage. If the storage is reallocated, the iterator returned by erase() will be based on the old storage pointer and will thus be invalid. Change-Id: I2450c55fd418e6b1c558a4ca7c024573abbaa098
* | | | | | | | | | | | | | am f45c5100: partially implement external display clippingMathias Agopian2012-10-251-0/+25
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'f45c510009edab4a3e93f8d66b2e30aa26759fed': partially implement external display clipping
| * | | | | | | | | | | | | partially implement external display clippingMathias Agopian2012-10-251-0/+25
| | |_|_|/ / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | we perform external display clipping only on the GL side (ie: not done on the h/w composer side, which is harder and would be too risky). in practice this means that WFD will be clipped properly, while HDMI *may* or may not depending on how hwc is used. Bug: 7149437 Change-Id: I92d4d04220db72b6ffb134c7fa7a93af569723a5
* | | | | | | | | | | | | am 04075569: Revert "Revert "put back the unused virtuals in Vector<>""Dave Burke2012-10-252-0/+39
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '04075569b565c949a6db8b4e8a9f10d281de4d9c': Revert "Revert "put back the unused virtuals in Vector<>""
| * | | | | | | | | | | | Revert "Revert "put back the unused virtuals in Vector<>""Dave Burke2012-10-252-0/+39
| |/ / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 225c66a48cdc3acef21ee380dc134449749d3cb3 Change-Id: If31a04b81052cbc7dd7bf237c07107c33066d03d
* | | | | | | | | | | | am d17e3b5f: prevent a client from crashing surfaceflingerMathias Agopian2012-10-221-2/+17
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'd17e3b5f6cf71eb52bc81f37719254ce08244b34': prevent a client from crashing surfaceflinger
| * | | | | | | | | | | prevent a client from crashing surfaceflingerMathias Agopian2012-10-221-2/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | a misbehaving or malicious client could cause SF to crash by providing a "fake" IInterface. we now check the IInterface we get is our own and local. Bug: 7278879 Change-Id: Ia19d05902d4b2385c5a16416148378d4998833fd
generated by cgit v1.1 at 2024-12-26 07:27:45 +0000