summaryrefslogtreecommitdiffstats
path: root/libs
Commit message (Collapse)AuthorAgeFilesLines
* am 33029221: Merge "revert the surface purgatory list and dependent ↵Mathias Agopian2011-03-091-1/+1
|\ | | | | | | | | | | | | changes." into gingerbread * commit '33029221619f14577bd0d0e7c2f815abc8f1b8ea': revert the surface purgatory list and dependent changes.
| * revert the surface purgatory list and dependent changes.Mathias Agopian2011-03-091-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | 6d0f6cb Revert "Fix [3513017] in lockscreen but showing empty launcher (live wallpaper) only" 6154412 Revert "partially fix [3306150] HTML5 video with H/W acceleration blackout (DO NOT MERGE)" 37c2a37 fix [3408713] Dialog window invisible sometimes It looks like there is a surface leak, it's unclear where it is. Without those reverts, this would cause a leak of the associated buffers which is far more problematic. this change might hide the surface leak. Bug: 4078032 Change-Id: Iedcda3ffcdd2f69d41047b5c3134c1e867ff90d7
* | am e23c235c: Merge "Only set KeyEvent long press flag when repeat count ↵Jeff Brown2011-03-031-4/+6
|\ \ | |/ | | | | | | | | | | equals 1." into gingerbread * commit 'e23c235c662c3028cfb080c6ed60d7defcdd0b69': Only set KeyEvent long press flag when repeat count equals 1.
| * Only set KeyEvent long press flag when repeat count equals 1.Jeff Brown2011-03-021-4/+6
| | | | | | | | | | | | | | This fixes a Gingerbread regression. Bug: 3507021 Change-Id: Ia6030665b6a406332adc0ee0d8ee3cb735338c8e
* | am 1110748b: DO NOT MERGE: USB accessory support libraryMike Lockwood2011-03-0213-2/+1315
|\ \ | |/ | | | | | | * commit '1110748b2df664f9c5066819c1f0616eae3394a7': DO NOT MERGE: USB accessory support library
| * DO NOT MERGE: USB accessory support libraryMike Lockwood2011-03-0213-2/+1315
| | | | | | | | | | | | | | | | | | | | | | | | This provides a mechanism for developing applications to work with USB accessories in versions of android prior to the introduction of the android.hardware.UsbManager APIs. Applications should link against the com.android.future.usb.accessory library to use this support. Change-Id: I0b61e20b63eec42c506f0895a0c9a439bdfdf7f5 Signed-off-by: Mike Lockwood <lockwood@android.com>
* | am 40bbf929: DO NOT MERGE: Backport USB accessory support to gingerbreadMike Lockwood2011-03-022-0/+223
|\ \ | |/ | | | | | | * commit '40bbf9295d5245d3917629ce15f7b37670aef1ac': DO NOT MERGE: Backport USB accessory support to gingerbread
| * DO NOT MERGE: Backport USB accessory support to gingerbreadMike Lockwood2011-03-012-0/+223
| | | | | | | | Signed-off-by: Mike Lockwood <lockwood@android.com>
* | am e88fa50b: Merge from open-source gingerbreadJean-Baptiste Queru2011-01-301-0/+1
|\ \ | |/ | | | | | | * commit 'e88fa50be8d6709ef58b7aeb01c5efa059bcac2e': fix failing thread object run
| * Merge from open-source gingerbreadJean-Baptiste Queru2011-01-301-0/+1
| |\ | | | | | | | | | Change-Id: I56f2ed37187796807fbf0de15274a85164f9432c
| | * fix failing thread object runRitu Srivastava2011-01-251-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | A previously exited Thread object refuses to run again, if the thread-id of the caller, conincides with the thread-id it previously used in the worker thread. Hence reset the previously used worker thread-id to -1 when it exits. Signed-off-by: Ritu Srivastava <rsrivast@sta.samsung.com> Change-Id: I873925c312a43ec8a16392b98cc959042ff6bfd2 Signed-off-by: Madan Ankapura <mankapur@sta.samsung.com>
* | | am a30063d8: am 25eb0464: Merge "Normalize output from aapt d"Dianne Hackborn2011-01-291-2/+34
|\ \ \ | | | | | | | | | | | | | | | | * commit 'a30063d80c08434ac3c7316f338c6d54110449ab': Normalize output from aapt d
| * \ \ Merge "Normalize output from aapt d"Dianne Hackborn2011-01-291-2/+34
| |\ \ \
| | * | | Normalize output from aapt dShachar Shemesh2011-01-041-2/+34
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Make the output from aapt dump --values resources and aapt dump xmltree normalized, so that it is unambigously displayed regardless of the content of the strings. Change-Id: Ia3bff36c4ee1e9a44f474534e154830948beabdf
* | | | | am 239fd805: Merge "fix [3361121] hang in glClear() - device unresponsive, ↵Mathias Agopian2011-01-251-32/+3
|\ \ \ \ \ | | |_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | OTA fails (DO NOT MERGE)" into gingerbread * commit '239fd805ef7c0e4116b0a89e20caaf287e91f017': fix [3361121] hang in glClear() - device unresponsive, OTA fails (DO NOT MERGE)
| * | | | fix [3361121] hang in glClear() - device unresponsive, OTA fails (DO NOT MERGE)Mathias Agopian2011-01-251-32/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Generally we never want to lock a buffer for write access if it is at the "head" on the surfaceflinger side. The only exception (1) is when the buffer is not currently in use AND there is at least one queued buffer -- in which case, SurfaceFlinger will never use said buffer anymore, because on the next composition around, it will be able to retire the first queued buffer. The logic above relies on SurfaceFlinger always retiring and locking a buffer before composition -- unfortunately this didn't happen during a screenshot. This could leave us in a situation where a buffer is locked by the application for write, and used by SurfaceFlinger for texturing, causing a hang. Here, we fix this issue by never assuming the exception (1), it was intended as an optimization allowing ANativeWindow::lockBuffer() to return sooner and was justified when most of SF composition was done in software. The actual buffer locking is now ensured by gralloc. We could have handled screenshots in a similar way to a regular composition, but it could have caused glitches on screen, essentially, taking a screenshot could cause to skip a frame. now that we removed the notion of a "inUse" buffer in surfaceflinger a lot of code can be simplified / removed. noteworthy, the whole concept of "unlockClient" wrt. "compositionComplete" is also gone.
* | | | | am 1955a5c9: Merge "partially fix [3306150] HTML5 video with H/W ↵Mathias Agopian2011-01-251-1/+1
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | acceleration blackout (DO NOT MERGE)" into gingerbread * commit '1955a5c9da421dc89bb1a1dd3d3193159192cde9': partially fix [3306150] HTML5 video with H/W acceleration blackout (DO NOT MERGE)
| * | | | partially fix [3306150] HTML5 video with H/W acceleration blackout (DO NOT ↵Mathias Agopian2011-01-251-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | MERGE) We used to guarantee that a layer in SurfaceFlinger would never be destroyed before all references (to its ISurface) on the client side would be released. At some point, this guarantee got relaxed to allow to free gralloc resources sooner. This last change was incorrect, because: - in implementations with reference-counting the gralloc resources wouldn't be released anyways, until all the mapping were gone - in implementations without ref counting, the client side would most likely crash or do something bad - it also caused the SharedBufferStack slot to be reallocated to another surface, which could be problematic if the client continued to use the surface after the window manager destroyed it. So, we essentially reinstate the guarantee that layers won't be destroyed until after all references to their ISurface are released. NOTE: This doesn't entirely fix 3306150 because there is another problem there where the Browser continues to use a surface after it has been destroyed. also improve SurfaceFlinger 'dumpsys' log list the purgatory, which shows windows that have been closed, but for which the client still has references.
* | | | | am d3fcd0a1: Merge "minor clean-up. SurfaceFlinger doesn\'t need ↵Mathias Agopian2011-01-251-3/+3
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | libpixelflinger.so. (DO NOT MERGE)" into gingerbread * commit 'd3fcd0a1c923498921107bb44fbc8b24582a170a': minor clean-up. SurfaceFlinger doesn't need libpixelflinger.so. (DO NOT MERGE)
| * | | | minor clean-up. SurfaceFlinger doesn't need libpixelflinger.so. (DO NOT MERGE)Mathias Agopian2011-01-251-3/+3
| | | | | | | | | | | | | | | | | | | | Change-Id: I1ddbbbec4fa5b2521ef3787bc28efe1bc90d0060
* | | | | am 265cf2e7: Merge "Fix getSwitchState."Jeff Brown2011-01-222-2/+2
|\ \ \ \ \ | | |/ / / | |/| | | | | | | | | | | | | * commit '265cf2e76bef9ee369a7d43d567a22a0c39355ef': Fix getSwitchState.
| * | | | Fix getSwitchState.Jeff Brown2011-01-192-2/+2
| | |/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | InputReader::getSwitchState always returns AKEY_STATE_UNKNOWN because SwitchInputMapper::getSources() returns 0 which cannot match any source mask including AINPUT_SOURCE_ANY. As a result initial lid switch detection is broken. This change adds a new source constant AINPUT_SOURCE_SWITCH that indicates that the source has switches. Change-Id: I5321ecf0ce84f1c2b4535f6c163d3f4dcf9b7a9b
* | | | am a0bafb47: Merge "Use EGL_NATIVE_VISUAL_ID to select EGLConfig" into ↵Mathias Agopian2011-01-191-19/+4
|\ \ \ \ | | |/ / | |/| | | | | | | | | | | | | | | | | | gingerbread * commit 'a0bafb471385767f7c9c91efe7fd828b069b2e97': Use EGL_NATIVE_VISUAL_ID to select EGLConfig
| * | | Merge "Use EGL_NATIVE_VISUAL_ID to select EGLConfig" into gingerbreadMathias Agopian2011-01-191-19/+4
| |\ \ \
| | * | | Use EGL_NATIVE_VISUAL_ID to select EGLConfigMathias Agopian2011-01-161-19/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | EGLUtils::selectConfigForPixelFormat() now uses EGL_NATIVE_VISUAL_ID to select a config with the proper format. this is more robust and future proof. Change-Id: Ib85e0974160945d838956b50a3cac4de78618957
* | | | | am 41395459: Merge "Filter virtual keys after touches. (DO NOT MERGE)" into ↵Jeff Brown2011-01-182-1/+63
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | gingerbread * commit '41395459e676cf9ab4059e08446656f145662c2d': Filter virtual keys after touches. (DO NOT MERGE)
| * | | | Merge "Filter virtual keys after touches. (DO NOT MERGE)" into gingerbreadJeff Brown2011-01-182-1/+63
| |\ \ \ \
| | * | | | Filter virtual keys after touches. (DO NOT MERGE)Jeff Brown2011-01-112-1/+63
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Adds a new virtualKeyQuietTimeMillis configuration resource that sets the duration for which virtual keys will be dropped after recent touches on screen. The default value is 0; it is intended to be overridden per device using a resource overlay. This change is designed to help in two cases: 1. Swipes from touchscreen into virtual key area. 2. Accidental taps in virtual key area while using on-screen keyboard. Bug: 3089163 Change-Id: Id6733c83c2e2bc8d9553aa0e5c1fd74b741bec6e
* | | | | | am 72abf01a: Merge "Fix the ISurfaceComposer onTransact switch." into ↵Mathias Agopian2011-01-181-2/+2
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | gingerbread * commit '72abf01a8b6958ac1f86d36302a8462c4f51fd9d': Fix the ISurfaceComposer onTransact switch.
| * | | | | Fix the ISurfaceComposer onTransact switch.Jamie Gennis2011-01-161-2/+2
| | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Two of the cases in the ISurfaceComposer onTransact switch statement were missing 'break' statements at the end, and would fall through to the next case block. This change adds those break statements. Change-Id: I6dcc84263d3ea03d94612c667103283846b3dee1
* | | | | am bec4abaa: Merge "Fix issue 3302649." into gingerbreadEric Laurent2011-01-121-0/+3
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | * commit 'bec4abaa12bf6759f354b54119c5524cf9339e7b': Fix issue 3302649.
| * | | | Fix issue 3302649.Eric Laurent2011-01-041-0/+3
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The cause of the problem is that AudioTrack::start() can fail if it is called from a newly created thread that has the same ID as the AudioTrack callback thread that has just been stopped and not yet exited. This is possible as the thread ID used by the Thread class is not the TID. The fix consists in clearing the thread ID before exiting the thread loop. Change-Id: I66e679665c384403cb3ba2c31746f5de72d5836d
* | | | am bfb5f596: Merge "Fix for writing empty strings to Parcel::writeString8()"Jean-Baptiste Queru2010-12-281-1/+4
|\ \ \ \ | | |/ / | |/| | | | | | | | | | * commit 'bfb5f5966b36c4960b56f6de10ba261332208db9': Fix for writing empty strings to Parcel::writeString8()
| * | | Fix for writing empty strings to Parcel::writeString8()Pravat Dalbehera2010-12-221-1/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If writeString8 is called with the following sequence: writeString8(String8("")); writeString8(String8("TempString")); Then in the readString8, the 2nd String i.e. "TempString" is not read, instead an empty string is read. The bug comes because of the write call for String8("") where there are no String bytes present. In the write Statement, an extra ‘\0’ is written. During the Marshalling, Following bytes are written: 1 2 3 4 5 ... 0x0 0x0 0xB ‘T’ ‘e’ ... The readString8 function has a check that, if String length is 0, don’t read anything. So the first byte is read as the length for the first string. The second byte i.e. ‘\0’ is read as the length for the second string and hence the second string becomes empty too. Change-Id: Id7acc0c80ae16e77be4331f1ddf69ea87e758420
* | | | am c6f2b3b3: Merge "Fix policy issues when screen is off. (DO NOT MERGE)" ↵Jeff Brown2010-12-231-1/+15
|\ \ \ \ | | |/ / | |/| | | | | | | | | | | | | | | | | | into gingerbread * commit 'c6f2b3b302c06b8b7b81ec7e3a43a7df1813d0e0': Fix policy issues when screen is off. (DO NOT MERGE)
| * | | Fix policy issues when screen is off. (DO NOT MERGE)Jeff Brown2010-12-221-1/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Rewrote interceptKeyBeforeQueueing to make the handling more systematic. Behavior should be identical except: - We never pass keys to applications when the screen is off and the keyguard is not showing (the proximity sensor turned off the screen). Previously we passed all non-wake keys through in this case which caused a bug on Crespo where the screen would come back on if a soft key was held at the time of power off because the resulting key up event would sneak in just before the keyguard was shown. It would then be passed through to the dispatcher which would poke user activity and wake up the screen. - We propagate the key flags when broadcasting media keys which ensures that recipients can tell when the key is canceled. - We ignore endcall or power if canceled (shouldn't happen anyways). Changed the input dispatcher to not poke user activity for canceled events since they are synthetic and should not wake the device. Changed the lock screen so that it does not poke the wake lock when the grab handle is released. This fixes a bug where the screen would come back on immediately if the power went off while the user was holding one of the grab handles because the sliding tab would receive an up event after screen turned off and release the grab handles. Bug: 3144874 Change-Id: Iebb91e10592b4ef2de4b1dd3a2e1e4254aacb697
* | | | am 0c8ad64d: Merge "fix [3127755] Launcher is missing anti-aliasing" into ↵Simon Wilson2010-12-203-1/+8
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | gingerbread * commit '0c8ad64d64b23e2bdd62bc217e327c7e0583784b': fix [3127755] Launcher is missing anti-aliasing
| * | | fix [3127755] Launcher is missing anti-aliasingMathias Agopian2010-12-153-1/+8
| | | | | | | | | | | | | | | | | | | | | | | | Enable limited forms of mipmaping when possible. Change-Id: I39ad90becaa4048844fdbbbcb187333e7d59fc6a
* | | | am a2977c38: Merge changes Ie03796ae,Ide3e980a into gingerbreadMathias Agopian2010-12-071-6/+13
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | * commit 'a2977c383d363e1e88a5b36230b1fa4c312807d2': [3171580] SurfaceFlinger Bypass mode. (DO NOT MERGE) [3171580] Add transform field to native buffers. (DO NOT MERGE)
| * | | Merge changes Ie03796ae,Ide3e980a into gingerbreadMathias Agopian2010-12-071-6/+13
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | * changes: [3171580] SurfaceFlinger Bypass mode. (DO NOT MERGE) [3171580] Add transform field to native buffers. (DO NOT MERGE)
| | * | | [3171580] Add transform field to native buffers. (DO NOT MERGE)Mathias Agopian2010-12-031-6/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This field indicate how the content of the buffer needs to be transformed. Change-Id: Ide3e980a90599e931406135693231276626adbbb
* | | | | am 4153bf3a: Merge "[3171580] don\'t automatically log GraphicBuffer ↵Mathias Agopian2010-12-072-4/+12
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | allocation failures" into gingerbread * commit '4153bf3a259624a2f2dc497b77b225a1fb517abc': [3171580] don't automatically log GraphicBuffer allocation failures
| * | | | Merge "[3171580] don't automatically log GraphicBuffer allocation failures" ↵Mathias Agopian2010-12-072-4/+12
| |\ \ \ \ | | |/ / / | | | | | | | | | | into gingerbread
| | * | | [3171580] don't automatically log GraphicBuffer allocation failuresMathias Agopian2010-12-032-4/+12
| | | |/ | | |/| | | | | | | | | | | | | | | | | | | | | some of these failures are not fatal and even expected in some cases so they should not emit a dump in the log in those cases. Change-Id: Idcfa252e3bfa9d74e27fe4ad8f8623aa01aa9c5e
* | | | am d57fbe88: Fixed a race condition where some recording frames may not be ↵James Dong2010-12-061-0/+3
|\ \ \ \ | |/ / / | | | / | |_|/ |/| | | | | | | | released * commit 'd57fbe887fabd027e644caeaa2139c863143a786': Fixed a race condition where some recording frames may not be released
| * | Fixed a race condition where some recording frames may not be releasedJames Dong2010-12-061-0/+3
| |/ | | | | | | | | | | bug - 3258924 Change-Id: I4f30d04a713676f5da40e6a7dd861510cc041f9b
* | am f0f6c54b: Merge "frameworks/base: Destroy the overlay even if there is an ↵Jean-Baptiste Queru2010-11-231-2/+7
|\ \ | | | | | | | | | | | | | | | | | | error" * commit 'f0f6c54b13831b11bd7a3bd7a01dc49b7505e56e': frameworks/base: Destroy the overlay even if there is an error
| * | frameworks/base: Destroy the overlay even if there is an errorNaomi Luis2010-11-221-2/+7
| | | | | | | | | | | | | | | | | | | | | | | | Allow the overlay object to be destroyed whenever the destroy is invoked. Currently the destroy call returns if there is an error encountered, which results in open data and control channels. Change-Id: I1f2ef4ebb5fb1dcabf05ab50b5bbf6e5e240a63a
* | | am b27b8c0c: Fix a key repeating bug. (DO NOT MERGE)Jeff Brown2010-11-181-40/+40
|\ \ \ | | |/ | |/| | | | | | | * commit 'b27b8c0caf8ff23d10eea655085769f314050427': Fix a key repeating bug. (DO NOT MERGE)
| * | Fix a key repeating bug. (DO NOT MERGE)Jeff Brown2010-11-171-40/+40
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This change fixes a bug in the dispatcher where the window manager policy would incorrectly receive a key repeat count of 0 in the case where the key repeat was generated by the hardware or driver. Long-press on HOME was broken as a result. Repeating keys could also get stuck down. Bug: 3159581 Bug: 3208156 Change-Id: I1145487cfcc41a7850dba4cafc63c4a5951ace5b