summaryrefslogtreecommitdiffstats
path: root/core/jni/android
Commit message (Collapse)AuthorAgeFilesLines
* am 3523e4fc: am efe085ff: Merge "Handle bad ninepatch data." into lmp-mr1-devLeon Scroggins III2015-01-271-1/+3
|\ | | | | | | | | * commit '3523e4fcb3c74a5dee2f4497e2b8ec7b9e2b5e57': Handle bad ninepatch data.
| * Handle bad ninepatch data.Leon Scroggins III2015-01-271-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | Changes proposed by Ben Hawkes of Google Project Zero. NinePatchPeeker.cpp: Instead of asserting, return false for bad data. ResourceTypes.h: Store ninepatch values as unsigned. BUG:19151999 Change-Id: Ibe35e7569f632c6bb8a34a7701e26bb6ed547ec2
* | am 0de2eca5: am 112e35b4: Merge "Update generationId on bitmaps when decoded ↵Chris Craik2015-01-151-0/+1
|\ \ | |/ | | | | | | | | | | into by BitmapRegionDecoder" into lmp-mr1-dev * commit '0de2eca5fc439e2622cc0cc5a54cd9a5938f67c6': Update generationId on bitmaps when decoded into by BitmapRegionDecoder
| * Merge "Update generationId on bitmaps when decoded into by ↵Chris Craik2015-01-151-0/+1
| |\ | | | | | | | | | BitmapRegionDecoder" into lmp-mr1-dev
| | * Update generationId on bitmaps when decoded into by BitmapRegionDecoderChris Craik2015-01-141-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | bug:18921087 This fixes issues where bitmaps are cached as textures, and not reuploaded when reused by BitmapRegionDecoder, showing stale content. Change-Id: I7626fd6acd36d8e38723689734855ce9154eb8c8
| * | Check for OOM in BitmapFactory's getMimeTypeString().Vladimir Marko2015-01-071-4/+9
| |/ | | | | | | | | | | | | | | Bug: 18909596 (cherry picked from commit 7ab249a18e08bfefb8c2d60af1fb668c67ba4368) Change-Id: Ie7be228442876d47faf37e3f664e378253dab6e3
* | am bf31cb6b: am 8371f2e3: Merge "Check for OOM in BitmapFactory\'s ↵Vladimir Marko2015-01-071-5/+10
|\ \ | | | | | | | | | | | | | | | | | | getMimeTypeString()." * commit 'bf31cb6be4290ce161d99a2a70c318f665a14a77': Check for OOM in BitmapFactory's getMimeTypeString().
| * | Check for OOM in BitmapFactory's getMimeTypeString().Vladimir Marko2015-01-061-5/+10
| | | | | | | | | | | | | | | Bug: 18909596 Change-Id: If65fe45f5fd569a99a0cae1d31117af262bca430
* | | am f60b2d40: am 024191b5: Merge "Fix comment. It should be \'or\' not \'of\'."Narayan Kamath2015-01-061-1/+1
|\ \ \ | |/ / | | | | | | | | | * commit 'f60b2d40b0b8dea2c83335c00fd7767008aa0abe': Fix comment. It should be 'or' not 'of'.
| * | Merge "Fix comment. It should be 'or' not 'of'."Narayan Kamath2015-01-061-1/+1
| |\ \
| | * | Fix comment. It should be 'or' not 'of'.Roger Hu2013-12-301-1/+1
| | | | | | | | | | | | | | | | Change-Id: Ie713e1072cd145a493480221d93e400d6d406a0e
* | | | am c1a2f38c: am 4d9da135: Merge "Update AndroidPixelRef to prevent VM from ↵Derek Sollenberger2014-12-042-142/+5
|\ \ \ \ | | |_|/ | |/| | | | | | | | | | | | | | | | | | cleaning up memory prematurely." into lmp-mr1-dev * commit 'c1a2f38ce0447b005d0cde6836857f451af84dc6': Update AndroidPixelRef to prevent VM from cleaning up memory prematurely.
| * | | Update AndroidPixelRef to prevent VM from cleaning up memory prematurely.Derek Sollenberger2014-12-032-142/+5
| | | | | | | | | | | | | | | | | | | | bug:18306529 Change-Id: I1ea94df1dcaf4fcf248b63dc8b0a13f36412570a
* | | | am 38134303: am 84be180e: Merge "Fix crash in getNativeCanvas when ↵Bo Liu2014-11-251-0/+3
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | canvasHandle is NULL" into lmp-mr1-dev * commit '3813430367591efcf925b2baebc50a99a7666644': Fix crash in getNativeCanvas when canvasHandle is NULL
| * | | Fix crash in getNativeCanvas when canvasHandle is NULLBo Liu2014-11-241-0/+3
| | | | | | | | | | | | | | | | | | | | BUG: 18261928 Change-Id: I01a5af201fe829d5752433e1bb0db7edc01733d4
* | | | am 05f7c39e: am fc4a7538: Merge "Revert "Frameworks/base: Mask Skia warning ↵Chih-hung Hsieh2014-11-221-4/+0
|\ \ \ \ | | |/ / | |/| | | | | | | | | | | | | | | | | | in GraphicsJNI"" * commit '05f7c39eb45854f8d2a8a2aabb9ad9a4f9b867c1': Revert "Frameworks/base: Mask Skia warning in GraphicsJNI"
| * | | Merge "Revert "Frameworks/base: Mask Skia warning in GraphicsJNI""Chih-hung Hsieh2014-11-221-4/+0
| |\ \ \
| | * | | Revert "Frameworks/base: Mask Skia warning in GraphicsJNI"Chih-hung Hsieh2014-11-211-4/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Should be unnecessary after c/115476. This reverts commit ba823cee8bafff98640408a777fe105a72fcea0d. Change-Id: I3ef4d3e04805e450038d469d9672dc064f729b0f
* | | | | resolved conflicts for merge of 3fc5e3ca to lmp-mr1-dev-plus-aospAndreas Gampe2014-11-2147-430/+314
|\ \ \ \ \ | |/ / / / | | | | | | | | | | Change-Id: Id8286e5a4381315a6060251a8055b0f1d1a96019
| * | | | Frameworks/base: Consistency in core/jniAndreas Gampe2014-11-2147-422/+306
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Make consistent use of core_jni_helpers for registration. Translate some #ifdefs into const bools. Change-Id: I37639aa053dd50f003a552cbd8550dddecc811c5
* | | | | resolved conflicts for merge of 8e0cfe7c to lmp-mr1-dev-plus-aospDan Albert2014-11-207-28/+24
|\ \ \ \ \ | |/ / / / | | | | | | | | | | Change-Id: I068d2a0fb118d4e2b4c1e546bebfcbc2cb120d36
| * | | | Fix clang warnings in core/jni.Dan Albert2014-11-207-24/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | There are a few bugs in here too (mostly people expecting + to concatenate C strings) :( Change-Id: I0a243c05c4ea8b56e84896f37814d0fbea4c39d5
* | | | | am b1e4e89b: Merge "Fix incorrect usage of bool"Chih-hung Hsieh2014-11-191-1/+1
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | * commit 'b1e4e89b86ee12335fa1398a6b2bc0a0604599de': Fix incorrect usage of bool
| * | | | Fix incorrect usage of boolBernhard Rosenkränzer2014-11-171-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | A bool can't be < 0 Change-Id: Ie94ffadcb38c95214d1105c02610e59b4b2872b2 Signed-off-by: Bernhard Rosenkränzer <Bernhard.Rosenkranzer@linaro.org>
* | | | | Frameworks/base: Mask pdfium warningAndreas Gampe2014-11-131-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Mask out warnings from external/. Change-Id: I371e1346925c7eb5cdc9c4dcffab41ff0c6ddd63
* | | | | am 0626ec58: Merge "Frameworks/base: Wall Werror in core/jni"Andreas Gampe2014-11-136-30/+8
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | * commit '0626ec58243c9dc7f4812a453ef9456b1f7ff1f4': Frameworks/base: Wall Werror in core/jni
| * | | | Frameworks/base: Wall Werror in core/jniAndreas Gampe2014-11-136-30/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Turn on -Wall -Werror in core/jni. Fix warnings. Clang TODO: For GCC we need to turn off Wunused-but-set-variable in the GL bindings. However, Clang doesn't have that warning and thus complains about an unknown pragma. It is necessary to make the pragma #ifdef-ed on the compiler being GCC. Change-Id: I14cab48d45c2771eef0432082356c47ed44a3d7f
* | | | | am 34acb4c8: Merge "Prevent resource leak in YuvToJpegEncoder"Elliott Hughes2014-11-121-0/+1
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | * commit '34acb4c8d4abe1c4f580b85ddc84b18b7e38e417': Prevent resource leak in YuvToJpegEncoder
| * | | | Merge "Prevent resource leak in YuvToJpegEncoder"Elliott Hughes2014-11-121-0/+1
| |\ \ \ \ | | |/ / / | |/| | |
| | * | | Prevent resource leak in YuvToJpegEncoderMartin Wallgren2014-11-111-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | SkWStream is never deleted before going out of scope Change-Id: Ifdb75c18336d095b012e73b64281ec6c2fc5c3fe
* | | | | am 71f83672: Merge "Frameworks/base: Mask Skia warning in GraphicsJNI"Andreas Gampe2014-11-111-0/+4
|\ \ \ \ \ | |/ / / / | | | / / | |_|/ / |/| | | * commit '71f83672f297b116988defbe989869e5744cda5e': Frameworks/base: Mask Skia warning in GraphicsJNI
| * | | Frameworks/base: Mask Skia warning in GraphicsJNIAndreas Gampe2014-11-101-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | Do not allow unused-parameter warnings from Skia includes. Change-Id: Icc765cb0eaf10cd566a64892fbfe7380143ccb42
| * | | Fix memory leak where we close the descriptor instead of the file.Derek Sollenberger2014-11-101-4/+15
| |/ / | | | | | | | | | | | | | | | | | | (cherry pick of 5cb769d99952ef9fb4f576abba70423fe157342b.) bug: 17541634 Change-Id: I9968f9df249e4cba24383239ce6130dd16fcd532
* | | Merge "Add a BufferItem parameter to onFrameAvailable" into lmp-mr1-devDan Stoza2014-11-071-2/+2
|\ \ \
| * | | Add a BufferItem parameter to onFrameAvailableDan Stoza2014-11-041-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Passes the BufferItem for the queued buffer to the onFrameAvailable callback so the consumer can track the BufferQueue's contents. Bug: 18111837 Change-Id: If9d07229c9b586c668e5f99074e9b63b0468feb0
* | | | Yank ResourceCache out of CachesJohn Reck2014-11-063-11/+11
|/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 17947547 Pull the ResourceCache (aka, ref-counting side channel) out of Caches so that DisplayListRenderer doesn't use Caches, avoiding the risk of instantiating Caches on the wrong thread or without a GL context Change-Id: I7d63b70b3b0a0163308c5dedd6ef255eadebe8fd
* | | Crash apps that print malformed or password protected PDFs.Svet Ganov2014-11-012-4/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | If apps are writing malformed content (typically not a PDF file) or if the PDF content they provide to the print system is password protected, are now crashed as both of these are app bugs. bug:17636435 Change-Id: Ifce6a3199e587448dd38f6a84290a965c24b698b
* | | Save to a PDF file should look like print preview.Svetoslav2014-10-311-2/+202
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When rendering a PDF file for print preview we take into account the selected print options such as paper size, orientation, etc without modifying the document. To print we send the doc in its original form and the print options so the print service can apply the necessary transforms in addition to the optional custom options it supports. When saving to PDF we have to actually change the document as we act as a print service. bug:13545980 Change-Id: Icdcecf962bec6ff742cc6015df5af9d9086ce760
* | | Merge "Decoder only returns true on complete success." into lmp-mr1-devLeon Scroggins III2014-10-221-1/+2
|\ \ \
| * | | Decoder only returns true on complete success.Leon Scroggins III2014-10-171-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Recently we added a way for SkImageDecoder::decode to distinguish between successfully decoding the entire image and only partially decoding the image (see https://codereview.chromium.org/647023006). Only consider a call to decode() a success if the image was completely decoded. This matches pre-L behavior, and lets the caller know that they need to try to decode again. Requires a change to external/skia (I33e6940e247b74b20361ae041f8d36eb600df49f) BUG:17419670 Change-Id: I17ed7288b2359fafaec9551adb16d1d037800eb7
* | | | am e463bc38: am 3c8bde55: Merge "Report that a JavaInputStreamAdaptor is at ↵Leon Scroggins III2014-10-221-0/+5
|\ \ \ \ | |/ / / |/| | | | | | | | | | | | | | | | | | | end." into lmp-dev * commit 'e463bc388e7f5d83f864b320dde400e390ef5817': Report that a JavaInputStreamAdaptor is at end.
| * | | Report that a JavaInputStreamAdaptor is at end.Leon Scroggins III2014-10-201-0/+5
| |/ / | | | | | | | | | | | | | | | | | | This prevents a naive caller from continuing to attempt to read. BUG:17419670 BUG:17873145 Change-Id: Idd462ff9055aea42e8c7d5d58ef177f9e667385b
* | | Merge "Enable fast jni for simple RenderNode/Matrix/Paint operations" into ↵Chris Craik2014-10-082-93/+97
|\ \ \ | | | | | | | | | | | | lmp-mr1-dev
| * | | Enable fast jni for simple RenderNode/Matrix/Paint operationsChris Craik2014-10-072-93/+97
| |/ / | | | | | | | | | | | | | | | bug:17895119 Change-Id: Id83bfd719ec873028f0d4e7e4e4c0702f3bb3dd9
* | | Fix memory leak where we close the descriptor instead of the file.Derek Sollenberger2014-09-291-4/+15
|/ / | | | | | | | | bug: 17541634 Change-Id: I9968f9df249e4cba24383239ce6130dd16fcd532
* | Revert "Fix memory leak where we close the descriptor instead of the file."Jérôme Poichet2014-09-261-11/+5
| | | | | | | | | | | | This reverts commit 1503ebd95fc82b1ae6ec8b006e62a9f6109973fa. Change-Id: Id40cf34821ea244b1a838079bd147bc845b96cb3
* | Fix memory leak where we close the descriptor instead of the file.Derek Sollenberger2014-09-241-5/+11
| | | | | | | | | | bug: 17541634 Change-Id: I842176213e0547dd737ef6e0b83c320a5cc32219
* | Merge "Allow Path approximation to work with a single point Path." into lmp-devGeorge Mount2014-09-111-3/+16
|\ \
| * | Allow Path approximation to work with a single point Path.George Mount2014-09-111-3/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug 17452965 A single point Path (move-to only) was not returning any verbs in the verb list. This forces an approximation for single move-to and empty paths by giving the same value for fraction 0 and fraction 1. Change-Id: Icb1b932d730457680cf422377a83fe669f0a7687
* | | Trim unnecessary pages when printing.Svetoslav2014-09-091-0/+161
|/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | A user may request a subset of the document's pages to be printed. In this case the expectation is that the resulting document does not include not selected pages. While print serivices can do the trimming themselves or the printer may do so, moving, potantually many, redundant pages is inefficient. The real problem is when saving to a PDF file where the saved file must not have the pages the user did not select. This change adds shredding of undesired pages from the PDF before saving it or passing it to a print service. : bug:17285994 Change-Id: I7deba535af99457bea3c118202314f0f3812e809
generated by cgit v1.1 at 2025-01-26 08:20:04 +0000