summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Add bounds checking for transparency lookupcm-14.1Chris Craik2018-04-061-4/+5
| | | | | | | | | Bug: 71361451 Test: manual test with sample app Change-Id: Icaa626cfc93115fe1cc2f42040b396c2318bb6e4 (cherry picked from commit 53f97a2dd69b5b74e0fae2108ebab9276760aa47) (cherry picked from commit ebd849ed8aa77c0e1dad7a08df4a55845a067b76)
* Skip composition of frames lacking a color mapChris Craik2018-01-131-13/+12
| | | | | | | Bug:68399117 Change-Id: I32f1d6856221b8a60130633edb69da2d2986c27c (cherry picked from commit 0dc887f70eeea8d707cb426b96c6756edd1c607d)
* resolve merge conflicts of 89cdd4cb to mnc-dev am: d2fd12358d am: 684a68075e ↵Chris Craik2017-01-121-0/+4
|\ | | | | | | | | | | | | | | am: bf0a8eefb0 am: 51e1a563a3 am: 8906021aec am: 7901c75979 am: 200bf8583d am: d3a5ff7bfe Change-Id: Ifeba807b84a2d18184eb330c21cdfc1808ffdbdb
| * resolve merge conflicts of 89cdd4cb to mnc-dev am: d2fd12358d am: 684a68075e ↵Chris Craik2017-01-121-0/+4
| |\ | | | | | | | | | | | | | | | | | | | | | am: bf0a8eefb0 am: 51e1a563a3 am: 8906021aec am: 7901c75979 am: 200bf8583d Change-Id: I98bb2d48abf0300bc235c31599f4ebf700033138
| | * resolve merge conflicts of 89cdd4cb to mnc-dev am: d2fd12358d am: 684a68075e ↵Chris Craik2017-01-121-0/+4
| | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: bf0a8eefb0 am: 51e1a563a3 am: 8906021aec am: 7901c75979 Change-Id: If36dbf5297e87e0e95aafc058b1e839d69cd9240
| | | * resolve merge conflicts of 89cdd4cb to mnc-dev am: d2fd12358d am: 684a68075e ↵Chris Craik2017-01-121-0/+4
| | | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: bf0a8eefb0 am: 51e1a563a3 am: 8906021aec Change-Id: I12f009bc41c7d3ea0e1799bc14731412f5157a40
| | | | * resolve merge conflicts of 89cdd4cb to mnc-dev am: d2fd12358d am: 684a68075e ↵Chris Craik2017-01-121-0/+4
| | | | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: bf0a8eefb0 am: 51e1a563a3 Change-Id: I49c7365bdbbc35ccd9172a8a5975985677f0589c
| | | | | * resolve merge conflicts of 89cdd4cb to mnc-dev am: d2fd12358d am: 684a68075eChris Craik2017-01-121-0/+4
| | | | | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: bf0a8eefb0 Change-Id: I646c4b1dfa186630995b8ff3e3fca06c8661699f
| | | | | | * resolve merge conflicts of 89cdd4cb to mnc-dev am: d2fd12358dChris Craik2017-01-121-0/+4
| | | | | | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: 684a68075e Change-Id: Ia0caa4a687befe60bd36199f2921c55ca76d271e
| | | | | | | * resolve merge conflicts of 89cdd4cb to mnc-devChris Craik2017-01-121-0/+4
| | | | | | | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: d2fd12358d Change-Id: Ie2dde644caa0af42ee7b78fb82e50e1b498f4b12
| | | | | | | | * resolve merge conflicts of 89cdd4cb to mnc-devChris Craik2017-01-121-0/+4
| | | | | | | | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ie1421dc0fed3c3a20c5c146a253b27b8678a6207
| | | | | | | | | * Handle small sized webps correctly am: 88a377408bChris Craik2017-01-121-0/+4
| | | | | | | | | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: a489de64b7 Change-Id: I9a31796def02915eb122315ba0d4dcb96ff23ceb
| | | | | | | | | | * Handle small sized webps correctlyChris Craik2017-01-121-0/+4
| | | | | | | | | | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: 88a377408b Change-Id: I33b429ab240b6113481e9ccb1e771574b61815e4
| | | | | | | | | | | * Handle small sized webps correctlyChris Craik2017-01-101-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | bug:33718716 Change-Id: I54d63d54c7057828dfca1ab4ef47a44760e94ece
* | | | | | | | | | | | resolve merge conflicts of 3802db4 to mnc-dev am: fffaa9f25e am: 794a2883b1 ↵Chris Craik2016-11-162-2/+19
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: 7f28ac3755 am: 32cbf9ace0 am: ef31156a54 am: b4d78c7f4a am: 380440a870 am: dce18cc89a Change-Id: I1ef9a2e59759f17c35182d150225b3c77ab689b2
| * | | | | | | | | | | resolve merge conflicts of 3802db4 to mnc-dev am: fffaa9f25e am: 794a2883b1 ↵Chris Craik2016-11-162-2/+19
|/| | | | | | | | | | | | |/ / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: 7f28ac3755 am: 32cbf9ace0 am: ef31156a54 am: b4d78c7f4a am: 380440a870 Change-Id: I52f26d32957da6b846597d3160d92ffe0e47d7fa
| * | | | | | | | | | resolve merge conflicts of 3802db4 to mnc-dev am: fffaa9f25e am: 794a2883b1 ↵Chris Craik2016-11-162-2/+19
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: 7f28ac3755 am: 32cbf9ace0 am: ef31156a54 am: b4d78c7f4a Change-Id: I77a372127a524c7e80c636fa4944be7be5a05ec5
| | * | | | | | | | | resolve merge conflicts of 3802db4 to mnc-dev am: fffaa9f25e am: 794a2883b1 ↵Chris Craik2016-11-162-2/+19
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: 7f28ac3755 am: 32cbf9ace0 am: ef31156a54 Change-Id: I80b626495fe3d7af760f81284d64c3c02cc150f4
| | | * | | | | | | | resolve merge conflicts of 3802db4 to mnc-dev am: fffaa9f25e am: 794a2883b1 ↵Chris Craik2016-11-162-2/+19
| | | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: 7f28ac3755 am: 32cbf9ace0 Change-Id: Ie146529171bfc17dea3e2c34bf6ca692f1c191c0
| | | | * | | | | | | resolve merge conflicts of 3802db4 to mnc-dev am: fffaa9f25e am: 794a2883b1Chris Craik2016-11-162-2/+19
| | | | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: 7f28ac3755 Change-Id: I3b0eed8ef6f22065e5623b27cab0fac5f1b337da
| | | | | * | | | | | resolve merge conflicts of 3802db4 to mnc-dev am: fffaa9f25eChris Craik2016-11-162-2/+19
| | | | | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: 794a2883b1 Change-Id: I0850058268c635b00adbe085a3a192623cdb464c
| | | | | | * | | | | resolve merge conflicts of 3802db4 to mnc-devChris Craik2016-11-162-2/+19
| | | | | | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: fffaa9f25e Change-Id: I61775c7ecf911b9dad7b48c25eab6f2a7582644a
| | | | | | | * | | | resolve merge conflicts of 3802db4 to mnc-devChris Craik2016-11-162-2/+19
| | | | | | | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | bug:32338390 Change-Id: I304c0c8c646808e690918eae7d34f0852e2b0fa8
| | | | | | | | * | | Handle size correctly from webp header am: c6eca849a1Chris Craik2016-11-162-2/+18
| | | | | | | | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: 698f277c0e Change-Id: Idc3a8ee9034fa9bdd2337a8814013b0ab04665d2
| | | | | | | | | * | Handle size correctly from webp headerChris Craik2016-11-162-2/+18
| | | | | | | | | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: c6eca849a1 Change-Id: I74c248036741094d81ce4fc17f981f82b173602b
| | | | | | | | | | * Handle size correctly from webp headerChris Craik2016-11-162-2/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | bug:32338390 Change-Id: I8d79692c72fdc3b0cba5342179b0f30a21bae094
* | | | | | | | | | | Handle color bounds correctly in GIF decode. am: 0ada9456d0 am: ec73b0bbc7 ↵Chris Craik2016-10-181-1/+1
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: a7d4e89c4b am: 2fc0b7cc6c am: df56c4e613 am: 8b79a54199 am: d0eb7d1d99 am: 2889101573 am: 4d394a5d94 am: 05d50538e0 Change-Id: Ic2f68a088bf00813bd2c39decde82cfc2d7c81dc
| * | | | | | | | | | Handle color bounds correctly in GIF decode. am: 0ada9456d0 am: ec73b0bbc7 ↵Chris Craik2016-10-181-1/+1
|/| | | | | | | | | | | |/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: a7d4e89c4b am: 2fc0b7cc6c am: df56c4e613 am: 8b79a54199 am: d0eb7d1d99 am: 2889101573 am: 4d394a5d94 Change-Id: Ie2bb7b07c11fb27e29e815a6fc4204bafab67e53
| * / / / / / / / / Handle color bounds correctly in GIF decode. am: 0ada9456d0 am: ec73b0bbc7 ↵Chris Craik2016-10-181-1/+1
|/| | | | | | | | | | |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: a7d4e89c4b am: 2fc0b7cc6c am: df56c4e613 am: 8b79a54199 am: d0eb7d1d99 am: 2889101573 Change-Id: Idf3f84693f6cf98cc51309a708d2ea88a3cdbb58
| * / / / / / / / Handle color bounds correctly in GIF decode. am: 0ada9456d0 am: ec73b0bbc7 ↵Chris Craik2016-10-181-1/+1
|/| | | | | | | | | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: a7d4e89c4b am: 2fc0b7cc6c am: df56c4e613 am: 8b79a54199 am: d0eb7d1d99 Change-Id: Ifb12184a28597e4a93a28f24117efee42ba2035a
| * | | | | | | Handle color bounds correctly in GIF decode. am: 0ada9456d0 am: ec73b0bbc7 ↵Chris Craik2016-10-181-1/+1
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: a7d4e89c4b am: 2fc0b7cc6c am: df56c4e613 am: 8b79a54199 Change-Id: If6d77edfbbefa855f79d8fdb077c47945efa8ead
| | * | | | | | Handle color bounds correctly in GIF decode. am: 0ada9456d0 am: ec73b0bbc7 ↵Chris Craik2016-10-181-1/+1
| |/| | | | | | | | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: a7d4e89c4b am: 2fc0b7cc6c am: df56c4e613 Change-Id: I52a4cff5ed2ca3b560aa96ecfb2f25f5d8803659
| | * / / / / Handle color bounds correctly in GIF decode. am: 0ada9456d0 am: ec73b0bbc7 ↵Chris Craik2016-10-181-1/+1
| |/| | | | | | | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: a7d4e89c4b am: 2fc0b7cc6c Change-Id: Ic935159a43f29bee0db96a78a64496e797f57476
| | * / / / Handle color bounds correctly in GIF decode. am: 0ada9456d0 am: ec73b0bbc7Chris Craik2016-10-181-1/+1
| |/| | | | | | |/ / / | | | | | | | | | | | | | | | | | | | | am: a7d4e89c4b Change-Id: I6594694f91873e1669d374d4f88514495f863688
| | * | | Handle color bounds correctly in GIF decode. am: 0ada9456d0Chris Craik2016-10-181-1/+1
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | am: ec73b0bbc7 Change-Id: I7b408db5cc48f1f720575d4c2921103dec5db6d9
| | | * | Handle color bounds correctly in GIF decode.Chris Craik2016-10-181-1/+1
| | |/| | | | | |/ | | | | | | | | | | | | | | | | am: 0ada9456d0 Change-Id: I26325be8f2d30fbf5c309772125e8a1ff431dfff
| | | * Handle color bounds correctly in GIF decode.Chris Craik2016-10-181-1/+1
| | | | | | | | | | | | | | | | | | | | Bug: 31631842 Change-Id: Ia4d25d9cd440286366f82433d3ff227384c0572f
* | | | Fix StaleDataException in changeCursorstaging/cm-14.0Walter Jang2016-03-241-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Check whether the cursor is closed before trying to getColumnIndex Bug 26926075 Change-Id: Iffb0694b153f39d871d536dd60113c0853af7211
* | | | Output shorter lines for TLD patternSiyamed Sinir2015-11-251-4/+27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The output had line breaks at every alpha character and this caused lines that were too long to be in the code. This CL, tries to produce shorter lines by adding a new line if the current line is longer than a hundred characters. Change-Id: I87e8a1782ddc4f9369c0fd6018c499a2c0f75936
* | | | am f7570b7c: am 76bfd10a: (-s ours) am 1bd8dec0: Merge "Fix breakage from ↵Derek Sollenberger2015-08-270-0/+0
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | giflib update" * commit 'f7570b7cf996161ea10f66dbc0f4960e03c481f1':
| * \ \ \ am 76bfd10a: (-s ours) am 1bd8dec0: Merge "Fix breakage from giflib update"Derek Sollenberger2015-08-270-0/+0
| |\ \ \ \ | | | | | | | | | | | | | | | | | | * commit '76bfd10a3e2fc5f027b5fb634f2447dfb962c9bb':
| | * \ \ \ am 1bd8dec0: Merge "Fix breakage from giflib update"Derek Sollenberger2015-08-241-2/+2
| | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '1bd8dec0b9cf4d77e33cd535eb1f2c76448b505b': Fix breakage from giflib update
* | | | | | | add a logtag for framework metricsChris Wren2015-08-251-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 21266304 Change-Id: I6cb8b05d2efc70d3269f06a9c882afbe2d16ebda
* | | | | | | am 6448c467: am 1bd8dec0: Merge "Fix breakage from giflib update"Derek Sollenberger2015-08-241-2/+2
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '6448c46716316de42af17a49d9fbf2fd8865e033': Fix breakage from giflib update
| * | | | | | am 1bd8dec0: Merge "Fix breakage from giflib update"Derek Sollenberger2015-08-241-2/+2
| |\ \ \ \ \ \ | | |/ / / / / | |/| / / / / | | |/ / / / | | | | | | * commit '1bd8dec0b9cf4d77e33cd535eb1f2c76448b505b': Fix breakage from giflib update
| | * | | | Merge "Fix breakage from giflib update"Derek Sollenberger2015-08-241-2/+2
| | |\ \ \ \
| | | * | | | Fix breakage from giflib updateMatt Sarett2015-08-241-2/+2
| | |/ / / / | | | | | | | | | | | | | | | | | | Change-Id: Id758778cd9960292be038aa691f2420fbac1378c
* | | | | | am 4f54368f: am 8d069cf9: Merge "Camera2: Support waitForSurfacePrepared in ↵Yin-Chia Yeh2015-06-091-1/+53
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | BlockingSessionCallback" into mnc-dev * commit '4f54368fdbfb5f868070091a891c98303e9b114e': Camera2: Support waitForSurfacePrepared in BlockingSessionCallback
| * | | | | am 8d069cf9: Merge "Camera2: Support waitForSurfacePrepared in ↵Yin-Chia Yeh2015-06-091-1/+53
| |\ \ \ \ \ | | | |/ / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | BlockingSessionCallback" into mnc-dev * commit '8d069cf9807027f7b3148589292f8f0544179ebf': Camera2: Support waitForSurfacePrepared in BlockingSessionCallback
| | * | | | Merge "Camera2: Support waitForSurfacePrepared in BlockingSessionCallback" ↵stable/cm-13.0-ZNH2KBYin-Chia Yeh2015-06-091-1/+53
| | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | into mnc-dev