summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Add support for OMX_QCOM_COLOR_FormatYUV420PackedSemiPlanar32m color formatRom Lemarchand2013-04-111-0/+1
| | | | Change-Id: I9392eb961ec92d4d778573b7a142344e552c80d6
* am 12ff91b0: am 53dc9044: Merge "Updated comments" into jb-mr2-devAndy McFadden2013-04-112-115/+212
|\ | | | | | | | | * commit '12ff91b05a055e6adffaad9bf7661a5d251c5b6c': Updated comments
| * am 53dc9044: Merge "Updated comments" into jb-mr2-devAndy McFadden2013-04-112-115/+212
| |\ | | | | | | | | | | | | * commit '53dc9044bfe17039592faf4660c5bf715e8120ad': Updated comments
| | * Merge "Updated comments" into jb-mr2-devAndy McFadden2013-04-112-115/+212
| | |\
| | | * Updated commentsAndy McFadden2013-04-052-115/+212
| | | | | | | | | | | | | | | | | | | | | | | | Updated many comments. Added one minor error check. Change-Id: Ib935dd99d417bada91d2e198008a50dd94269316
* | | | am 6a92b35e: Reconcile with jb-mr2-release - do not mergeThe Android Open Source Project2013-04-110-0/+0
|\ \ \ \ | |/ / / | | | | | | | | * commit '6a92b35e3a64c90127fb87530c50e9a04a61c671':
| * | | Reconcile with jb-mr2-release - do not mergeThe Android Open Source Project2013-04-110-0/+0
| |\ \ \ | | | | | | | | | | | | | | | Change-Id: If9501b8a4f0e4a1d6dc787c71457814360d11d2b
| | * \ \ merge in jb-mr2-release history after reset to jb-mr2-devThe Android Automerger2013-04-110-0/+0
| | |\ \ \ | | | |/ / | | |/| |
* | | | | am f30501e1: am d19e519f: Merge "fix another bug where screenshots could ↵Mathias Agopian2013-04-103-4/+37
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | end-up all black" into jb-mr2-dev * commit 'f30501e1e280e8b5637430ac2be79235ee16d018': fix another bug where screenshots could end-up all black
| * | | | am d19e519f: Merge "fix another bug where screenshots could end-up all ↵Mathias Agopian2013-04-103-4/+37
| |\ \ \ \ | | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | black" into jb-mr2-dev * commit 'd19e519f673adcc5d12fcca549e577eea74f31aa': fix another bug where screenshots could end-up all black
| | * | | Merge "fix another bug where screenshots could end-up all black" into jb-mr2-devMathias Agopian2013-04-113-4/+37
| | |\ \ \
| | | * | | fix another bug where screenshots could end-up all blackMathias Agopian2013-04-103-4/+37
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | SF transactions were always handled on VSYNC which allowed the screenshot to sneak-in between closing the transaction and vsync (before it's latched), resulting in a screenshot with the previous state. we now always force transactions to happen immediately before screenhots. Bug: 7552304 Change-Id: I0afc86b7e8366173daff5b9988bbb4d2a0f43860
* | | | | | am e1b8a7fc: Reconcile with jb-mr2-release - do not mergeThe Android Open Source Project2013-04-100-0/+0
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | * commit 'e1b8a7fcee9a193bf01f0842b0aca35b27bf0c16':
| * | | | | Reconcile with jb-mr2-release - do not mergeThe Android Open Source Project2013-04-100-0/+0
| |\ \ \ \ \ | | | |_|/ / | | |/| | | | | | | | | Change-Id: I968ec2bb02006948c3f24c449d2a79a0e2f799f9
| | * | | | merge in jb-mr2-release history after reset to jb-mr2-devThe Android Automerger2013-04-100-0/+0
| | |\ \ \ \ | | | |/ / / | | |/| | |
* | | | | | am 46f19772: resolved conflicts for merge of c76e8a20 to jb-mr2-dev-plus-aospYing Wang2013-04-0918-10/+26
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | * commit '46f19772ae5659c1659a0ac8f1f72389e94a85d4': Add liblog
| * | | | | resolved conflicts for merge of c76e8a20 to jb-mr2-dev-plus-aospYing Wang2013-04-0918-10/+26
| |\ \ \ \ \ | | |/ / / / | | | | | | | | | | | | Change-Id: I895a8ad8c936a80c70aaac739c6441d3c7c55834
| | * | | | Merge "Add liblog" into jb-mr2-devYing Wang2013-04-1018-10/+26
| | |\ \ \ \
| | | * | | | Add liblogYing Wang2013-04-0918-10/+26
| | | | |/ / | | | |/| | | | | | | | | | | | | | | | | | | | Bug: 8580410 Change-Id: I2ca4fa00dde0b574df3619134836bcb9315bd506
* | | | | | am 13c9a949: am 8758a3e3: Merge changes I82e361a6,I83694682 into jb-mr2-devJamie Gennis2013-04-094-17/+40
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | * commit '13c9a949b5d74f36edbdbfda764fe554cdbaefa9': libgui_test: increase the tolerance for a YUV test libgui: fix an EGLImage leak
| * | | | | am 8758a3e3: Merge changes I82e361a6,I83694682 into jb-mr2-devJamie Gennis2013-04-094-17/+40
| |\ \ \ \ \ | | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | * commit '8758a3e3941bae9ef11948506950521c4682acf1': libgui_test: increase the tolerance for a YUV test libgui: fix an EGLImage leak
| | * | | | Merge changes I82e361a6,I83694682 into jb-mr2-devJamie Gennis2013-04-094-17/+40
| | |\ \ \ \ | | | |/ / / | | |/| | | | | | | | | | | | | | | | | | | | | * changes: libgui_test: increase the tolerance for a YUV test libgui: fix an EGLImage leak
| | | * | | libgui_test: increase the tolerance for a YUV testJamie Gennis2013-04-081-12/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This change increases the pixel difference tolerance of the SurfaceTextureGLTest.TexturingFromCpuFilledYV12BufferNpot test from 2 to 3. Bug: 8349135 Change-Id: I82e361a689335f49065cacd8a3fc145d67b125f1
| | | * | | libgui: fix an EGLImage leakJamie Gennis2013-04-083-5/+28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This moves the call to ConsumerBase::abandon from the ConsumerBase dtor to ConsumerBase::onLastStrongRef. The abandon call relies on virtual methods to perform the clean-up, so calling it from the ConsumerBase dtor after the derived classes dtors ran was skipping some of the clean-up. The onLastStrongRef method should get called just before the most derived class's dtor gets called. Bug: 8349135 Change-Id: I836946826927cc1ed69c049049f525f92b17a269
* | | | | | am ecef1c1a: Reconcile with jb-mr2-release - do not mergeThe Android Open Source Project2013-04-080-0/+0
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | * commit 'ecef1c1a31619782737230b5fd45718f20760ca9':
| * | | | | Reconcile with jb-mr2-release - do not mergeThe Android Open Source Project2013-04-080-0/+0
| |\ \ \ \ \ | | | |_|/ / | | |/| | | | | | | | | Change-Id: I2e2b858b5fee36a390f92f657a171d2898ae9810
| | * | | | merge in jb-mr2-release history after reset to jb-mr2-devThe Android Automerger2013-04-080-0/+0
| | |\ \ \ \ | | | |/ / / | | |/| | |
| | | * | | merge in jb-mr2-release history after reset to jb-mr2-devThe Android Automerger2013-04-040-0/+0
| | | |\ \ \
* | | | \ \ \ am ff080169: am 1df59c93: Merge "Tell HWComposer the dimensions of virtual ↵Jesse Hall2013-04-053-14/+34
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | displays" into jb-mr2-dev * commit 'ff08016919e2c0508501faede26fda6dca833094': Tell HWComposer the dimensions of virtual displays
| * | | | | | am 1df59c93: Merge "Tell HWComposer the dimensions of virtual displays" into ↵Jesse Hall2013-04-053-14/+34
| |\ \ \ \ \ \ | | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | jb-mr2-dev * commit '1df59c93fea8bec21b8084c34aface086f1e0896': Tell HWComposer the dimensions of virtual displays
| | * | | | | Merge "Tell HWComposer the dimensions of virtual displays" into jb-mr2-devJesse Hall2013-04-063-14/+34
| | |\ \ \ \ \
| | | * | | | | Tell HWComposer the dimensions of virtual displaysJesse Hall2013-04-053-14/+34
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | HWComposer queries the HWC for dimensions of physical displays, but can't do that for virtual displays. The dimensions are used to set the display frame of the framebuffer target layer passed to HWC, and implicitly the dimensions of the virtual display. Bug: 8316155 Change-Id: I9cbd2530d2fa878f86128a1472def520b5d694a5
* | | | | | | | am 46ab373f: am d5e345b0: Merge "Actually set the virtual display output ↵Jesse Hall2013-04-051-1/+5
|\ \ \ \ \ \ \ \ | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | buffer." into jb-mr2-dev * commit '46ab373f1f394ec50e38381cb98d3976fe87a9bb': Actually set the virtual display output buffer.
| * | | | | | | am d5e345b0: Merge "Actually set the virtual display output buffer." into ↵Jesse Hall2013-04-051-1/+5
| |\ \ \ \ \ \ \ | | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | jb-mr2-dev * commit 'd5e345b0cf5c1c5aaa5c10a1a4c759e74d77fb37': Actually set the virtual display output buffer.
| | * | | | | | Merge "Actually set the virtual display output buffer." into jb-mr2-devJesse Hall2013-04-061-1/+5
| | |\ \ \ \ \ \ | | | |/ / / / / | | |/| | | | |
| | | * | | | | Actually set the virtual display output buffer.Jesse Hall2013-04-041-1/+5
| | | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 8316155 Change-Id: Ida1ac47e5a932fdaad3ec862e121cfe55d255699
* | | | | | | am e167d889: am a3d3e137: Merge "dumpstate: Add SELinux restorecon call."Geremy Condra2013-04-042-1/+6
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | * commit 'e167d889e4917e6b4f569026a1492b9e9818b08e': dumpstate: Add SELinux restorecon call.
| * | | | | | am a3d3e137: Merge "dumpstate: Add SELinux restorecon call."Geremy Condra2013-04-042-1/+6
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'a3d3e137f473a965fefced9670e3b0c6b5f7f791': dumpstate: Add SELinux restorecon call.
| | * \ \ \ \ \ Merge "dumpstate: Add SELinux restorecon call."Geremy Condra2013-04-042-1/+6
| | |\ \ \ \ \ \
| | | * | | | | | dumpstate: Add SELinux restorecon call.Robert Craig2013-04-042-1/+6
| | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Set the security context on the directory used to dump Dalvik and native stack traces. Change-Id: Iba13783f10e850485ce1a8d4aa5792d55085eb22 Signed-off-by: Robert Craig <rpcraig@tycho.ncsc.mil>
* | | | | | | | am dff2f699: am 39c24a20: fix local include pathsMathias Agopian2013-04-0411-22/+20
|\ \ \ \ \ \ \ \ | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | * commit 'dff2f699e16635c44472b0e4f2a3176e4f061367': fix local include paths
| * | | | | | | am 39c24a20: fix local include pathsMathias Agopian2013-04-0411-22/+20
| |\ \ \ \ \ \ \ | | | |/ / / / / | | |/| | | | | | | | | | | | | | | | | | | | | * commit '39c24a20bbc697630d2b92c251b70c04d6f9d00c': fix local include paths
| | * | | | | | fix local include pathsMathias Agopian2013-04-0411-22/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Icb921fa796ec08612dbb2feb7e7161bcb0cf4a99
* | | | | | | | am c809d2c7: am 18bd1d6d: Merge "Implement async event callout from drm ↵Jeff Tinker2013-04-041-3/+39
|\ \ \ \ \ \ \ \ | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | plugin to Java app" into jb-mr2-dev * commit 'c809d2c7219958bcb38b34060498f94d7812eb36': Implement async event callout from drm plugin to Java app
| * | | | | | | am 18bd1d6d: Merge "Implement async event callout from drm plugin to Java ↵Jeff Tinker2013-04-041-3/+39
| |\ \ \ \ \ \ \ | | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | app" into jb-mr2-dev * commit '18bd1d6d55a275d23188251169dfe3cc74882665': Implement async event callout from drm plugin to Java app
| | * | | | | | Merge "Implement async event callout from drm plugin to Java app" into ↵Jeff Tinker2013-04-051-3/+39
| | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | jb-mr2-dev
| | | * | | | | | Implement async event callout from drm plugin to Java appJeff Tinker2013-04-031-3/+39
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I83a7757a7b83676ce1a9ffa6ff0a8e495e31b859
* | | | | | | | | am 8123a227: am 6d5b8e60: Merge "Clean up HWC state when releasing a ↵Jesse Hall2013-04-045-17/+38
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | DisplayDevice" into jb-mr2-dev * commit '8123a2270d5893f9357ec18f9af4f3258406e468': Clean up HWC state when releasing a DisplayDevice
| * | | | | | | | am 6d5b8e60: Merge "Clean up HWC state when releasing a DisplayDevice" into ↵Jesse Hall2013-04-045-17/+38
| |\ \ \ \ \ \ \ \ | | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | jb-mr2-dev * commit '6d5b8e600e77164d3b5e51b89bf9c940fd7b4ea2': Clean up HWC state when releasing a DisplayDevice
| | * | | | | | | Merge "Clean up HWC state when releasing a DisplayDevice" into jb-mr2-devJesse Hall2013-04-045-17/+38
| | |\ \ \ \ \ \ \ | | | |_|_|/ / / / | | |/| | | | | |