summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
* | | Merge "get rid of Surface::getISurfaceTexture()"Mathias Agopian2013-02-212-8/+26
|\ \ \
| * | | get rid of Surface::getISurfaceTexture()Mathias Agopian2013-02-192-8/+26
| | | | | | | | | | | | | | | | | | | | | | | | this was there just for legacy reasons. Change-Id: I0a48d6e04d7efa65033f9f10c91bba557f16ae8b
* | | | Merge remote-tracking branch 'goog/jb-mr2-release'Ed Heyl2013-02-200-0/+0
|\ \ \ \
| * \ \ \ merge in jb-mr2-release history after reset to masterThe Android Automerger2013-02-190-0/+0
| |\ \ \ \ | | |/ / / | |/| | |
| | * | | merge in jb-mr2-release history after reset to masterThe Android Automerger2013-02-140-0/+0
| | |\ \ \
| | | * \ \ merge in jb-mr2-release history after reset to masterThe Android Automerger2013-02-130-0/+0
| | | |\ \ \
| | | | * \ \ merge in jb-mr2-release history after reset to masterThe Android Automerger2013-02-120-0/+0
| | | | |\ \ \
| | | | | * \ \ merge in jb-mr2-release history after reset to masterThe Android Automerger2013-02-110-0/+0
| | | | | |\ \ \
| | | | | | * | | only disable hwc when alpha < 1.0Mathias Agopian2013-02-071-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 8149181 Change-Id: Ib3c7a44f04871e020adceeae16d002141ac758d4
| | | | | | * | | merge in jb-mr2-release history after reset to masterThe Android Automerger2013-02-060-0/+0
| | | | | | |\ \ \
| | | | | | | * \ \ merge in jb-mr2-release history after reset to masterThe Android Automerger2013-02-040-0/+0
| | | | | | | |\ \ \
| | | | | | | | * \ \ merge in jb-mr2-release history after reset to masterThe Android Automerger2013-01-310-0/+0
| | | | | | | | |\ \ \
| | | | | | | | | * \ \ merge in jb-mr2-release history after reset to masterThe Android Automerger2013-01-300-0/+0
| | | | | | | | | |\ \ \
| | | | | | | | | | * \ \ merge in jb-mr2-release history after reset to masterThe Android Automerger2013-01-160-0/+0
| | | | | | | | | | |\ \ \
| | | | | | | | | | | * \ \ merge in master-release history after reset to masterThe Android Automerger2013-01-140-0/+0
| | | | | | | | | | | |\ \ \
| | | | | | | | | | | | * | | Revert "App home directories are now 0700 for targetSdkVersion > 17"Nick Kralevich2013-01-094-29/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 7f5c84a0b25706746a92ad1233cbbb8923eda54d. Bug: 7966399 Bug: 7208882 Change-Id: I9fb13cf06c0f6605f3d992525346b14fe3259c66
| | | | | | | | | | | | * | | workaround: don't reset compositionType to HWC_FRAMEBUFFERMathias Agopian2013-01-091-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This workaround a HWC HAL issue in Nexus 7, which causes videos and live wallpapers to animate slowly. Bug: 7563862 Change-Id: I87803aaad9751b1fd8392b9732304d4bccec659a
* | | | | | | | | | | | | | | Fixes to native app ops servicesEino-Ville Talvala2013-02-194-26/+29
|/ / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 8181262 Change-Id: I3d3f20453f6c6f2756c988363c5b5453ef309cb6
* | | | | | | | | | | | | | fix build: SurfaceTextureClient to Surface renameMathias Agopian2013-02-151-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I0041e6f49bc637bc52161c83f0bd44101246f480
* | | | | | | | | | | | | | fix build: SurfaceTextureClient to Surface renameMathias Agopian2013-02-151-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I54d68241f1080eef640aefe71f33912ad79345ef
* | | | | | | | | | | | | | fix build: SurfaceTextureClient to Surface renameMathias Agopian2013-02-152-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ibcf98337940f9195bcff7b5e8bddb6e912e65163
* | | | | | | | | | | | | | Refactoring: Rename SurfaceTextureClient to SurfaceMathias Agopian2013-02-1427-1519/+1296
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ibed34175ae273608393aaa5f0a7df207dc40d709
* | | | | | | | | | | | | | Merge "remove access ANDROID_VIEW_SURFACE_JNI_ID"Mathias Agopian2013-02-142-2/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | remove access ANDROID_VIEW_SURFACE_JNI_IDMathias Agopian2013-02-132-2/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I0ef474ed9be2cd26fa520ef871ffcf21a25e4994
* | | | | | | | | | | | | | | Merge "get rid of Surface identity and token"Mathias Agopian2013-02-1415-208/+147
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / /
| * | | | | | | | | | | | | | get rid of Surface identity and tokenMathias Agopian2013-02-1315-208/+147
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | we use the IBinder instead. Change-Id: I4aa0b58869ba43f19980013620051e5a261b062d
* | | | | | | | | | | | | | | am 45b0e435: Merge "Simplify OpenGL TLS access on ARM."Elliott Hughes2013-02-146-65/+3
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / / / / / |/| | | | | | | | | | | | | / | | |_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | # Via Elliott Hughes (1) and Gerrit Code Review (1) * commit '45b0e4350d3404bd194edc569e36ecca017c3d76': Simplify OpenGL TLS access on ARM.
| * | | | | | | | | | | | | Merge "Simplify OpenGL TLS access on ARM."Elliott Hughes2013-02-146-65/+3
| |\ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | Simplify OpenGL TLS access on ARM.Elliott Hughes2013-02-136-65/+3
| |/ / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | bionic now assumes the TLS register is available, so OpenGL can too. Change-Id: If2b56a4c08de9f887759b78f70022026a181dc47
* | | | | | | | | | | | | | atrace: add HAL tagAlex Ray2013-02-131-0/+1
| |/ / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Idfd4f2075e8cd82833ef06d4487423c62b59fe11
* | | | | | | | | | | | | Merge changes I50831d4e,I5360aebeJamie Gennis2013-02-1313-72/+67
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * changes: flatland: remove an unneeded #include libgui: disallow NULL Fence pointers
| * | | | | | | | | | | | flatland: remove an unneeded #includeJamie Gennis2013-02-121-2/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I50831d4efd543664ff7df7aaef35d842aebf1bd6
| * | | | | | | | | | | | libgui: disallow NULL Fence pointersJamie Gennis2013-02-1212-70/+67
| | |/ / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This change eliminates the uses of a NULL sp<Fence> indicating that no waiting is required. Instead we use a non-NULL but invalid Fence object for which the wait methods will return immediately. Bug: 7892871 Change-Id: I5360aebe3090422ef6920d56c99fc4eedc642e48
* | | | | | | | | | | | Merge "Implement issue #6646859: 4K!!!! 4K!!!! 4K!!!!"Dianne Hackborn2013-02-121-0/+1
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Implement issue #6646859: 4K!!!! 4K!!!! 4K!!!!Dianne Hackborn2013-02-121-0/+1
| |/ / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I1bb630c58d0d41446b726de1b9d2c3875fcbbceb
* | | | | | | | | | | | Merge "App ops: new native access API."Dianne Hackborn2013-02-127-0/+552
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | |
| * | | | | | | | | | | App ops: new native access API.Dianne Hackborn2013-02-127-0/+552
| |/ / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is to help implementation of bug #8181262 and maybe bug #8181261 Note the current code has not yet been tested; it is only known to compile at this point. Change-Id: I489674c96d0d3fc0ddacc92611931a19a9ee5230
* | | | | | | | | | | Force a specific locale for sortingJesse Hall2013-02-111-0/+8
|/ / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Avoids irrelevant output differences based on the user's locale. The current output files were generated with a C or POSIX locale, and sort differently under en_US.UTF-8. Change-Id: I0dd85475e9ee2d58e7fa9fe2a4f86ad5c8142e00
* | | | | | | | | | Merge changes I8bded1ea,I7478293eJamie Gennis2013-02-116-24/+63
|\ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * changes: SurfaceFlinger: add win anim frame time tracking SurfaceFlinger: remove a driver bug workaround
| * | | | | | | | | SurfaceFlinger: add win anim frame time trackingJamie Gennis2013-02-086-21/+63
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This change makes the 'dumpsys SurfaceFlinger --latency' command with no extra args dump the frame timestamp data for the most recent frames that SurfaceFlinger generated that included window animation transaction changes. Change-Id: I8bded1ea08a4cddefef0aa955401052bb9107c90
| * | | | | | | | | SurfaceFlinger: remove a driver bug workaroundJamie Gennis2013-02-041-3/+0
| | |_|/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I7478293e87899d6e467db8c2f9e295935c8b1d4e
* | | | | | | | | Merge "Do not use su to run the df command in bugreports"Arve Hjønnevåg2013-02-091-1/+1
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Do not use su to run the df command in bugreportsKen Sumrall2013-02-081-1/+1
| | |_|/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | User builds do not have su, so when the bugreport attempts to report disk free space, the command fails and nothing is reported. However, the df command does not need to be run as root to report free space, so just run the command directly. Change-Id: Ic7deb696f293e772ddf28eacfe16e4250af9a9f3
* | | | | | | | | Merge "Adds some OpenMAX 1.1.2 IL extension headers."James Dong2013-02-092-0/+213
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Adds some OpenMAX 1.1.2 IL extension headers.Kunter Gultekin2013-02-072-0/+213
| |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Includes index and video extension headers in order to support vpx specific parameters and enable vpx encoder. Note that existing (seemingly modified) version of OMX_Video.h semantically conflicts with official OMX_VideoExt.h because former includes OMX_Video_CodingVPX as OMX_VIDEO_CODINGTYPE whereas official extension headers denote it as OMX_VIDEO_CodingVP8 within OMX_VIDEO_CODINGEXTTYPE. Change-Id: Ibab9663fcbc9c406a2cfb4bf79fe21e3b01a6e66 Signed-off-by: Kunter Gultekin <kuntergultekin@google.com>
* | | | | | | | | only disable hwc when alpha < 1.0Mathias Agopian2013-02-071-1/+3
|/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 8149181 Change-Id: Ib3c7a44f04871e020adceeae16d002141ac758d4
* | | | | | | | Add support for plane-alpha in HWCMathias Agopian2013-02-054-20/+31
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I218e7dd5f23de535aabce61e993002ab6cb46cdd
* | | | | | | | Merge "Remove unused HWCLayer::setPerFrameDefaultState()"Jesse Hall2013-02-053-5/+0
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | |
| * | | | | | | Remove unused HWCLayer::setPerFrameDefaultState()Jesse Hall2013-01-143-5/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 7977590 Change-Id: Ic49c4e38ef2ee6beaeb268c406347c882135bdf0
* | | | | | | | Revert "try to fix win_sdk build."Nick Kralevich2013-02-021-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | A better change was checked into system/core. See commit 941daef629bd571032851edf7ae1dce24266640e This reverts commit fa99d30ec773c5f9653d96570fb8961426bfe966.