summaryrefslogtreecommitdiffstats
path: root/libs
Commit message (Collapse)AuthorAgeFilesLines
* 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>
* | | 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.
| | * \ \ \ \ \ \ \ \ \ \ \ \ am 183e5e03: am 49024bac: Merge "AssetManager support for 3 letter ↵Narayan Kamath2014-03-073-45/+347
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | lang/country codes." * commit '183e5e038bd844ac415b14f22df5c476732066c8': AssetManager support for 3 letter lang/country codes.
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ Merge "resolved conflicts for merge of 8d3281f5 to klp-dev-plus-aosp" into ↵Leon Scroggins III2014-03-074-14/+16
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | klp-dev-plus-aosp
| | | * \ \ \ \ \ \ \ \ \ \ \ \ \ resolved conflicts for merge of 8d3281f5 to klp-dev-plus-aospLeon Scroggins III2014-03-064-14/+16
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: If2855ff4f7a1e7645c69af378955868f44187376
* | | | \ \ \ \ \ \ \ \ \ \ \ \ \ \ am df64ac68: ask skia to use flat gamma when rendering fonts from hwuiVictoria Lease2014-04-222-2/+6
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'df64ac688d400c74438db091952d236fffd5f778': ask skia to use flat gamma when rendering fonts from hwui
| * | | | | | | | | | | | | | | | | | ask skia to use flat gamma when rendering fonts from hwuiVictoria Lease2014-04-222-2/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 13748392 Change-Id: I6930629b8e900628f15354f663b86dfb29a4db78 (cherry picked from commit b66270eac288de53207e55d10879b070a0ec8b6b)
* | | | | | | | | | | | | | | | | | | am f24687e2: Merge "Plumb display power state through display manager." into ↵Jeff Brown2014-04-113-47/+5
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | klp-modular-dev * commit 'f24687e2731811fd0e3803b691fd47a659f89329': Plumb display power state through display manager.
| * | | | | | | | | | | | | | | | | | Plumb display power state through display manager.Jeff Brown2014-04-103-47/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Declare a new method, Display.getState() to retrieve the actual power state of a display. Improved documentation for Intent.ACTION_SCREEN_ON and Intent.ACTION_SCREEN_OFF to clarify what they really mean in terms of the interactive state of the device. Deprecated PowerManager.isScreenOn() and replaced it with PowerManager.isInteractive() with a more suggestive name and better documentation. Redirect display power state changes to go through the display manager first and only then head over to the power manager for legacy compatibility. Eliminated the bright here and woke here policy flags since they were unused. Simplified the input dispatch policy somewhat. Ensure that screen wake locks are respected up until the point when dozing really begins. Fixed a regression in DreamService where onDreamingStarted might be called before onWindowAttached. Bug: 13133142 Bug: 13472578 Bug: 13929355 Bug: 13760290 Change-Id: Iabef96921dd554ce3768fb18619cefc3230b5fb0
* | | | | | | | | | | | | | | | | | | am 5c31e487: Merge "Introduce new UI_MODE_TYPE_WATCH and qualifier." into ↵John Spurlock2014-04-041-0/+3
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | klp-modular-dev * commit '5c31e487c4577e1c47ee7c949325d6a13f0d462e': Introduce new UI_MODE_TYPE_WATCH and qualifier.
| * | | | | | | | | | | | | | | | | | Introduce new UI_MODE_TYPE_WATCH and qualifier.John Spurlock2014-04-041-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Default ui mode to watch if we have FEATURE_WATCH. Bug:13395758 Change-Id: Ie5ff95de60e69e91ad3612c7d2f1fca7f49061bd
* | | | | | | | | | | | | | | | | | | am b386bfd7: am 89dddcc9: Merge "Use default visibility for ↵Ben Cheng2014-04-021-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Snapshot::getLocalClip." * commit 'b386bfd791d77e24bcfe3261420f82b0a9d3851d': Use default visibility for Snapshot::getLocalClip.
| * | | | | | | | | | | | | | | | | | am 89dddcc9: Merge "Use default visibility for Snapshot::getLocalClip."Ben Cheng2014-04-021-1/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '89dddcc948cb3e826bfddeefae73066849aba0fc': Use default visibility for Snapshot::getLocalClip.
| | * | | | | | | | | | | | | | | | | Use default visibility for Snapshot::getLocalClip.Ben Cheng2014-04-021-1/+1
| | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The method is in libhwui.so but used by libandroid_runtime.so (via android_view_GLES20Canvas.cpp). If the compiler decides not to inline this method, the linker won't be able to resolve the dependency when it has hidden visibility. The problem is found when testing GCC 4.9. Change-Id: I3b4d096c7767f0bef0796886dfb2c5ba2ecff48c
* | | | | | | | | | | | | | | | | | am 4932a355: Merge "Misc. buttons aren\'t gamepad keys." into klp-modular-devMichael Wright2014-04-021-4/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '4932a355f1594990173e0d9cd1fa38b8491c4a29': Misc. buttons aren't gamepad keys.
| * | | | | | | | | | | | | | | | | Merge "Misc. buttons aren't gamepad keys." into klp-modular-devMichael Wright2014-04-021-4/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | | | | Misc. buttons aren't gamepad keys.Michael Wright2014-04-011-4/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | BUTTON_[1-9] are intended to be misc. buttons so the kernel will assign them to non-gamepad devices. As such, we shouldn't treat them as belonging to gamepads at all. Bug: 13432364 Change-Id: I9495760f2379e44785b9ce1cf018b6db7f6cb0f4
* | | | | | | | | | | | | | | | | | | am d020fd33: Merge changes Ib18c99b9,I9f42eeb9 into klp-modular-devMichael Wright2014-03-291-6/+27
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'd020fd33d147c88a9cda4976d2fa559e55b4ab03': Generate and respect ACTION_CANCEL for joystick fallbacks. DO NOT MERGE Adds API for determining confirm and cancel keys.
| * | | | | | | | | | | | | | | | | | Generate and respect ACTION_CANCEL for joystick fallbacks. DO NOT MERGEMichael Wright2014-03-261-6/+27
| |/ / / / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also change MotionEvent.PointerCoords bit packing and unpacking methods to be consistent with BitSets which are now used on the native PointerCoords object. Bug: 11480300 Change-Id: Ib18c99b94ac555104c69eac526860aa501e89e03
* | | | | | | | | | | | | | | | | | resolved conflicts for merge of eaab4df0 to klp-modular-dev-plus-aospNarayan Kamath2014-03-2711-41/+44
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I871431e5a3ce45a33563ced845e044d37471689b
| * | | | | | | | | | | | | | | | | am cd3f60f3: Merge "AArch64: Make frameworks/base code more portable"Narayan Kamath2014-03-276-26/+29
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / / / / / | | |/| | | | | | | | | | | | | | / | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | * commit 'cd3f60f30366a34b4499aab5a47b622069ba9cd6': AArch64: Make frameworks/base code more portable
| | * | | | | | | | | | | | | | | AArch64: Make frameworks/base code more portableAshok Bhat2014-03-276-26/+29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Changes in this patch include [x] Use %zu for size_t, %zd for ssize_t [x] Some minor changes have been done to conform with standard JNI practice (e.g. use of jint instead of int in JNI function prototypes) Change-Id: Id1aaa7894a7d0b85ac7ecd7b2bfd8cc40374261f Signed-off-by: Ashok Bhat <ashok.bhat@arm.com> Signed-off-by: Craig Barber <craig.barber@arm.com> Signed-off-by: Kévin PETIT <kevin.petit@arm.com> Signed-off-by: Marcus Oakland <marcus.oakland@arm.com>
* | | | | | | | | | | | | | | | | 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
| * | | | | | | | | | | | | | | | am 80470cdf: Merge "Solve three memory leaks related to PatchCache"Chris Craik2014-03-252-2/+16
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / | | | | | | | | | | | | | | | / / | | |_|_|_|_|_|_|_|_|_|_|_|_|/ / | |/| | | | | | | | | | | | | | * commit '80470cdf6c6995f4afe8d5e2c4b6e898625173fb': Solve three memory leaks related to PatchCache
| | * | | | | | | | | | | | | | Solve three memory leaks related to PatchCacheJens Gulin2014-03-252-2/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | A Patch can be fairly large, holding bitmap data, but is also frequently leaked which adds to the severity. The feature is used in many important processes such as Home, SystemUI and Chrome. The following leaks are solved: 1. The Patch itself was not always freed. PatchCache::removeDeferred() can mark patches to be cared for by PatchCache::clearGarbage(). But mCache.remove() would only destroy the container and the pointer, not the Patch object itself. 2. The vertices stored in the Patch at Patch::createMesh() would always leak. The empty/default destructor in Patch would not properly destroy "vertices" since it's just a pointer. 3. A BufferBlock that's added to the mFreeBlocks in PatchCache could leak. The leak happened when a patch later needed the entire free block, because the object was removed from the list but never deleted in PatchCache::setupMesh(). Change-Id: I41e60824479230b67426fc546d3dbff294c8891f
* | | | | | | | | | | | | | | | am 69e58e44: Merge "Add idc config option for handling key repeats" into ↵Michael Wright2014-03-202-0/+11
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | klp-modular-dev * commit '69e58e446bc2a030ae423d650e60dbfe317331e6': Add idc config option for handling key repeats
| * | | | | | | | | | | | | | | Merge "Add idc config option for handling key repeats" into klp-modular-devMichael Wright2014-03-202-0/+11
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | | Add idc config option for handling key repeatsMichael Wright2014-03-172-0/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 13285870 Change-Id: Iea2a5d03e29c86dcee5f99a25e48736ebc6dd913
* | | | | | | | | | | | | | | | | am 29f00c9f: am 7c9bd98a: am 89513ee5: Merge "Fix projection offset caching ↵Chris Craik2014-03-202-1/+3
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - DO NOT MERGE" into klp-dev * commit '29f00c9f35d8565bb3e6b8a2526cbb237db6446a': Fix projection offset caching - DO NOT MERGE
| * | | | | | | | | | | | | | | | 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
| | * | | | | | | | | | | | | | Fix projection offset caching - DO NOT MERGEChris Craik2014-03-192-1/+3
| | | |_|_|_|/ / / / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | bug:13214038 Because the caching of projection matrix didn't account for changes in the offset flag, the flag could be ignored. Now we use both to verify that the cached matrix can be used. Change-Id: I193b94eaf0b98f046a6484f0866c3d25048653fd (cherry picked from commit d04a6b15f74035fd2068f34225825b55e94521f4)
| | * | | | | | | | | | | | | Update framework to use M33 Skia. DO NOT MERGELeon Scroggins III2014-03-064-14/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | (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: Ie2b731a9f0795802418cfecddb4b684c92c64d33
generated by cgit v1.1 at 2025-03-11 07:23:05 +0000