summaryrefslogtreecommitdiffstats
path: root/libs
Commit message (Collapse)AuthorAgeFilesLines
* Merge "Fix potential crash in libandroidfw"Adam Lesinski2014-05-141-1/+1
|\
| * Fix potential crash in libandroidfwAdam Lesinski2014-05-141-1/+1
| | | | | | | | | | | | | | | | | | A malformed APK may cause a crash if it encodes its chunk size as a signed number (MSB set to 1). Bug:14898892 Change-Id: I342853c2b0859e5be15d712d451323afc367d329
* | Merge "Clamp to uint8 for alpha"John Reck2014-05-131-1/+6
|\ \
| * | Clamp to uint8 for alphaJohn Reck2014-05-131-1/+6
| | | | | | | | | | | | Change-Id: Id3e51671297bfb879969ad2fe7a5741dd4cf4c29
* | | Wire up texture atlasJohn Reck2014-05-132-3/+38
|/ / | | | | | | | | | | Bug: 14590563 Change-Id: I2dffbc089dc801f5fb2d1c8fd38e1c71d160e110
* | Merge "More native interpolators"John Reck2014-05-132-3/+115
|\ \
| * | More native interpolatorsJohn Reck2014-05-122-3/+115
| | | | | | | | | | | | | | | | | | Gotta collect 'em all Change-Id: I3ccc2b5c842b27b906c8a0470fbedc2bf285bc38
* | | Merge "Add TimeInterpolator support to RNA"John Reck2014-05-124-1/+61
|\ \ \ | |/ / | | / | |/ |/|
| * Add TimeInterpolator support to RNAJohn Reck2014-05-124-1/+61
| | | | | | | | | | | | Bug: 14678626 Change-Id: I6554e7fcd42c49fac3618ca792083bb68e358f55
* | Merge "Add support for building split APKs"Adam Lesinski2014-05-121-42/+49
|\ \ | |/ |/|
| * Add support for building split APKsAdam Lesinski2014-05-111-42/+49
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Build multiple APKs, each containing a disjoint subset of configurations. These can then be loaded into the device AssetManager and should operate as if they were never split. Use the idea of building multiple sets of files, where each set represents an APK. An ApkBuilder can place files in a set based on its configuration, but you can actually add directly to a set, in the case of the resources.arsc and generated AndroidManifest.xml for splits. Change-Id: Ic65d3f0ac1bbd290185695b9971d425c85ab1de3
* | Revert "Simplify projection matrix management."Jorim Jaggi2014-05-115-19/+27
| | | | | | | | This reverts commit 0efaa71d5414287ed4beac0a88cf76f7e33a1e74.
* | Merge "Simplify projection matrix management."Chris Craik2014-05-095-27/+19
|\ \
| * | Simplify projection matrix management.Chris Craik2014-05-095-27/+19
| | | | | | | | | | | | | | | | | | | | | Store in and use from snapshot, and remove the kFlagOrthoDirty flag, as it's redundant with kFlagIsFboLayer. Change-Id: I2bd380192d50117f4ce1fd2058213669a886f406
* | | Merge "Refactor VirtualLightRefBase & JNI"John Reck2014-05-095-38/+3
|\ \ \
| * | | Refactor VirtualLightRefBase & JNIJohn Reck2014-05-095-38/+3
| | | | | | | | | | | | | | | | Change-Id: I8e244e7109e59d5be96871b23bb9b1201c7f9eaa
* | | | am 90eaf92e: am 7e13d1d4: am f6c9c420: Merge "Correct stride for drawing to ↵Chris Craik2014-05-091-5/+15
|\ \ \ \ | |_|/ / |/| | | | | | | | | | | | | | | | | | | cached glyph bitmap" * commit '90eaf92e325457ccb30286879a2f92b7ba517c7d': Correct stride for drawing to cached glyph bitmap
| * | | am 7e13d1d4: am f6c9c420: Merge "Correct stride for drawing to cached glyph ↵Chris Craik2014-05-091-5/+15
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | bitmap" * commit '7e13d1d4a46a01ebaa412d622ef76d90bd39d12a': Correct stride for drawing to cached glyph bitmap
| | * \ \ am f6c9c420: Merge "Correct stride for drawing to cached glyph bitmap"Chris Craik2014-05-091-5/+15
| | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | * commit 'f6c9c4204c2f8f86277d081112c9dd863ddaa778': Correct stride for drawing to cached glyph bitmap
| | | * | | Correct stride for drawing to cached glyph bitmapDigish Pandya2014-05-091-5/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | fixes the glyph cachebuffer index to account for pixelbuffer format size. issue: in launcher home screen create icon group and rename the group to some text string with emo-icons (smilies). without this change the drop shadows for emo-icons will look bad. Change-Id: I525a9219d35f4541363fd64e7fc5fd1053269725 Signed-off-by: Digish Pandya <digishp@codeaurora.org>
* | | | | | Merge "Rename matrices for consistency"Chris Craik2014-05-093-20/+19
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | |
| * | | | | Rename matrices for consistencyChris Craik2014-05-083-20/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The projection matrix no longer contains viewing transformation, and has thus been renamed. Change-Id: I4f85ccdac97f4cb4f987bb05c389816680f1c94f
* | | | | | Add logging utility methodsChris Craik2014-05-089-32/+120
|/ / / / / | | | | | | | | | | | | | | | Change-Id: I0f316830dcc0bbf438292a6d0fbe9f8154368500
* | | | | Merge "Avoid caching shadow properties in Java & HWUI."Derek Sollenberger2014-05-089-99/+85
|\ \ \ \ \
| * | | | | Avoid caching shadow properties in Java & HWUI.Derek Sollenberger2014-05-079-99/+85
| | |_|_|/ | |/| | | | | | | | | | | | | | | | | | bug: 10650594 Change-Id: I6f57df002710bb0567ed7e53fc0bfe96cfd504b8
* | | | | Merge "Cleanup attachFunctor"John Reck2014-05-073-49/+1
|\ \ \ \ \
| * | | | | Cleanup attachFunctorJohn Reck2014-05-073-49/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 13961296 Change-Id: Id48d11bfcc234afd1fd7e4fdd409a50e7208c81d
* | | | | | Merge "Implement TODO(romainguy)"John Reck2014-05-074-0/+18
|\ \ \ \ \ \
| * | | | | | Implement TODO(romainguy)John Reck2014-05-074-0/+18
| |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 14277445 Change-Id: Id52d6f7fcc023000adcc440bd4da67d9a673536b
* | | | | | Don't try to draw if there's no canvas or surfaceJohn Reck2014-05-071-0/+6
|/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 14616376 doFrame() can happen after the canvas or surface is destroyed, handle it gracefully Change-Id: Ibbbbdbfa77fa2134bd2abc215ca1a0886d706969
* | | | | Merge "Implement loadSystemProperties"John Reck2014-05-062-0/+14
|\ \ \ \ \
| * | | | | Implement loadSystemPropertiesJohn Reck2014-05-052-0/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 14087580 Change-Id: I7153f38c70b554a78c56a0e794da929fc401ee7a
* | | | | | am 3cb74d21: am 5d8343b8: am a85db5ab: Merge "libhwui: Handle the ↵Chris Craik2014-05-051-20/+24
|\ \ \ \ \ \ | |/ / / / / |/| | / / / | | |/ / / | |/| | | | | | | | | | | | | blurImage() implement once RS::init fail" * commit '3cb74d21b2ac2427e805f72a113e8d7a2cc460f3': libhwui: Handle the blurImage() implement once RS::init fail
| * | | | am 5d8343b8: am a85db5ab: Merge "libhwui: Handle the blurImage() implement ↵Chris Craik2014-05-051-20/+24
| |\ \ \ \ | | | |/ / | | |/| | | | | | | | | | | | | | | | | | | | | | once RS::init fail" * commit '5d8343b8e27e766b5bfaaed2f9b1952c0d15da8d': libhwui: Handle the blurImage() implement once RS::init fail
| | * | | am a85db5ab: Merge "libhwui: Handle the blurImage() implement once RS::init ↵Chris Craik2014-05-051-20/+24
| | |\ \ \ | | | | |/ | | | |/| | | | | | | | | | | | | | | | | | | | | fail" * commit 'a85db5ab785c59726c3644999801e48f449714f3': libhwui: Handle the blurImage() implement once RS::init fail
| | | * | Merge "libhwui: Handle the blurImage() implement once RS::init fail"Chris Craik2014-05-051-20/+24
| | | |\ \
| | | | * | libhwui: Handle the blurImage() implement once RS::init failLu, Shenghua2014-04-251-20/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Once the RS::init failed, go through the original single thread path, this will avoid blocking the main thread(ANR), but we also should have some implement in RenderScript component. Change-Id: I3a21395ffd5bc144c15254893f425b1dd2643ba4 Signed-off-by: Shenghua Lu <shenghua.lu@intel.com> Signed-off-by: Shuo Gao <shuo.gao@intel.com>
| * | | | | am 9feab5f2: am 8a02b20f: Merge "Add TYPE_MAGNIFICATION_OVERLAY to ↵Michael Wright2014-04-302-0/+2
| |\ \ \ \ \ | | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | InputWindowInfo::isTrustedOverlay()" * commit '9feab5f278d8c9e030e72989a7f6f3d2f376748d': Add TYPE_MAGNIFICATION_OVERLAY to InputWindowInfo::isTrustedOverlay()
| | * | | | Merge commit '0b62467b142b61ee1e449ba958ba37dfd961ef56' into HEADBill Yi2014-04-296-16/+20
| | |\ \ \ \
| | | * \ \ \ am 4118480a: am 80470cdf: Merge "Solve three memory leaks related to PatchCache"Chris Craik2014-03-252-2/+16
| | | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '4118480aabb4a7b332e289ebb71d2e4f9bc05d7e': Solve three memory leaks related to PatchCache
| | | * | | | | Update framework to use M33 Skia. DO NOT MERGELeon Scroggins III2014-03-201-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | (These CLs are already in master.) Bug: 13246311 This cherry-picks 7 CLs: ----------------------------------------------------------------------- Remove calls to deprecated SkBitmap::setIsOpaque() setIsOpaque() has been removed from ToT Skia. Update setters for mIsPremultiplied and hasAlpha to take the other into consideration. cherry-pick from: I1b36b0b0ce7126031eb7b769b563c17dcd4b306a ----------------------------------------------------------------------- Merge AssetStream with AssetStreamAdaptor. Add enums to the constructor for AssetStreamAdaptor to choose the different behaviors used by the (former) two different classes. The old clients of AssetStream now get the following features of AssetStreamAdaptor - Debugging statements on error. - The stream is an SkStreamRewindable. - getLength() returns the correct value, and the old way of getting the length (read(NULL, 0)) is no longer implemented, since it is no longer used. - isAtEnd() returns the correct value. ToT Skia makes it pure virtual, so some implementation is necessary. cherry-pick from: I2a5395914e4f53830aaefee396556459083a1c56 ----------------------------------------------------------------------- Deprecate Android-specific SkPaint functions. The following functions were problematic: const SkGlyph& getUnicharMetrics(SkUnichar, const SkMatrix*); const SkGlyph& getGlyphMetrics(uint16_t, const SkMatrix*); const void* findImage(const SkGlyph&, const SkMatrix*); Replacing them with calls through SkGlyphCache solved a nasty crash bug, so they have all been deprecated. Bug: 11968757 cherry-pick from: Id746315d41aec5b211b78b172a883c2061130f08 ----------------------------------------------------------------------- pass SkGlyphCache into updateGlyphCache() Doing so prevents us from double-locking the glyph cache, thereby effectively locking ourselves out of reusing work that we'd just done. Bug: 11968757 cherry-pick from: I5c552f2d0bbe30af2ce9054ba684e7da756a0d89 ----------------------------------------------------------------------- Updates to the Skia API needed to merge the WebView m33 version of Skia. cherry-pick from: I0f63b53f2aae58871413b132742fc84138f069a3 Bugfix for screenshots (recent apps) due to incorrect rowBytes computation bug: 12915192 cherry-pick from: I4d5fe2a2f75baf66099e0970fb646686a1992714 ----------------------------------------------------------------------- Fix bug in AndroidPixelRef where we did not store the correct imageInfo for a recycled bitmap. cherry-pick from: I882483b78886e2f19fa4e43a86e69f5a82b3b7e5 ----------------------------------------------------------------------- Change-Id: Icaf597783da3ffb079ea18badb78fa31403bf8b8
| | | * | | | | am 7c9bd98a: am 89513ee5: Merge "Fix projection offset caching - DO NOT ↵Chris Craik2014-03-202-1/+3
| | | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | MERGE" into klp-dev * commit '7c9bd98a4bb0aa6954d5f612c197d03f309980f0': Fix projection offset caching - DO NOT MERGE
| | | * \ \ \ \ \ am 9a09a523: am 0b472ae1: Merge "androidfw: resolve 64-bit build issues"Mark Salyzyn2014-03-196-98/+98
| | | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '9a09a5236529962afbaba9893e5eaf72bd6621b4': androidfw: resolve 64-bit build issues
| | | * \ \ \ \ \ \ am bbf82665: am 6e2fb587: Merge "LP64: Make 9 patches architecture agnostic."Narayan Kamath2014-03-113-40/+40
| | | |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'bbf826659e8e5d0be683b2459207c495303d53b6': LP64: Make 9 patches architecture agnostic.
| | | * \ \ \ \ \ \ \ am 8fb22ae7: am eee2c72f: Merge "Various format string fixes for 64bit"Narayan Kamath2014-03-111-4/+4
| | | |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '8fb22ae772fc62a10db6a06f283140d9233e8704': Various format string fixes for 64bit
| | | * \ \ \ \ \ \ \ \ am 7b4cce68: am c3bac8a0: Merge "Fix graphics corruption caused by HWUI caches"Chris Craik2014-03-114-15/+29
| | | |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '7b4cce68853d8bcfce2b6bd7f999915063eb56d2': Fix graphics corruption caused by HWUI caches
| | | * \ \ \ \ \ \ \ \ \ am 19256340: am 22c66639: Merge "Fixes for 64bit in libhwui"Narayan Kamath2014-03-082-2/+2
| | | |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '192563407964926537d688d4098054c3834341c0': Fixes for 64bit in libhwui
| | | * \ \ \ \ \ \ \ \ \ \ am b152473f: am 9fce8535: Merge "AArch64: Make AssetAtlasService 64-bit ↵Narayan Kamath2014-03-072-7/+12
| | | |\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | compatible" * commit 'b152473f46d8176e7eb2c55b54342a7a29c525cf': AArch64: Make AssetAtlasService 64-bit compatible
| | | * \ \ \ \ \ \ \ \ \ \ \ am 128599e4: am 2b3c14bf: Merge "libandroidfw: fix build error for 64-bit"Narayan Kamath2014-03-071-39/+36
| | | |\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '128599e4496bd7ceb9d70f4addde0eba65103709': libandroidfw: fix build error for 64-bit
| | | * \ \ \ \ \ \ \ \ \ \ \ \ am 28879bbf: am be57fca4: Merge "Extended locales in AAPT / AssetManager."Narayan Kamath2014-03-073-46/+114
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '28879bbfe89dc4bf2067a7183975ecffb82f68e6': Extended locales in AAPT / AssetManager.