)]}' { "log": [ { "commit": "d666d92b80d72bed1d576857d460ce4d52184e70", "tree": "fb6b06322be892849ec7ba50aaba4434b229fe87", "parents": [ "7ba3b3f4c87d891a2e8b55f68efd169392ff62af" ], "author": { "name": "Jason Sams", "email": "jsams@google.com", "time": "Wed Apr 16 16:41:01 2014 -0700" }, "committer": { "name": "Jason Sams", "email": "jsams@google.com", "time": "Wed Apr 16 16:41:01 2014 -0700" }, "message": "RenderScript bicubic resize intrinsic [DO NOT MERGE]\n\n\nChange-Id: Icebfb3137aacddce0705834c6d4d2547c709cb0a\n" }, { "commit": "5ed67222feca0d32bfb423b9bb50ba235d1b8394", "tree": "9c5864907194cb563741ae1f6c01ab7a8953c92e", "parents": [ "a8d12f764ccf85da52b82d6726c4a2a12c475fcf" ], "author": { "name": "Craig Stout", "email": "cstout@google.com", "time": "Thu Mar 27 15:14:38 2014 -0700" }, "committer": { "name": "Craig Stout", "email": "cstout@google.com", "time": "Thu Mar 27 15:19:44 2014 -0700" }, "message": "Force refresh of stateful when a child drawable is changed.\n\nChange-Id: Ie17d4c8bceae385e597f3006fcd456be9ef53b97\n" }, { "commit": "aff40e25e8f16c3ecd20376901d7062774850023", "tree": "0a44765dd61af459e5a6a80ae295e1c9f9affcc0", "parents": [ "2270ac96d5d8ab6c2d1601f8dd5d8409762fb35f", "fc603ca6b518777a7e4dc391bc771e5609ab3ab5" ], "author": { "name": "John Reck", "email": "jreck@google.com", "time": "Fri Mar 21 19:47:22 2014 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Fri Mar 21 19:47:22 2014 +0000" }, "message": "am fc603ca6: am abf701e6: Merge \"Eliminate mHasAlpha\" into klp-dev\n\n* commit \u0027fc603ca6b518777a7e4dc391bc771e5609ab3ab5\u0027:\n Eliminate mHasAlpha\n" }, { "commit": "fc603ca6b518777a7e4dc391bc771e5609ab3ab5", "tree": "06c38786a9be8214085a5e8425a2e352d4193651", "parents": [ "8114c3d02d6bf72c0627aea6ecf738074ac3f232", "abf701e6751aed487d4ed0986e0fae8810c3658f" ], "author": { "name": "John Reck", "email": "jreck@google.com", "time": "Fri Mar 21 19:41:00 2014 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Fri Mar 21 19:41:00 2014 +0000" }, "message": "am abf701e6: Merge \"Eliminate mHasAlpha\" into klp-dev\n\n* commit \u0027abf701e6751aed487d4ed0986e0fae8810c3658f\u0027:\n Eliminate mHasAlpha\n" }, { "commit": "91f0a455bb6670b59b8d15cc7a9adb0e6d7f146d", "tree": "d1ae665f9ea5884833b49c5892f075ed94bb77e8", "parents": [ "3f5232220f2db839f690489ed272113f660daa40" ], "author": { "name": "John Reck", "email": "jreck@google.com", "time": "Fri Mar 21 11:09:45 2014 -0700" }, "committer": { "name": "John Reck", "email": "jreck@google.com", "time": "Fri Mar 21 18:16:18 2014 +0000" }, "message": "Eliminate mHasAlpha\n\n Bug: 13580771\n\n The cached value mHasAlpha on Bitmap could get out of sync with the\n real value stored in the SkBitmap. Fix this by just eliminating the\n cached value. This adds an extra JNI call in copy(), createBitmap(),\n and setPremultiplied(), none of which are going to be significantly\n impacted by the extra JNI call.\n\nChange-Id: I4fce069a77d9b3bbb47dde04275ff8510ce7e4f0\n" }, { "commit": "889a1ddd00b74933d5f7daa651d98133bcb034ba", "tree": "e3cb6c0e5102df7a58ff43589293dc908ef11170", "parents": [ "01252217a5d779c885645028a5df70215e7be4f4" ], "author": { "name": "Ben Murdoch", "email": "benm@google.com", "time": "Mon Mar 17 19:20:43 2014 +0000" }, "committer": { "name": "Ben Murdoch", "email": "benm@google.com", "time": "Mon Mar 17 19:20:43 2014 +0000" }, "message": "Fix JavaDoc\n\nChange-Id: I20d0b1544ba88c694b950ef6062f93c65b16d371\n" }, { "commit": "5aa9c5a77ba498108f7395df1865ee34eacebf49", "tree": "78c43608857db5370877da15c39ad9eff7612551", "parents": [ "2fd045c092b08772be81a6d58bbb95e5e608403f" ], "author": { "name": "Torne (Richard Coles)", "email": "torne@google.com", "time": "Mon Mar 17 17:51:40 2014 +0000" }, "committer": { "name": "Torne (Richard Coles)", "email": "torne@google.com", "time": "Mon Mar 17 17:51:40 2014 +0000" }, "message": "Fix javadoc.\n\nFix javadoc reference missing a #\n\nBug: 13246311\nChange-Id: Ifc06234943339250feb5b4f2077af03c35be076e\n" }, { "commit": "f8d8777dddf91c741981b4f795f2fb2b1d81c1b6", "tree": "9f8a8cc7bd4765932295355b6eed44e6e26b6a2a", "parents": [ "ca0aba399326886d1a39c2344bab296044ba5eb0" ], "author": { "name": "Leon Scroggins III", "email": "scroggo@google.com", "time": "Tue Dec 03 16:26:51 2013 -0500" }, "committer": { "name": "Ben Murdoch", "email": "benm@google.com", "time": "Mon Mar 17 13:57:18 2014 +0000" }, "message": "Update framework to use M33 Skia. DO NOT MERGE\n\n(These CLs are already in master.)\n\nBug: 13246311\n\nThis cherry-picks 7 CLs:\n\n-----------------------------------------------------------------------\n\nRemove calls to deprecated SkBitmap::setIsOpaque()\n\nsetIsOpaque() has been removed from ToT Skia.\n\nUpdate setters for mIsPremultiplied and hasAlpha to take the\nother into consideration.\n\ncherry-pick from: I1b36b0b0ce7126031eb7b769b563c17dcd4b306a\n\n-----------------------------------------------------------------------\n\nMerge AssetStream with AssetStreamAdaptor.\n\nAdd enums to the constructor for AssetStreamAdaptor to choose the\ndifferent behaviors used by the (former) two different classes.\n\nThe old clients of AssetStream now get the following features of\nAssetStreamAdaptor\n- Debugging statements on error.\n- The stream is an SkStreamRewindable.\n- getLength() returns the correct value, and the old way of getting\n the length (read(NULL, 0)) is no longer implemented, since it is\n no longer used.\n- isAtEnd() returns the correct value. ToT Skia makes it pure virtual,\n so some implementation is necessary.\n\ncherry-pick from: I2a5395914e4f53830aaefee396556459083a1c56\n\n-----------------------------------------------------------------------\n\nDeprecate Android-specific SkPaint functions.\n\nThe following functions were problematic:\n const SkGlyph\u0026 getUnicharMetrics(SkUnichar, const SkMatrix*);\n const SkGlyph\u0026 getGlyphMetrics(uint16_t, const SkMatrix*);\n const void* findImage(const SkGlyph\u0026, const SkMatrix*);\n\nReplacing them with calls through SkGlyphCache solved a nasty crash\nbug, so they have all been deprecated.\n\nBug: 11968757\ncherry-pick from: Id746315d41aec5b211b78b172a883c2061130f08\n\n-----------------------------------------------------------------------\n\npass SkGlyphCache into updateGlyphCache()\n\nDoing so prevents us from double-locking the glyph cache, thereby\neffectively locking ourselves out of reusing work that we\u0027d just done.\n\nBug: 11968757\ncherry-pick from: I5c552f2d0bbe30af2ce9054ba684e7da756a0d89\n\n-----------------------------------------------------------------------\n\nUpdates to the Skia API needed to merge the WebView m33 version of Skia.\n\ncherry-pick from: I0f63b53f2aae58871413b132742fc84138f069a3\n\nBugfix for screenshots (recent apps) due to incorrect rowBytes computation\n\nbug: 12915192\ncherry-pick from: I4d5fe2a2f75baf66099e0970fb646686a1992714\n\n-----------------------------------------------------------------------\n\nFix bug in AndroidPixelRef where we did not store the correct imageInfo for a recycled bitmap.\n\ncherry-pick from: I882483b78886e2f19fa4e43a86e69f5a82b3b7e5\n\n-----------------------------------------------------------------------\n\nChange-Id: Ie2b731a9f0795802418cfecddb4b684c92c64d33\n\nConflicts:\n\tcore/jni/android/graphics/Bitmap.cpp\n\tcore/jni/android/graphics/Graphics.cpp\n\tcore/jni/android/graphics/Typeface.cpp\n\tgraphics/java/android/graphics/Bitmap.java\n" }, { "commit": "0ebc6b378dca76b3253b10cf17c3a38a0a50c073", "tree": "f5c1a32ba5fe8fea02cfe3f6158278a17ebdfe7f", "parents": [ "fc15f899b86aa39bd32e3d38a9f5369ee8f0e2c8" ], "author": { "name": "Jason Sams", "email": "jsams@google.com", "time": "Thu Mar 13 01:49:05 2014 -0700" }, "committer": { "name": "Jason Sams", "email": "jsams@google.com", "time": "Thu Mar 13 01:49:05 2014 -0700" }, "message": "Force merge of remaining KLP changes to fix build.\n\nChange-Id: I389a23c6615663c325980fcb30350ea6635d2d17\n" }, { "commit": "fc15f899b86aa39bd32e3d38a9f5369ee8f0e2c8", "tree": "5985fb31fb99ca2402f9cbc73fa5885ab1adb44d", "parents": [ "632c915ce8675033bbb7d356239d16594b26dffb" ], "author": { "name": "Jason Sams", "email": "jsams@google.com", "time": "Thu Mar 13 01:17:49 2014 -0700" }, "committer": { "name": "Jason Sams", "email": "jsams@google.com", "time": "Thu Mar 13 01:17:49 2014 -0700" }, "message": "Fix build issues from bad merge\n\nChange-Id: I6ebac7c87b807a8ed2fbeac895c1db8b199f715a\n" }, { "commit": "632c915ce8675033bbb7d356239d16594b26dffb", "tree": "76e99d00c2298b04960c32bf932ee23b7ccd45e1", "parents": [ "280db65032fe0ed6897bc33c627ae176daecb1c2", "780d57b81ac1a9af6ae533f5039cd91a662b49f4" ], "author": { "name": "Jason Sams", "email": "jsams@google.com", "time": "Thu Mar 13 00:39:04 2014 -0700" }, "committer": { "name": "Jason Sams", "email": "jsams@google.com", "time": "Thu Mar 13 07:40:24 2014 +0000" }, "message": "resolved conflicts for merge of 780d57b8 to klp-modular-dev\n\nChange-Id: Idf2f939c25c342fff98da6b83be875d7708deba0" }, { "commit": "280db65032fe0ed6897bc33c627ae176daecb1c2", "tree": "032cee318e3bf120ec778d0e999a1c6d34fb141a", "parents": [ "7f8a41079c342ff1f4f0ba3bf8e4f4e203da2649", "e14d5e901172559a5e18077bde3ccafd03e8a6e2" ], "author": { "name": "Jason Sams", "email": "jsams@google.com", "time": "Thu Mar 13 01:35:42 2014 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Thu Mar 13 01:35:42 2014 +0000" }, "message": "am e14d5e90: am 5757bf89: Add hidden minor version ID for support lib workarounds.\n\n* commit \u0027e14d5e901172559a5e18077bde3ccafd03e8a6e2\u0027:\n Add hidden minor version ID for support lib workarounds.\n" }, { "commit": "780d57b81ac1a9af6ae533f5039cd91a662b49f4", "tree": "da2144e63b6a75e718652bead4bec323c3e0219e", "parents": [ "e14d5e901172559a5e18077bde3ccafd03e8a6e2", "cf8573c15456c4581b691c7380722ea6dccf11c5" ], "author": { "name": "Jason Sams", "email": "jsams@google.com", "time": "Tue Mar 11 01:12:32 2014 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Tue Mar 11 01:12:32 2014 +0000" }, "message": "am cf8573c1: Fix destruction issues relating to AllocationAdapter.\n\n* commit \u0027cf8573c15456c4581b691c7380722ea6dccf11c5\u0027:\n Fix destruction issues relating to AllocationAdapter.\n" }, { "commit": "e14d5e901172559a5e18077bde3ccafd03e8a6e2", "tree": "11c83e07a1597f035cae040ae8fce89bec1d02ed", "parents": [ "0165db3802f0fafe0ad86b7699be7adaea6686da", "5757bf89c44e7a4805340b5634bec13a1caf39f8" ], "author": { "name": "Jason Sams", "email": "jsams@google.com", "time": "Tue Mar 11 01:12:29 2014 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Tue Mar 11 01:12:29 2014 +0000" }, "message": "am 5757bf89: Add hidden minor version ID for support lib workarounds.\n\n* commit \u00275757bf89c44e7a4805340b5634bec13a1caf39f8\u0027:\n Add hidden minor version ID for support lib workarounds.\n" }, { "commit": "0165db3802f0fafe0ad86b7699be7adaea6686da", "tree": "5cc58b32dad993559dd5e0320d16fc25f1e19726", "parents": [ "e8af5e10e04697acb26b47e5d60b99e5c61a020c", "ff7256e757502279b1777127a12eba235be679ae" ], "author": { "name": "Jason Sams", "email": "jsams@google.com", "time": "Tue Mar 11 01:12:23 2014 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Tue Mar 11 01:12:23 2014 +0000" }, "message": "am ff7256e7: Fix destruction issues relating to AllocationAdapter.\n\n* commit \u0027ff7256e757502279b1777127a12eba235be679ae\u0027:\n Fix destruction issues relating to AllocationAdapter.\n" }, { "commit": "cf8573c15456c4581b691c7380722ea6dccf11c5", "tree": "553866c0452b4f17d2a8d8c56038afbe48944fff", "parents": [ "5757bf89c44e7a4805340b5634bec13a1caf39f8" ], "author": { "name": "Jason Sams", "email": "jsams@google.com", "time": "Mon Mar 10 13:32:42 2014 -0700" }, "committer": { "name": "Jason Sams", "email": "jsams@google.com", "time": "Mon Mar 10 13:32:42 2014 -0700" }, "message": "Fix destruction issues relating to AllocationAdapter.\n\nbug 13170046\n\nChange-Id: I2a2ba3cbd7d08c659ed8958fbcc01919e36e86b0\n" }, { "commit": "5757bf89c44e7a4805340b5634bec13a1caf39f8", "tree": "53eff14f63886a4c875e33c2cdc052b6faa9a1ac", "parents": [ "ff7256e757502279b1777127a12eba235be679ae" ], "author": { "name": "Jason Sams", "email": "jsams@google.com", "time": "Mon Mar 10 13:32:21 2014 -0700" }, "committer": { "name": "Jason Sams", "email": "jsams@google.com", "time": "Mon Mar 10 13:32:21 2014 -0700" }, "message": "Add hidden minor version ID for support lib workarounds.\n\nbug 13170046\n\nChange-Id: I0c77901752e9a0b10bd5be62311c79a0ab7128e5\n" }, { "commit": "ff7256e757502279b1777127a12eba235be679ae", "tree": "17e8accf446c482505cb2e2de0cab9285be76e3d", "parents": [ "6d9ed0c35327adfba50004fe9270ee6471459fb0" ], "author": { "name": "Jason Sams", "email": "jsams@google.com", "time": "Mon Mar 10 13:31:51 2014 -0700" }, "committer": { "name": "Jason Sams", "email": "jsams@google.com", "time": "Mon Mar 10 13:31:51 2014 -0700" }, "message": "Fix destruction issues relating to AllocationAdapter.\n\nbug 13170046\n\nChange-Id: I922b19c086b675949c6fae66c6dcb4c8af3b715f\n" }, { "commit": "87e9e744ed7acc554a6b4c7dd90fab376eabb30b", "tree": "b35feea185cd9052d6aedf0ac2a1e33d01a378fa", "parents": [ "8d3281f5f7a880b996e50d291ebb7154a486eb6c", "92a3283286df3a6c2a27ecde8eddf23abbb87de9" ], "author": { "name": "Leon Scroggins III", "email": "scroggo@google.com", "time": "Thu Mar 06 21:31:31 2014 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Thu Mar 06 21:31:31 2014 +0000" }, "message": "am 92a32832: DO NOT MERGE - Fix Javadoc build break.\n\n* commit \u002792a3283286df3a6c2a27ecde8eddf23abbb87de9\u0027:\n DO NOT MERGE - Fix Javadoc build break.\n" }, { "commit": "92a3283286df3a6c2a27ecde8eddf23abbb87de9", "tree": "20332e25b2e3cded9b316a4127cfcac358e9160c", "parents": [ "ee008d4264a95bba5f90b17856fc06fa29a6f12c" ], "author": { "name": "Leon Scroggins III", "email": "scroggo@google.com", "time": "Wed Jan 15 14:23:14 2014 -0500" }, "committer": { "name": "Bart Sears", "email": "bsears@google.com", "time": "Thu Mar 06 20:44:16 2014 +0000" }, "message": "DO NOT MERGE - Fix Javadoc build break.\n\nRemove links to non-specific function name.\n\nBug: 13246311\n\nChange-Id: I5643074149d0a511bd760d638751c44e3ec4c557\n(cherry picked from commit 2bc49ca96eb786f66dc2b9573e1f09bdb2d82d5e)" }, { "commit": "8d3281f5f7a880b996e50d291ebb7154a486eb6c", "tree": "ce2df832edfe7b3d7c53e6049cb8a2f872b284ef", "parents": [ "eac19754ca0822e4c1c50c436affbf5cbf7e08d3", "ee008d4264a95bba5f90b17856fc06fa29a6f12c" ], "author": { "name": "Leon Scroggins III", "email": "scroggo@google.com", "time": "Thu Mar 06 19:49:58 2014 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Thu Mar 06 19:49:58 2014 +0000" }, "message": "am ee008d42: Merge \"Update framework to use M33 Skia. DO NOT MERGE\" into klp-dev\n\n* commit \u0027ee008d4264a95bba5f90b17856fc06fa29a6f12c\u0027:\n Update framework to use M33 Skia. DO NOT MERGE\n" }, { "commit": "5e49b497ae2019586937aae0e8159292363728b5", "tree": "349e75a3f541a96fa080e1724e368e0e1a21e046", "parents": [ "77a60f006f8b7260207043529d3ed004db301bd5" ], "author": { "name": "Leon Scroggins III", "email": "scroggo@google.com", "time": "Tue Dec 03 16:26:51 2013 -0500" }, "committer": { "name": "Leon Scroggins III", "email": "scroggo@google.com", "time": "Thu Mar 06 12:14:47 2014 -0500" }, "message": "Update framework to use M33 Skia. DO NOT MERGE\n\n(These CLs are already in master.)\n\nBug: 13246311\n\nThis cherry-picks 7 CLs:\n\n-----------------------------------------------------------------------\n\nRemove calls to deprecated SkBitmap::setIsOpaque()\n\nsetIsOpaque() has been removed from ToT Skia.\n\nUpdate setters for mIsPremultiplied and hasAlpha to take the\nother into consideration.\n\ncherry-pick from: I1b36b0b0ce7126031eb7b769b563c17dcd4b306a\n\n-----------------------------------------------------------------------\n\nMerge AssetStream with AssetStreamAdaptor.\n\nAdd enums to the constructor for AssetStreamAdaptor to choose the\ndifferent behaviors used by the (former) two different classes.\n\nThe old clients of AssetStream now get the following features of\nAssetStreamAdaptor\n- Debugging statements on error.\n- The stream is an SkStreamRewindable.\n- getLength() returns the correct value, and the old way of getting\n the length (read(NULL, 0)) is no longer implemented, since it is\n no longer used.\n- isAtEnd() returns the correct value. ToT Skia makes it pure virtual,\n so some implementation is necessary.\n\ncherry-pick from: I2a5395914e4f53830aaefee396556459083a1c56\n\n-----------------------------------------------------------------------\n\nDeprecate Android-specific SkPaint functions.\n\nThe following functions were problematic:\n const SkGlyph\u0026 getUnicharMetrics(SkUnichar, const SkMatrix*);\n const SkGlyph\u0026 getGlyphMetrics(uint16_t, const SkMatrix*);\n const void* findImage(const SkGlyph\u0026, const SkMatrix*);\n\nReplacing them with calls through SkGlyphCache solved a nasty crash\nbug, so they have all been deprecated.\n\nBug: 11968757\ncherry-pick from: Id746315d41aec5b211b78b172a883c2061130f08\n\n-----------------------------------------------------------------------\n\npass SkGlyphCache into updateGlyphCache()\n\nDoing so prevents us from double-locking the glyph cache, thereby\neffectively locking ourselves out of reusing work that we\u0027d just done.\n\nBug: 11968757\ncherry-pick from: I5c552f2d0bbe30af2ce9054ba684e7da756a0d89\n\n-----------------------------------------------------------------------\n\nUpdates to the Skia API needed to merge the WebView m33 version of Skia.\n\ncherry-pick from: I0f63b53f2aae58871413b132742fc84138f069a3\n\nBugfix for screenshots (recent apps) due to incorrect rowBytes computation\n\nbug: 12915192\ncherry-pick from: I4d5fe2a2f75baf66099e0970fb646686a1992714\n\n-----------------------------------------------------------------------\n\nFix bug in AndroidPixelRef where we did not store the correct imageInfo for a recycled bitmap.\n\ncherry-pick from: I882483b78886e2f19fa4e43a86e69f5a82b3b7e5\n\n-----------------------------------------------------------------------\n\nChange-Id: Ie2b731a9f0795802418cfecddb4b684c92c64d33\n" }, { "commit": "cdc095ae4850d9ffd08de0d6e8828949603fcdd1", "tree": "0df2ccb10a9b3a513375cccfbfbed43133c37436", "parents": [ "e4fc5c17c092a77e0647e01e93a6b0e806c27692", "7be33110ea3e1a032ee3aa7c50f1dedf52fcab25" ], "author": { "name": "Narayan Kamath", "email": "narayan@google.com", "time": "Wed Jan 29 12:18:31 2014 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Wed Jan 29 12:18:31 2014 +0000" }, "message": "am 7be33110: am d4ccffd3: Merge \"AArch64: Use long for pointers in graphics/Interpolator\"\n\n* commit \u00277be33110ea3e1a032ee3aa7c50f1dedf52fcab25\u0027:\n AArch64: Use long for pointers in graphics/Interpolator\n" }, { "commit": "e4fc5c17c092a77e0647e01e93a6b0e806c27692", "tree": "40f2c466f1c68b4bd608ed831076c2a1e8a1b494", "parents": [ "672f3ee33c3e3d76c4b6764fb1dca8c705c159e3", "74db9ddb341d9d7dafe36b2bc74e3aaf50dd3160" ], "author": { "name": "Narayan Kamath", "email": "narayan@google.com", "time": "Wed Jan 29 12:18:27 2014 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Wed Jan 29 12:18:27 2014 +0000" }, "message": "am 74db9ddb: am 887b1ca8: Merge \"AArch64: Use long for pointers in SurfaceTexture\"\n\n* commit \u002774db9ddb341d9d7dafe36b2bc74e3aaf50dd3160\u0027:\n AArch64: Use long for pointers in SurfaceTexture\n" }, { "commit": "7be33110ea3e1a032ee3aa7c50f1dedf52fcab25", "tree": "6fed129153cda62d4fef38f78c425698d3c5cb94", "parents": [ "74db9ddb341d9d7dafe36b2bc74e3aaf50dd3160", "d4ccffd3ba7f7c27ddfc56231cf7f2424842b1e3" ], "author": { "name": "Narayan Kamath", "email": "narayan@google.com", "time": "Wed Jan 29 04:14:48 2014 -0800" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Wed Jan 29 04:14:48 2014 -0800" }, "message": "am d4ccffd3: Merge \"AArch64: Use long for pointers in graphics/Interpolator\"\n\n* commit \u0027d4ccffd3ba7f7c27ddfc56231cf7f2424842b1e3\u0027:\n AArch64: Use long for pointers in graphics/Interpolator\n" }, { "commit": "74db9ddb341d9d7dafe36b2bc74e3aaf50dd3160", "tree": "6c01c45d1500f685d0d250bfa0a5d378b6ec7833", "parents": [ "95ba1eb6243a9b356ec4ac02177076e2427360a3", "887b1ca87941095797a246b2d68ec2626a7cfc43" ], "author": { "name": "Narayan Kamath", "email": "narayan@google.com", "time": "Wed Jan 29 04:14:44 2014 -0800" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Wed Jan 29 04:14:44 2014 -0800" }, "message": "am 887b1ca8: Merge \"AArch64: Use long for pointers in SurfaceTexture\"\n\n* commit \u0027887b1ca87941095797a246b2d68ec2626a7cfc43\u0027:\n AArch64: Use long for pointers in SurfaceTexture\n" }, { "commit": "d4ccffd3ba7f7c27ddfc56231cf7f2424842b1e3", "tree": "f96235fc1f35db39a7522b860a59ffe9ede1abcf", "parents": [ "887b1ca87941095797a246b2d68ec2626a7cfc43", "a2f9042f4eec167bad04ba8923723cd9458699b5" ], "author": { "name": "Narayan Kamath", "email": "narayan@google.com", "time": "Wed Jan 29 12:12:27 2014 +0000" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Wed Jan 29 12:12:27 2014 +0000" }, "message": "Merge \"AArch64: Use long for pointers in graphics/Interpolator\"" }, { "commit": "887b1ca87941095797a246b2d68ec2626a7cfc43", "tree": "19985da82ce141d21ac3f448d0ed1876ab5f8a02", "parents": [ "dd6de16aee254497040b32cc330b4637b96685c0", "72aa313ff4c91e7b2aae3d37067f9201b2b0fdbe" ], "author": { "name": "Narayan Kamath", "email": "narayan@google.com", "time": "Wed Jan 29 12:12:17 2014 +0000" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Wed Jan 29 12:12:17 2014 +0000" }, "message": "Merge \"AArch64: Use long for pointers in SurfaceTexture\"" }, { "commit": "be674bf688fec9ce4ec04e77c93644be8253d273", "tree": "b15b2fad489daa88cf4ebc1315d28b5738f666d3", "parents": [ "7ae1726d0b962878cce4c1fe6c814a315f253293", "23abbfbb814501b825edc056027270f03f39506b" ], "author": { "name": "Narayan Kamath", "email": "narayan@google.com", "time": "Tue Jan 28 19:18:45 2014 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Tue Jan 28 19:18:45 2014 +0000" }, "message": "am 23abbfbb: am 154614ab: Merge \"AArch64: Use long for pointers in graphics/Camera\"\n\n* commit \u002723abbfbb814501b825edc056027270f03f39506b\u0027:\n AArch64: Use long for pointers in graphics/Camera\n" }, { "commit": "7ae1726d0b962878cce4c1fe6c814a315f253293", "tree": "f5c17c968197aab3cf2d7712d9d36e0909affa0b", "parents": [ "093256279c308fd3cad290a1b01c5d313bace8af", "aa9ba887371e875ffbde49f43fa12bb5f123425b" ], "author": { "name": "Narayan Kamath", "email": "narayan@google.com", "time": "Tue Jan 28 19:18:40 2014 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Tue Jan 28 19:18:40 2014 +0000" }, "message": "am aa9ba887: am 6e09eb4c: Merge \"AArch64: Make graphics classes 64-bit compatible\"\n\n* commit \u0027aa9ba887371e875ffbde49f43fa12bb5f123425b\u0027:\n AArch64: Make graphics classes 64-bit compatible\n" }, { "commit": "23abbfbb814501b825edc056027270f03f39506b", "tree": "4a7032f16a5beb12dc71f92bf236aaa42e6e5282", "parents": [ "aa9ba887371e875ffbde49f43fa12bb5f123425b", "154614abbcc819c265bfb79b2626fcee66333ac2" ], "author": { "name": "Narayan Kamath", "email": "narayan@google.com", "time": "Tue Jan 28 11:15:57 2014 -0800" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Tue Jan 28 11:15:57 2014 -0800" }, "message": "am 154614ab: Merge \"AArch64: Use long for pointers in graphics/Camera\"\n\n* commit \u0027154614abbcc819c265bfb79b2626fcee66333ac2\u0027:\n AArch64: Use long for pointers in graphics/Camera\n" }, { "commit": "aa9ba887371e875ffbde49f43fa12bb5f123425b", "tree": "12b4f6fb438cc76bdf80c13c8b23ce82b05cb7de", "parents": [ "245b58d6f47740c09ebd47b75e6021c7cfb691af", "6e09eb4c6753f8e5cbd04f9b0c7b65046d27afdb" ], "author": { "name": "Narayan Kamath", "email": "narayan@google.com", "time": "Tue Jan 28 11:15:47 2014 -0800" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Tue Jan 28 11:15:47 2014 -0800" }, "message": "am 6e09eb4c: Merge \"AArch64: Make graphics classes 64-bit compatible\"\n\n* commit \u00276e09eb4c6753f8e5cbd04f9b0c7b65046d27afdb\u0027:\n AArch64: Make graphics classes 64-bit compatible\n" }, { "commit": "5753b45516607988d5e84fee448d020911dde5d1", "tree": "885e89e9d10c1c0623fc456d4e724261068cb6f8", "parents": [ "a0398430fcf365fba6e42ad0bdca2fbf45ed6fe0" ], "author": { "name": "Ashok Bhat", "email": "ashok.bhat@arm.com", "time": "Mon Jan 13 20:44:05 2014 +0000" }, "committer": { "name": "Narayan Kamath", "email": "narayan@google.com", "time": "Tue Jan 28 17:53:30 2014 +0000" }, "message": "AArch64: Use long for pointers in graphics/Camera\n\nFor storing pointers, long is used in\nandroid/graphics/Camera class, as native\npointers can be 64-bit.\n\nIn addition, some minor changes have been done\nto conform with standard JNI practice (e.g. use of\njint instead of int in JNI function prototypes)\n\nChange-Id: Ic05ebf2051a225a1638a43f476bab6176c0b5c38\nSigned-off-by: Ashok Bhat \u003cashok.bhat@arm.com\u003e\nSigned-off-by: Marcus Oakland \u003cmarcus.oakland@arm.com\u003e\n" }, { "commit": "a0398430fcf365fba6e42ad0bdca2fbf45ed6fe0", "tree": "f263a4baa0ab7b4e7e0101075f1e85768b3d7ba1", "parents": [ "1ff4293e33f98e6dc19e4f154cb497af9bd88c9d" ], "author": { "name": "Ashok Bhat", "email": "ashok.bhat@arm.com", "time": "Mon Jan 20 20:08:01 2014 +0000" }, "committer": { "name": "Narayan Kamath", "email": "narayan@google.com", "time": "Tue Jan 28 17:40:38 2014 +0000" }, "message": "AArch64: Make graphics classes 64-bit compatible\n\nChanges in this patch include\n\n[x] Long is used to store native pointers as they can\n be 64-bit.\n\n[x] Some minor changes have been done to conform with\n standard JNI practice (e.g. use of jint instead of int\n in JNI function prototypes)\n\n[x] AssetAtlasManager is not completely 64-bit compatible\n yet. Specifically mAtlasMap member has to be converted\n to hold native pointer using long. Added a TODO to\n AssetAtlasManager.java to indicate the change required.\n\nChange-Id: I940433f601c6db998c1a8ffff338f5361200d5ed\nSigned-off-by: Ashok Bhat \u003cashok.bhat@arm.com\u003e\nSigned-off-by: Craig Barber \u003ccraig.barber@arm.com\u003e\nSigned-off-by: Kévin PETIT \u003ckevin.petit@arm.com\u003e\nSigned-off-by: Marcus Oakland \u003cmarcus.oakland@arm.com\u003e\n" }, { "commit": "6b81bfd10f63c166ff6e4afb0f267ce9e5275366", "tree": "30924e82aab340f761a1f4ff846aabde8c45712f", "parents": [ "87a82800658c9bcad75881d9761b412a024d7969", "caea42fd2daabedaed383105e10c11150f52b7df" ], "author": { "name": "Narayan Kamath", "email": "narayan@google.com", "time": "Thu Jan 16 07:35:16 2014 -0800" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Thu Jan 16 07:35:16 2014 -0800" }, "message": "am caea42fd: am 98002dfb: Merge \"AArch64: Use long for pointers in graphics/PathMeasure\"\n\n* commit \u0027caea42fd2daabedaed383105e10c11150f52b7df\u0027:\n AArch64: Use long for pointers in graphics/PathMeasure\n" }, { "commit": "03e8be757d2703d52fad3fd153c6bcf0b13ed1d1", "tree": "3d754836e4e1a829594b6b072e621b956cda54b5", "parents": [ "ab220deeb8a413649335d5ef47d974dfdc3ac5ec", "8796ab7f22d3e9f5b85571e8851851c023416f96" ], "author": { "name": "Narayan Kamath", "email": "narayan@google.com", "time": "Thu Jan 16 07:35:06 2014 -0800" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Thu Jan 16 07:35:06 2014 -0800" }, "message": "am 8796ab7f: am bb35356d: Merge changes Id54087dd,I946325e4,I2a2b2e68\n\n* commit \u00278796ab7f22d3e9f5b85571e8851851c023416f96\u0027:\n AArch64: Use long for pointers in BitmapRegionDecoder\n AArch64: Use long for pointers in Movie class\n AArch64: Add AssetInputStream.getNativeAsset\n" }, { "commit": "caea42fd2daabedaed383105e10c11150f52b7df", "tree": "a5918467913c5ffc6e502efe129e9319cda4ad5a", "parents": [ "aef12450d2f863fe3ce82458e46f3778b791cc33", "98002dfb60a20caf62d6682659547c042a4a3342" ], "author": { "name": "Narayan Kamath", "email": "narayan@google.com", "time": "Thu Jan 16 07:31:58 2014 -0800" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Thu Jan 16 07:31:58 2014 -0800" }, "message": "am 98002dfb: Merge \"AArch64: Use long for pointers in graphics/PathMeasure\"\n\n* commit \u002798002dfb60a20caf62d6682659547c042a4a3342\u0027:\n AArch64: Use long for pointers in graphics/PathMeasure\n" }, { "commit": "8796ab7f22d3e9f5b85571e8851851c023416f96", "tree": "294ac74f02915dcfdf68842e24d32d54cc551743", "parents": [ "947d88a0eacafb2e5ec5ce5eaaae8be32ecb9aa9", "bb35356dc05632664e1d65588c9d0570c185280b" ], "author": { "name": "Narayan Kamath", "email": "narayan@google.com", "time": "Thu Jan 16 07:31:53 2014 -0800" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Thu Jan 16 07:31:53 2014 -0800" }, "message": "am bb35356d: Merge changes Id54087dd,I946325e4,I2a2b2e68\n\n* commit \u0027bb35356dc05632664e1d65588c9d0570c185280b\u0027:\n AArch64: Use long for pointers in BitmapRegionDecoder\n AArch64: Use long for pointers in Movie class\n AArch64: Add AssetInputStream.getNativeAsset\n" }, { "commit": "a2f9042f4eec167bad04ba8923723cd9458699b5", "tree": "b8bab181e5b4e661aed4d126efb392577b44388b", "parents": [ "486544f763bd27eb92c95101e23f939c79c9890e" ], "author": { "name": "Ashok Bhat", "email": "ashok.bhat@arm.com", "time": "Mon Jan 13 20:45:30 2014 +0000" }, "committer": { "name": "David Butcher", "email": "david.butcher@arm.com", "time": "Thu Jan 16 13:23:53 2014 +0000" }, "message": "AArch64: Use long for pointers in graphics/Interpolator\n\nFor storing pointers, long is used in\nandroid/graphics/Interpolator class, as native\npointers can be 64-bit.\n\nIn addition, some minor changes have been done\nto conform with standard JNI practice (e.g. use\nof jint instead of int in JNI function prototypes)\n\nChange-Id: I1e181476a4fe5273ff190cf34c4a7487aa1aecf4\nSigned-off-by: Ashok Bhat \u003cashok.bhat@arm.com\u003e\nSigned-off-by: Marcus Oakland \u003cmarcus.oakland@arm.com\u003e\nSigned-off-by: Kévin PETIT \u003ckevin.petit@arm.com\u003e\n" }, { "commit": "72aa313ff4c91e7b2aae3d37067f9201b2b0fdbe", "tree": "b0b6461c32db1437344d1f553a248ddbd14718e8", "parents": [ "486544f763bd27eb92c95101e23f939c79c9890e" ], "author": { "name": "Ashok Bhat", "email": "ashok.bhat@arm.com", "time": "Mon Jan 13 20:41:06 2014 +0000" }, "committer": { "name": "David Butcher", "email": "david.butcher@arm.com", "time": "Thu Jan 16 12:55:13 2014 +0000" }, "message": "AArch64: Use long for pointers in SurfaceTexture\n\nLong is used in SurfaceTexture class to store\npointers as native pointers can be 64-bit.\n\nIn addition, some minor changes have been done\nto conform with standard JNI practice (e.g. use\nof jint instead of int in JNI function prototypes)\n\nChange-Id: I771aa62c42bc865e644c63fd48f309782dd03e73\nSigned-off-by: Ashok Bhat \u003cashok.bhat@arm.com\u003e\nSigned-off-by: Kévin PETIT \u003ckevin.petit@arm.com\u003e\n" }, { "commit": "98002dfb60a20caf62d6682659547c042a4a3342", "tree": "0b4a61520d922a49eae5de8b512c1137e5d955d6", "parents": [ "1b0f0be0979cbe00641d5d386691e87d668a2aa8", "0c10cc6052dc279f020e4adf069961e6e8f9dd6e" ], "author": { "name": "Narayan Kamath", "email": "narayan@google.com", "time": "Thu Jan 16 12:12:11 2014 +0000" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Thu Jan 16 12:12:11 2014 +0000" }, "message": "Merge \"AArch64: Use long for pointers in graphics/PathMeasure\"" }, { "commit": "b091d47a2e31a30581aa210419ff09bcc8715cdf", "tree": "86f427d13bd98d4cf8cd291a1b28d9a078194096", "parents": [ "dcaf5593ddbfe8e1cacaf07813b1e827ba4dba8c" ], "author": { "name": "Ashok Bhat", "email": "ashok.bhat@arm.com", "time": "Wed Jan 08 14:32:49 2014 +0000" }, "committer": { "name": "David Butcher", "email": "david.butcher@arm.com", "time": "Wed Jan 15 14:23:22 2014 +0000" }, "message": "AArch64: Use long for pointers in BitmapRegionDecoder\n\nFor storing pointers, long is used in BitmapRegionDecoder\nclass, as native pointers can be 64-bit.\n\nIn addition, some minor changes have been done\nto conform with standard JNI practice (e.g. use\nof jint instead of int in JNI function prototypes)\n\nIn addition, Graphics.cpp has been changed to work\nwith modified BitmapRegionDecoder.\n\nChange-Id: Id54087dd3bfb29577e8b762e70946793369dc701\nSigned-off-by: Ashok Bhat \u003cashok.bhat@arm.com\u003e\nSigned-off-by: Marcus Oakland \u003cmarcus.oakland@arm.com\u003e\n" }, { "commit": "dcaf5593ddbfe8e1cacaf07813b1e827ba4dba8c", "tree": "b6f75a378d4d280794c44b392dcc8c858ce1e47b", "parents": [ "a0545dd54fdab5b284b509b7121515f15f4d728a" ], "author": { "name": "Ashok Bhat", "email": "ashok.bhat@arm.com", "time": "Wed Jan 08 16:47:08 2014 +0000" }, "committer": { "name": "David Butcher", "email": "david.butcher@arm.com", "time": "Wed Jan 15 14:22:56 2014 +0000" }, "message": "AArch64: Use long for pointers in Movie class\n\nFor storing pointers, long is used in Movie class,\nas native pointers can be 64-bit.\n\nIn addition, some minor changes have been done\nto conform with standard JNI practice (e.g. use\nof jint instead of int in JNI function prototypes)\n\nChange-Id: I946325e4af6cb9282012bebdaee89e1117d8797b\nSigned-off-by: Ashok Bhat \u003cashok.bhat@arm.com\u003e\nSigned-off-by: Marcus Oakland \u003cmarcus.oakland@arm.com\u003e\n" }, { "commit": "0c10cc6052dc279f020e4adf069961e6e8f9dd6e", "tree": "7d796a57a1c2d239570361148a4982fb019fdda6", "parents": [ "868173a53f0d1059408b049f30af3402d5b0de64" ], "author": { "name": "Ashok Bhat", "email": "ashok.bhat@arm.com", "time": "Fri Jan 10 18:38:39 2014 +0000" }, "committer": { "name": "David Butcher", "email": "david.butcher@arm.com", "time": "Mon Jan 13 14:50:50 2014 +0000" }, "message": "AArch64: Use long for pointers in graphics/PathMeasure\n\nFor storing pointers, long is used in\nandroid/graphics/PathMeasure class, as native\npointers can be 64-bit.\n\nIn addition, some minor changes have been done\nto conform with standard JNI practice (e.g. use\nof jint instead of int in JNI function prototypes)\n\nChange-Id: I4599a9d5f7dcf9c39838db96d9033059114d3a49\nSigned-off-by: Ashok Bhat \u003cashok.bhat@arm.com\u003e\nSigned-off-by: Marcus Oakland \u003cmarcus.oakland@arm.com\u003e\n" }, { "commit": "57cf560719e5cbe4ed52e54bb0556e6f79bbe061", "tree": "f4651ff702ef12b4fedecc8af7f4dce706502a46", "parents": [ "584ace0d3f79ff43db9298798065dd5beaa66a45" ], "author": { "name": "Stephen Hines", "email": "srhines@google.com", "time": "Wed Dec 18 16:21:30 2013 -0800" }, "committer": { "name": "Stephen Hines", "email": "srhines@google.com", "time": "Wed Dec 18 16:24:21 2013 -0800" }, "message": "DO NOT MERGE - Fix improper declaration/use of pointer.\n\nhttps://code.google.com/p/android/issues/detail?id\u003d61547\n\nThis variable is shadowing the outer \"ptr\" declaration, resulting in a\npotential NULL pointer being passed to the message API.\n\nChange-Id: If96bfae8d5e874e12597182678a180ba137b78da\n" }, { "commit": "ebcb32f58a6220802ca129ea33f47b4b69931a10", "tree": "32b57c1d6ba9180ae63979e06d7421e107a9aa6c", "parents": [ "6e2d0c1d91f644ab50e0c0b7cae4306262a4ca41", "bac61807d3bcfff957b358cb9ad77850bd373689" ], "author": { "name": "The Android Open Source Project", "email": "initial-contribution@android.com", "time": "Thu Dec 05 13:10:46 2013 -0800" }, "committer": { "name": "The Android Open Source Project", "email": "initial-contribution@android.com", "time": "Thu Dec 05 13:10:46 2013 -0800" }, "message": "Merge commit \u0027bac61807d3bcfff957b358cb9ad77850bd373689\u0027 into HEAD\n\nChange-Id: I29374270c8e0c2f2859efaf1d55af9f73da0f8d7\n" }, { "commit": "37e4c405a6136f90e5a8d4fc512cf7f551eb0c56", "tree": "c3a6fea207090d615f7c103a970f7839326e84b8", "parents": [ "1ccc6633bf47c95601cc13a2566c702bb8d986cd", "484b57a5655f28967e0062f578f38535dff52323" ], "author": { "name": "Katie McCormick", "email": "kmccormick@google.com", "time": "Tue Nov 26 14:00:33 2013 -0800" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Tue Nov 26 14:00:33 2013 -0800" }, "message": "am 484b57a5: am 9d0a88bd: Merge \"Doc updates: Javadoc fixes\" into klp-docs\n\n* commit \u0027484b57a5655f28967e0062f578f38535dff52323\u0027:\n Doc updates: Javadoc fixes\n" }, { "commit": "484b57a5655f28967e0062f578f38535dff52323", "tree": "94e94be4d270bf1cc070bdd78bbf6b9ca2aef76c", "parents": [ "fdb738a52fe0f0f3bef8b867c6646668d86835dd", "9d0a88bd4e07deac01d7759b70cdf160456be1c0" ], "author": { "name": "Katie McCormick", "email": "kmccormick@google.com", "time": "Tue Nov 26 21:58:18 2013 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Tue Nov 26 21:58:18 2013 +0000" }, "message": "am 9d0a88bd: Merge \"Doc updates: Javadoc fixes\" into klp-docs\n\n* commit \u00279d0a88bd4e07deac01d7759b70cdf160456be1c0\u0027:\n Doc updates: Javadoc fixes\n" }, { "commit": "f2ef28d840647d2f16792313bdc22b2114a5df6a", "tree": "f70c7250948915f68d97549fddc55e2d90a20f22", "parents": [ "330dfa7d11c542aa99aa277f75113bfc916d72dd" ], "author": { "name": "Katie McCormick", "email": "kmccormick@google.com", "time": "Tue Nov 26 11:10:54 2013 -0800" }, "committer": { "name": "Katie McCormick", "email": "kmccormick@google.com", "time": "Tue Nov 26 13:52:48 2013 -0800" }, "message": "Doc updates: Javadoc fixes\n\nChange-Id: I82381056f9f13e53ab8a0525f5a53bf98674c052\n" }, { "commit": "1ccc6633bf47c95601cc13a2566c702bb8d986cd", "tree": "d12af54786f61168ceef1f3fd9f3ad1ab4e2a3f7", "parents": [ "ad0cab26a7abb0b6d08e5a807bf8aff87db0a52a", "9e6d8f04940fd710ae858ff7ee4df43eb03ea85e" ], "author": { "name": "Jason Sams", "email": "jsams@google.com", "time": "Tue Nov 26 12:32:22 2013 -0800" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Tue Nov 26 12:32:22 2013 -0800" }, "message": "am 9e6d8f04: Merge \"Adding operations to reflected Renderscript class\"\n\n* commit \u00279e6d8f04940fd710ae858ff7ee4df43eb03ea85e\u0027:\n Adding operations to reflected Renderscript class\n" }, { "commit": "9e6d8f04940fd710ae858ff7ee4df43eb03ea85e", "tree": "0127f0d37eb6d8b6776fc2355bb2c57172de9d70", "parents": [ "99ef026f48948f281467fcf4ce7ebbe15630ad45", "6a5875cf96a6eebf4ef2e176176868ecbf17122f" ], "author": { "name": "Jason Sams", "email": "jsams@google.com", "time": "Tue Nov 26 20:23:44 2013 +0000" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Tue Nov 26 20:23:44 2013 +0000" }, "message": "Merge \"Adding operations to reflected Renderscript class\"" }, { "commit": "134631b9078df0b9277fb3b8319bf3b85f690727", "tree": "aedd24ccc1b8759184cf87e38936367bbc612633", "parents": [ "6bb9588d767822a70823319170160ceb28c583f2", "90242fe5581c8f665c09337a0971a7c3fc908f7c" ], "author": { "name": "Svetoslav", "email": "svetoslavganov@google.com", "time": "Thu Nov 07 16:22:22 2013 -0800" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Thu Nov 07 16:22:22 2013 -0800" }, "message": "am 90242fe5: Merge \"Switch to the new Skia PDF generation APIs.\" into klp-dev\n\n* commit \u002790242fe5581c8f665c09337a0971a7c3fc908f7c\u0027:\n Switch to the new Skia PDF generation APIs.\n" }, { "commit": "90242fe5581c8f665c09337a0971a7c3fc908f7c", "tree": "2cbcc6d5f5ec60c53ecd34f72036c00bce6c03e5", "parents": [ "e81f9755d914b5b87f18e5ed201a4903dc09baa6", "35aacf2eb325d24c67d01f4dbd706ed26ab9e8c3" ], "author": { "name": "Svetoslav", "email": "svetoslavganov@google.com", "time": "Fri Nov 08 00:20:10 2013 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Fri Nov 08 00:20:10 2013 +0000" }, "message": "Merge \"Switch to the new Skia PDF generation APIs.\" into klp-dev" }, { "commit": "35aacf2eb325d24c67d01f4dbd706ed26ab9e8c3", "tree": "659b0de968eb7d62a6e6aea8ac290b5d3ee3b3b0", "parents": [ "c157cac9b2827a4eeb0ea29209fbb879a6076de4" ], "author": { "name": "Svetoslav", "email": "svetoslavganov@google.com", "time": "Wed Nov 06 18:22:13 2013 -0800" }, "committer": { "name": "Svetoslav Ganov", "email": "svetoslavganov@google.com", "time": "Thu Nov 07 14:15:19 2013 -0800" }, "message": "Switch to the new Skia PDF generation APIs.\n\nThe new Skia PDF generation APIs are a small extension to\nthe code that converts drawing commands to PDF (SkPDFDevice)\nand this new functionality is exposed via new APIs. This\nchange switches to using these new APIs allowing us to\ncapitalize on the new perspective support for PDF\ngeneration.\n\nbug:11561776\n\nChange-Id: Ief61f7ff6a5a22c27d3acbe99a48910cb679f594\n" }, { "commit": "e34c477060bf7e212177029598bea0b04adc6f80", "tree": "d5f82e879fbb47e1b1164963af06e6b26d391179", "parents": [ "f1612bcfdd2cb517948f14369fd0977ceb55d19c", "435c0ee10af132937dc0a22c39380624e6efd5ab" ], "author": { "name": "Fabrice Di Meglio", "email": "fdimeglio@google.com", "time": "Thu Nov 07 11:21:03 2013 -0800" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Thu Nov 07 11:21:03 2013 -0800" }, "message": "am 435c0ee1: Merge \"Fix bug #11537133 Hideycling looks broken (KOT36), missing left padding\" into klp-dev\n\n* commit \u0027435c0ee10af132937dc0a22c39380624e6efd5ab\u0027:\n Fix bug #11537133 Hideycling looks broken (KOT36), missing left padding\n" }, { "commit": "435c0ee10af132937dc0a22c39380624e6efd5ab", "tree": "b1cf2fbb4a9f06cdc247edcfba96bff51aa5b6f0", "parents": [ "e8c51298a43f607fea7418ced7cc783e6065fe87", "f7a93ef3847258157d144dfefaa5757128cc807d" ], "author": { "name": "Fabrice Di Meglio", "email": "fdimeglio@google.com", "time": "Thu Nov 07 19:17:59 2013 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Thu Nov 07 19:18:00 2013 +0000" }, "message": "Merge \"Fix bug #11537133 Hideycling looks broken (KOT36), missing left padding\" into klp-dev" }, { "commit": "badb59cd5d2a2905494964889f002a277211000a", "tree": "a05d5d3810c71a7ce4f5a631057eef39665e54c8", "parents": [ "c565583384952007f37e090fb354d232f407bd31", "47feee535f9e4e77165b93b6b9f10379e7aa4bbd" ], "author": { "name": "Newton Allen", "email": "newt@google.com", "time": "Thu Nov 07 05:19:12 2013 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Thu Nov 07 05:19:12 2013 +0000" }, "message": "am 47feee53: Merge \"Fix some documentation typos.\" into klp-docs\n\n* commit \u002747feee535f9e4e77165b93b6b9f10379e7aa4bbd\u0027:\n Fix some documentation typos.\n" }, { "commit": "f7a93ef3847258157d144dfefaa5757128cc807d", "tree": "c9836a9e7aa1b367a7d5ea51aad8f7fee32cb501", "parents": [ "be0b05a028ebc1b49ed32b79d53af384106c31a3" ], "author": { "name": "Fabrice Di Meglio", "email": "fdimeglio@google.com", "time": "Wed Nov 06 15:32:01 2013 -0800" }, "committer": { "name": "Fabrice Di Meglio", "email": "fdimeglio@google.com", "time": "Wed Nov 06 15:32:01 2013 -0800" }, "message": "Fix bug #11537133 Hideycling looks broken (KOT36), missing left padding\n\n- enforce the Drawable boolean getPadding(Rect) contract for NinePatchDrawable\nand DrawableContainer.\n\n- as NinePatchDrawable was not enforcing it, the consequence was that the\nmUserPaddingLeftInitial / mUserPaddingRitghInitial were reset to \"0\" (even\nif they got the correct value before the reset).\n\nChange-Id: I1efe7fad5f89c0ca47f90189f6d89940e0e9c6ae\n" }, { "commit": "47742d4bb004a51c045d443024a36d784cd38d9b", "tree": "aa450e84607513558906e50ab6275c4dfc2f542f", "parents": [ "e77d2a9c62e747902bc53d40e303214705702b00", "222f2ad294c9046b62af5e059f8b409aec044ce9" ], "author": { "name": "Chris Craik", "email": "ccraik@google.com", "time": "Wed Nov 06 23:23:56 2013 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Wed Nov 06 23:23:56 2013 +0000" }, "message": "Merge \"Fix NPE with inPurgeable Bitmaps in getAllocationByteCount\" into klp-dev" }, { "commit": "222f2ad294c9046b62af5e059f8b409aec044ce9", "tree": "83c65f8b1f0572295a6a3823294631258f86f719", "parents": [ "194271565399a9216b8e0dece118874fc5f7e474" ], "author": { "name": "Chris Craik", "email": "ccraik@google.com", "time": "Wed Nov 06 14:01:28 2013 -0800" }, "committer": { "name": "Chris Craik", "email": "ccraik@google.com", "time": "Wed Nov 06 14:01:28 2013 -0800" }, "message": "Fix NPE with inPurgeable Bitmaps in getAllocationByteCount\n\nbug:11556330\nChange-Id: I430136ea15baeb60adfb9bb2acdde9505ce707fe\n" }, { "commit": "9d383ece52620b0358bcfae7f2102b64acd1d5cb", "tree": "23a545e2b6bc53ec5829c37a3d227aa5ea3d0518", "parents": [ "6fbd4829a9614f0d6c668cd5ccba6cabdaeb81a0", "f68bb66c6ec239790ba18b8d078eb7ab4894fdc3" ], "author": { "name": "John Spurlock", "email": "jspurlock@google.com", "time": "Wed Nov 06 02:29:19 2013 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Wed Nov 06 02:29:20 2013 +0000" }, "message": "Merge \"Fix recent regression in DrawableContainer.\" into klp-dev" }, { "commit": "57c9886d4bbe8af0391b397e74a54d7ac7f1ebb6", "tree": "b7f57c727ea1dec704cd68a355575bf957338822", "parents": [ "a5f542a30363825a70ff737e232699726b2261f7" ], "author": { "name": "Adam Koch", "email": "akoch@google.com", "time": "Tue Nov 05 10:42:48 2013 -0500" }, "committer": { "name": "Adam Koch", "email": "akoch@google.com", "time": "Wed Nov 06 01:18:05 2013 +0000" }, "message": "Doc fix: add more detail to BitmapFactory.Options.inPurgeable flag.\nBug: 6064760\n\nChange-Id: I3fd833a3205be451ff6548fab3555d170c9c570e\n(cherry picked from commit e1693df494dbdedfb5eac56bf59f86afc893b778)" }, { "commit": "be0b05a028ebc1b49ed32b79d53af384106c31a3", "tree": "79ff7102f438c8cb61e1cb1eb80e6aae453fcad9", "parents": [ "4653837b78b7da950e7827598baabc79be1aa4ca", "e1693df494dbdedfb5eac56bf59f86afc893b778" ], "author": { "name": "Adam Koch", "email": "akoch@google.com", "time": "Wed Nov 06 01:13:44 2013 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Wed Nov 06 01:13:44 2013 +0000" }, "message": "Merge \"Doc fix: add more detail to BitmapFactory.Options.inPurgeable flag. Bug: 6064760\" into klp-dev" }, { "commit": "f68bb66c6ec239790ba18b8d078eb7ab4894fdc3", "tree": "7e5f7fe91eb18f538856aa883f32c0d86b0fc8dd", "parents": [ "65d4a84b980583e068dd21bf11e5fe034df8d7ef" ], "author": { "name": "John Spurlock", "email": "jspurlock@google.com", "time": "Tue Nov 05 17:45:33 2013 -0500" }, "committer": { "name": "John Spurlock", "email": "jspurlock@google.com", "time": "Tue Nov 05 19:15:41 2013 -0500" }, "message": "Fix recent regression in DrawableContainer.\n\nEnsure optical insets are never null.\n\nBug:11537082\nChange-Id: Ib75be83909fac612ae947f501835285cd8a79862\n" }, { "commit": "e1693df494dbdedfb5eac56bf59f86afc893b778", "tree": "1d8da930d22900c98a03e6d135ac99ad512e8b19", "parents": [ "c880c27e63590c94ca3a43235574697ce0df043d" ], "author": { "name": "Adam Koch", "email": "akoch@google.com", "time": "Tue Nov 05 10:42:48 2013 -0500" }, "committer": { "name": "Adam Koch", "email": "akoch@google.com", "time": "Tue Nov 05 16:00:09 2013 -0500" }, "message": "Doc fix: add more detail to BitmapFactory.Options.inPurgeable flag.\nBug: 6064760\n\nChange-Id: I3fd833a3205be451ff6548fab3555d170c9c570e\n" }, { "commit": "f48bcd5b68613b0a4ff0162091047fb9465b5290", "tree": "15f167ec0177cda1315252ad2367c3419523f40c", "parents": [ "cad157b370524782183de688bf97c9078c1c08da", "600d7dd1c6d9d1ff81b71085eff2a6be50d6f36c" ], "author": { "name": "Fabrice Di Meglio", "email": "fdimeglio@google.com", "time": "Tue Nov 05 00:46:18 2013 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Tue Nov 05 00:46:19 2013 +0000" }, "message": "Merge \"Fix bug #11256076 Spinner text is too close from the opening triangle in RTL Locales\" into klp-dev" }, { "commit": "ff236f5fc1a088b1210d37a67b0e88b06c0fbdb2", "tree": "4092fe0319950266e4fd5742dd62e5d32927760e", "parents": [ "6934add2692ffbad8f299aaef80ee8d3f1f991d6" ], "author": { "name": "Newton Allen", "email": "newt@google.com", "time": "Tue Aug 13 11:22:32 2013 -0700" }, "committer": { "name": "Newton Allen", "email": "newt@google.com", "time": "Fri Nov 01 02:38:01 2013 +0000" }, "message": "Fix some documentation typos.\n\nChange-Id: I0360d468d54d970c87f313e24e50965245206f28\n(cherry picked from commit c502744f2ddcc80a34f5197b5d2c0d701c7d6e71)" }, { "commit": "78da147d426c80baac63aeaf521f112d8c4c1d2d", "tree": "b1713593bc4f186810bded596db06018781ca006", "parents": [ "73b5572f374d6c0e8e69f7387da9d1ff6ce144b8" ], "author": { "name": "Svetoslav Ganov", "email": "svetoslavganov@google.com", "time": "Wed Oct 30 20:52:04 2013 -0700" }, "committer": { "name": "Scott Main", "email": "smain@google.com", "time": "Thu Oct 31 23:05:55 2013 +0000" }, "message": "Update the PdfDocument docs with unsupported operations.\n\nThe PDF generating canvas we use does not yet support all\ndrawing operations. This change adds docs which operations\nare not yet supported.\n\nChange-Id: I8d5ee8c1e2a473ba783b5e62f23ab90a54bbf106\n(cherry picked from commit 8db45b844b5482cf61839404c0f6847e053de817)" }, { "commit": "8db45b844b5482cf61839404c0f6847e053de817", "tree": "15269f70fa4558160b90d49243853d0b73aa28ba", "parents": [ "334d98f1ece949414b94924a5bc852810e0bf367" ], "author": { "name": "Svetoslav Ganov", "email": "svetoslavganov@google.com", "time": "Wed Oct 30 20:52:04 2013 -0700" }, "committer": { "name": "Svetoslav Ganov", "email": "svetoslavganov@google.com", "time": "Thu Oct 31 08:10:12 2013 -0700" }, "message": "Update the PdfDocument docs with unsupported operations.\n\nThe PDF generating canvas we use does not yet support all\ndrawing operations. This change adds docs which operations\nare not yet supported.\n\nChange-Id: I8d5ee8c1e2a473ba783b5e62f23ab90a54bbf106\n" }, { "commit": "6a5875cf96a6eebf4ef2e176176868ecbf17122f", "tree": "009b6a091811feaab8e3e2b39e3c28e00887aca4", "parents": [ "a1b4d97b6920d3cd84fe19b07512a0de6996bb4c" ], "author": { "name": "Matthieu Delahaye", "email": "matthieu@multicorewareinc.com", "time": "Tue Sep 10 15:11:35 2013 -0500" }, "committer": { "name": "Matthieu Delahaye", "email": "matthieu@multicorewareinc.com", "time": "Wed Oct 23 16:02:03 2013 -0500" }, "message": "Adding operations to reflected Renderscript class\n\nRenderscript expose its native types back to the Android\nsystem through a set of classes defined within the renderscript\npackage. These classes provides no easy mean to manipulate\ndata they represent. It would be convinient to be able to manipulate\nthe data stored within an allocation via these classes directly\ninstead of having to marshall them into native Java objects.\n\nThis commit adds such operations to the existing exposed vector types.\n\nChange-Id: I1845df1368a82f0d39b36416c83938c7160f6a3f\n" }, { "commit": "600d7dd1c6d9d1ff81b71085eff2a6be50d6f36c", "tree": "2282a60fc44a7e6af2460a36b7dea427490d3f6b", "parents": [ "b5da7b23df5278a5e722b601eb8ef7e98537a51e" ], "author": { "name": "Fabrice Di Meglio", "email": "fdimeglio@google.com", "time": "Wed Oct 16 13:16:00 2013 -0700" }, "committer": { "name": "Fabrice Di Meglio", "email": "fdimeglio@google.com", "time": "Fri Oct 18 11:26:48 2013 -0700" }, "message": "Fix bug #11256076 Spinner text is too close from the opening triangle in RTL Locales\n\nBackground Drawable padding was not taken into account in RTL Locales\n\n- make sure the Drawables are resolved before resolving padding\n- during padding resolution take care about background padding\n\nChange-Id: Ib0c722adf5341ab4fa2182a0d0ac2ca639e85cfc\n" }, { "commit": "cd925885283396c0379ec2dcaa94e318993f40f8", "tree": "4f461ff3118c20640b4c921e07c86e48a423ab1e", "parents": [ "6e19feb4f3da02916754636d3ade340dcd5412d5" ], "author": { "name": "Eino-Ville Talvala", "email": "etalvala@google.com", "time": "Mon Oct 07 13:24:52 2013 -0700" }, "committer": { "name": "Eino-Ville Talvala", "email": "etalvala@google.com", "time": "Fri Oct 11 19:26:08 2013 +0000" }, "message": "DO NOT MERGE: Hide new camera API.\n\nNot yet ready.\n\nBug: 11141002\n\nChange-Id: I4704bffb9ba36af47a66dc5b49cbba00be623aae\n" }, { "commit": "31049d76c55b18a6d9993f0d9687598740b16014", "tree": "79bf629079bfc443f3c00597912e415d92636200", "parents": [ "dbc31105bda3591d64e4d3e2abb3b3eaf857222e" ], "author": { "name": "Adam Powell", "email": "adamp@google.com", "time": "Mon Oct 07 12:58:42 2013 -0700" }, "committer": { "name": "Adam Powell", "email": "adamp@google.com", "time": "Mon Oct 07 16:14:17 2013 -0700" }, "message": "Use SCREEN Xfermode for keyguard badges; update SeekBar\n\nPlumb through the necessary API features through Drawables and\nImageView but leave it hidden for now pending future API review and\nplumbing through the rest of the framework Drawable implementations.\n\nUpdate SeekBar assets used for keyguard transport control.\n\nSet selected status directly instead of finding views by id.\n\nBug 10531608\nBug 10784913\n\nChange-Id: Ia38bd04ad1bc26e9e6da1dda8a374c9ba3ceccb3\n" }, { "commit": "d0f379c1976c600313f1f4c39f2587a649e3a4fc", "tree": "367e1eba6b813b5ccf77af90c3a9f5320205bd2a", "parents": [ "00fb27dda8c74229ea55b524063410842ba4a21e" ], "author": { "name": "Mike Klein", "email": "mtklein@google.com", "time": "Wed Oct 02 10:37:49 2013 -0400" }, "committer": { "name": "Mike Klein", "email": "mtklein@google.com", "time": "Mon Oct 07 21:04:47 2013 +0000" }, "message": "Preserve fill type in Path.reset().\n\nBug: 10838355\nChange-Id: I7bdecb945fc35dfed02d37745678ae7bda906628\n" }, { "commit": "ee3e1603fdbbe24b0cbf3cb85c456696cf3b7941", "tree": "467d523ed0b15730db64007b622442dc4faae0bd", "parents": [ "7aa7601c09ab5d87cc15a0ed9a8f511d494a4cbc" ], "author": { "name": "Jeff Sharkey", "email": "jsharkey@android.com", "time": "Tue Oct 01 15:32:13 2013 -0700" }, "committer": { "name": "Jeff Sharkey", "email": "jsharkey@android.com", "time": "Tue Oct 01 16:03:00 2013 -0700" }, "message": "Fix animations, padding in RTL mode.\n\nShow directory animations coming in from left-side when in RTL\nlanguage. Also fix NinePatchDrawable to correctly mirror its padding\nwhen auto-mirrored, and fix InsetDrawable to propagate the layout\ndirection to the wrapped Drawable.\n\nBug: 10987190, 11030793\nChange-Id: I1213802a07d0c4ced93438df1e6ddf5aed3df677\n" }, { "commit": "a4eb894a55b07eeddb05d47558e6b2838d56af08", "tree": "8af8628376606f7d2d5c8003faff8fe4c1cada6e", "parents": [ "4e9c7d8ba3caa8b558e2a1de796c100a562445ae", "8dc7d5ea2680b7e397d2cdb7f83427d2c86c9de7" ], "author": { "name": "Victoria Lease", "email": "violets@google.com", "time": "Thu Sep 26 21:40:55 2013 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Thu Sep 26 21:40:55 2013 +0000" }, "message": "Merge \"clarify Paint flag docs\" into klp-dev" }, { "commit": "8dc7d5ea2680b7e397d2cdb7f83427d2c86c9de7", "tree": "13fb96a653a989ebcaaf49032b334169bb8d2576", "parents": [ "bc05918c88fe9450008ba3adf6caed6afa46550b" ], "author": { "name": "Victoria Lease", "email": "violets@google.com", "time": "Tue Sep 24 15:57:02 2013 -0700" }, "committer": { "name": "Victoria Lease", "email": "violets@google.com", "time": "Thu Sep 26 13:40:47 2013 -0700" }, "message": "clarify Paint flag docs\n\nBug: 10460797\nChange-Id: Iae622b302cad3dc788f512b472e3a59ec227a8d7\n" }, { "commit": "321bc46b3c885a806f2e7e29db8212f7ea6c8670", "tree": "94edc5de405b39cedeebc0ce23fb4190ad8815b6", "parents": [ "9ca833f4a5eca732b1618bc1a183215c21ae11e5" ], "author": { "name": "Leon Scroggins III", "email": "scroggo@google.com", "time": "Wed Sep 25 17:49:45 2013 -0400" }, "committer": { "name": "Leon Scroggins III", "email": "scroggo@google.com", "time": "Wed Sep 25 18:02:32 2013 -0400" }, "message": "Update docs to state that mark is no longer called.\n\nBUG:6493544\n\nChange-Id: I97a4d90ce2efcd12f8f1cc5b545f822f8e5a5ab0\n" }, { "commit": "6811f4e92cbb64e72a0d13eb9b99b5894bd59c76", "tree": "5b0ebddf52a449b1ea84d91d6313e897a03e2b3e", "parents": [ "f95c9aa7e1229963a4cb92eed46eafc205b03cb3" ], "author": { "name": "Svetoslav", "email": "svetoslavganov@google.com", "time": "Wed Sep 18 15:58:28 2013 -0700" }, "committer": { "name": "Svetoslav", "email": "svetoslavganov@google.com", "time": "Thu Sep 19 17:12:47 2013 -0700" }, "message": "Move PdfDocument to android.graphics.pdf\n\n1. Move PdfDocument to android.graphics.pdf.\n\n2. Changed the PdfDocument as per API concil request.\n\n3. Updated the documentation.\n\nbug:10461180\nbug:10552565\nbug:10681585\nbug:10552336\n\nChange-Id: I08e15b34cf37bb064248c887e6f59808019cafe8\n" }, { "commit": "7315f1baee19476363235127bc1438e2a291fa15", "tree": "376c68ec739e970b66165d059cf8e1e8e6d86980", "parents": [ "c255a7113a6a6b058f1b3b5b128fba1d24bbd3d9" ], "author": { "name": "Leon Scroggins III", "email": "scroggo@google.com", "time": "Tue Sep 10 20:26:05 2013 -0400" }, "committer": { "name": "Leon Scroggins III", "email": "scroggo@google.com", "time": "Wed Sep 18 12:01:20 2013 -0400" }, "message": "Use a native buffer for decoding images.\n\nFixes BUG:10725383\n\nDepends on https://googleplex-android-review.git.corp.google.com/#/c/357300/\nin external/skia.\n\nIn the previous fix for BUG:8432093 and BUG:6493544\n(https://googleplex-android-review.googlesource.com/#/c/346191/),\ninstead of calling mark on the provided input stream, we\ncopied the entire stream in native code (except in one case;\nmore details below), allowing rewind no matter how much of\nthe stream had been read. This was because two decoders\nmay rewind after reading an arbitrary amount of the stream:\nSkImageDecoder_wbmp and SkImageDecoder_libjpeg.\n\nIt turns out that the jpeg decoder does not need this rewind\nafter arbitrary length (it is a failure recovery case, and\nlibjpeg has a default recovery we can use - the above referenced\nCL in Skia uses the default).\n\nAlthough the wbmp decoder could read any amount given a\nstream with the \"right\" data, and then return false, such a\nstream would not be a valid stream of another format, so it\nis okay for this rewind to fail.\n\nFurther, the previous fix was inefficient in the common case\nwhere the caller decodes just the bounds, resets, then decodes\nthe entire image (since we have copied the entire stream twice).\nThe copy also resulted in the crashes seen in BUG:10725383.\n\nIn this CL, buffer only the amount of input needed by\nSkImageDecoder::Factory to determine the type of image decoder\nneeded. Do not mark the input stream provided by the caller,\nso their mark (if any) can remain in tact. The new Skia class\nSkFrontBufferedStream allows buffering just the beginning\nof the stream.\n\ncore/jni/android/graphics/BitmapFactory.cpp:\nInstead of calling GetRewindableStream (which has been removed),\ncall CreateJavaInputStreamAdaptor. Then wrap it in an\nSkFrontBufferedStream, with a large enough buffer to determine\nwhich type of image is used.\n\ncore/jni/android/graphics/CreateJavaOutputStreamAdaptor.h:\ncore/jni/android/graphics/CreateJavaOutputStreamAdaptor.cpp:\nRemove mark, markSupported, and rewind. CreateJavaInputStreamAdaptor\nnow turns an SkStream which is not rewindable. If the caller\nneeds rewind that needs to be handled differently (for example,\nby using SkFrontBufferedStream, as is done in BitmapFactory and\nMovie.\nRemove RewindableJavaStream and GetRewindableStream.\nRemove code specific to ByteArrayInputStream, which makes slow\nJNI calls. Instead, depend on the caller to buffer the input\nin the general case. There is no reason to special case this\nstream (especially since we already have decodeByteArray).\nRemove CheckForAssetStream, which is now always special cased\nin Java.\n\ncore/jni/android/graphics/Movie.cpp:\nCall CreateJavaInputStreamAdaptor and use an SkFrontBufferedStream.\nAdd a native function for decoding an Asset, and remove old\ncall to CheckForAssetStream.\n\ngraphics/java/android/graphics/BitmapFactory.java:\nWrite a helper function for decoding a stream to consolidate\ncommon code.\nBuffer enough of the input so that SkImageDecoder::Factory\ncan rewind after having read enough to determine the type.\nUnlike the old code, do NOT mark the caller\u0027s stream. This is\nhandled in native code. The caller\u0027s mark (if any) is left alone.\n\ngraphics/java/android/graphics/Movie.java:\nCheck for an Asset stream before passing to native, and\ncall a native function for handling the asset directly.\n\nBUG:6493544\nBUG:8432093\nBUG:10725383\n\nChange-Id: Ide74d3606ff4bb2a8c6cdbf11bae3f96696f331a\n" }, { "commit": "2cad64c0fbeba07bb546674e19cfb0166d7ec332", "tree": "7ec5d5625c648ea459f4c4ec17917dae633e26f2", "parents": [ "444ae3a2e66b4404fa715ab46403da09079dd572", "a86ab640f7bb0bf3cb4eaed80473ca8c5d131903" ], "author": { "name": "Igor Murashkin", "email": "iam@google.com", "time": "Wed Sep 11 18:27:59 2013 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Wed Sep 11 18:28:07 2013 +0000" }, "message": "Merge \"Surface: Change OutOfResourcesException to be a runtime exception\" into klp-dev" }, { "commit": "1d2daa7809b58c226410c0060d7837de0a29888a", "tree": "4000e44aec08a20f016f35f169b0c38d2e08ff0f", "parents": [ "8716c08151378f7488a0f129fe43a0b3d4dc499d", "5835157d762a5b6bffe3d892c588ebc475bccb44" ], "author": { "name": "John Reck", "email": "jreck@google.com", "time": "Tue Sep 10 16:25:14 2013 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Tue Sep 10 16:25:14 2013 +0000" }, "message": "Merge \"Remove FD optimization case for decodeStream\" into klp-dev" }, { "commit": "e3d0f022826a2a16e64dc9b5353a2a514393881b", "tree": "b824856d1031967e15049caa65ad885fa76d9ea8", "parents": [ "5f5e84770badd10c41fd4a2b01a9958a607eacd9", "88990da58d0231b5a1b9a27b32c37839e95c7487" ], "author": { "name": "Stephen Hines", "email": "srhines@google.com", "time": "Tue Sep 10 05:23:10 2013 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Tue Sep 10 05:23:15 2013 +0000" }, "message": "Merge \"Don\u0027t set Allocation mSize when we have no Type.\" into klp-dev" }, { "commit": "a86ab640f7bb0bf3cb4eaed80473ca8c5d131903", "tree": "472883eaf9edff25136902d4976f275c56218b41", "parents": [ "ff44ed58a1e38ff830e74b0d73549ff01725852d" ], "author": { "name": "Igor Murashkin", "email": "iam@google.com", "time": "Fri Aug 30 12:58:36 2013 -0700" }, "committer": { "name": "Igor Murashkin", "email": "iam@google.com", "time": "Mon Sep 09 21:53:59 2013 -0700" }, "message": "Surface: Change OutOfResourcesException to be a runtime exception\n\n- Deprecates SurfaceTexture.OutOfResourcesException, it wasn\u0027t used\n- Make all JNI code throw only Surface.OutOfResourcesException\n- Get rid of redundant SurfaceControl.OutOfResourcesException\n\nBug: 10566539\nChange-Id: I58126260771b9ccff6a69c672ce7719b9f98138d\n" }, { "commit": "88990da58d0231b5a1b9a27b32c37839e95c7487", "tree": "c76a81dd08bdc49b46be9956d3126b35db882dbf", "parents": [ "6416729c4732be6bcdbc5f303752a9d1885f86d0" ], "author": { "name": "Stephen Hines", "email": "srhines@google.com", "time": "Mon Sep 09 17:56:07 2013 -0700" }, "committer": { "name": "Stephen Hines", "email": "srhines@google.com", "time": "Mon Sep 09 17:56:07 2013 -0700" }, "message": "Don\u0027t set Allocation mSize when we have no Type.\n\nBug: 10667740\n\nA3D creates Allocations before knowing the underlying Type (and thus size).\nMoving the mSize calculation to be conditional for concrete Allocations\neliminates the bug. In the future, we could let A3D dynamically update the\nAllocation size if it is necessary to improve heap behavior.\n\nChange-Id: I520246806b6ead0387a1a41372dade1a6e7c2271\n" }, { "commit": "5835157d762a5b6bffe3d892c588ebc475bccb44", "tree": "2540b1359dc480b22094e81544a4dd84fdd333ed", "parents": [ "23ae1461d2cf0ac3f1da71200544381a8d8a4957" ], "author": { "name": "John Reck", "email": "jreck@google.com", "time": "Mon Sep 09 16:37:57 2013 -0700" }, "committer": { "name": "John Reck", "email": "jreck@google.com", "time": "Mon Sep 09 23:41:20 2013 +0000" }, "message": "Remove FD optimization case for decodeStream\n\n Bug: 10677727\n The problem is that the FileInputStream may be wrapping a pipe or\n AssetFileDescriptor which fails if handed to decodeFileDescriptor.\n The problem is that AFDs can start in the middle of a file, whereas\n decodeFileDescriptor assumes it can mmap() the FD and start at\n the beginning.\n\nChange-Id: I98a3c5f789865145e25a99b32d205e290808c1cf" }, { "commit": "23ae1461d2cf0ac3f1da71200544381a8d8a4957", "tree": "c1a6feb975861d99319e0a1f766876e170191e1e", "parents": [ "85e7177abe3024218de589a94bc0914bcfe51547", "9578e642403c0fa4fdcb32828f27c2417cabe88d" ], "author": { "name": "Tim Murray", "email": "timmurray@google.com", "time": "Mon Sep 09 23:34:38 2013 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Mon Sep 09 23:34:38 2013 +0000" }, "message": "Merge \"Add flags word to initialization.\" into klp-dev" }, { "commit": "9578e642403c0fa4fdcb32828f27c2417cabe88d", "tree": "34e95855ef8c2e7b080106bb83d7fccfbc9fb17a", "parents": [ "16c3220734f3cbf32c0148d82815d93e2f28af65" ], "author": { "name": "Tim Murray", "email": "timmurray@google.com", "time": "Mon Sep 09 16:15:56 2013 -0700" }, "committer": { "name": "Tim Murray", "email": "timmurray@google.com", "time": "Mon Sep 09 16:23:27 2013 -0700" }, "message": "Add flags word to initialization.\n\nbug 10427951\n\nChange-Id: I1356b9b96315ead44aa3898de5604d75f9bb8be5\n" }, { "commit": "440f4dfac89c113b41f1a7259306b90b0cde8768", "tree": "0ccdbf67e7fb766e346667befa1c3489fc8a52bb", "parents": [ "bec23ea922566c4b1656deffe1b1951575ae923f", "5d2cace4c5445915c9ea040518c59d85cfcd6b4b" ], "author": { "name": "Andy McFadden", "email": "fadden@android.com", "time": "Mon Sep 09 22:55:35 2013 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Mon Sep 09 22:55:35 2013 +0000" }, "message": "Merge \"Fix pixel test\" into klp-dev" }, { "commit": "5d2cace4c5445915c9ea040518c59d85cfcd6b4b", "tree": "08eb666d9163d1bf29ffbe628ce8abfdc4b150e4", "parents": [ "bdd61696c6720faa14ca9fdf180e519138b3d087" ], "author": { "name": "Andy McFadden", "email": "fadden@android.com", "time": "Mon Sep 09 10:19:44 2013 -0700" }, "committer": { "name": "Andy McFadden", "email": "fadden@android.com", "time": "Mon Sep 09 10:19:44 2013 -0700" }, "message": "Fix pixel test\n\nA deprecated format was dropped entirely.\n\nBug 10666734\n\nChange-Id: I6b64bd27db8965a1696d72387232b7de4bce6574\n" }, { "commit": "352919efd02808f0d6222f7a2cc657f3455c2049", "tree": "2997f863cded7a022bd9156d4c0c6859d3f9884b", "parents": [ "b8b017cb6879352aee015ba24e9bfd05cc094e74" ], "author": { "name": "Chris Craik", "email": "ccraik@google.com", "time": "Fri Sep 06 18:45:51 2013 -0700" }, "committer": { "name": "Chris Craik", "email": "ccraik@google.com", "time": "Fri Sep 06 18:52:22 2013 -0700" }, "message": "Update doc for BitmapFactory.Options to include BitmapRegionDecoder\n\nbug:9987022\nChange-Id: I1a4e187e1c35a7758b70f69a0a25914597920e8f\n" }, { "commit": "e8222dddaf2e3da14380101e818d4254899e0c0d", "tree": "082abae3fd483ef9cf6ea2ee5a9c2ee19363a08a", "parents": [ "9e8bdc39bcdfc22d05edd5f4a0ca69cdffec4f34" ], "author": { "name": "Chet Haase", "email": "chet@google.com", "time": "Thu Sep 05 07:44:18 2013 -0700" }, "committer": { "name": "Chet Haase", "email": "chet@google.com", "time": "Thu Sep 05 08:44:33 2013 -0700" }, "message": "Change build version from KEY_LIME_PIE to KITKAT\n\nIssue #10631619 Change build version to KitKat\n\nChange-Id: I6ad13f6169ad74204078d36929479998b498ad8b\n" }, { "commit": "d2676f9bd93c333ae2c7f3ca284d0fef5a7e146b", "tree": "1b69726920d7644c38f5063220f59dbde1a25337", "parents": [ "c5c203d6ef8eea46f1c06f52e3ebfcc59c304760", "932e78e9903342e3494983fd3463084caab4ba42" ], "author": { "name": "Tim Murray", "email": "timmurray@google.com", "time": "Thu Sep 05 07:36:42 2013 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Thu Sep 05 07:36:43 2013 +0000" }, "message": "Merge \"Add YUV element convenience function.\" into klp-dev" }, { "commit": "932e78e9903342e3494983fd3463084caab4ba42", "tree": "2892ce127d617120c1e6acb6722103cc4d179a47", "parents": [ "5c2dfa8a21e7bd4e07e00f268d30058b654aa099" ], "author": { "name": "Tim Murray", "email": "timmurray@google.com", "time": "Tue Sep 03 11:42:26 2013 -0700" }, "committer": { "name": "Tim Murray", "email": "timmurray@google.com", "time": "Wed Sep 04 16:15:45 2013 -0700" }, "message": "Add YUV element convenience function.\n\nChange-Id: Ie67dfba6a4c4f1913875ad9817c53e45d56809ae\n" }, { "commit": "e182bfd4dcf35d5009bcae72356b999b5ead0433", "tree": "7ce91470652881a7b3d9fd30da2d095ed489cb0d", "parents": [ "a861245f06e854d47ff44155ebd3ac0e31c0cb2c", "9622adf6e8028aebd57213371c4f2c6c26fc63e5" ], "author": { "name": "Romain Guy", "email": "romainguy@google.com", "time": "Tue Sep 03 23:32:33 2013 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Tue Sep 03 23:32:33 2013 +0000" }, "message": "Merge \"Prevent NPE when cloning gradients Bug #10436856\" into klp-dev" }, { "commit": "9622adf6e8028aebd57213371c4f2c6c26fc63e5", "tree": "9b2cca35eb3b335998bc4c88d5b9c35409b82598", "parents": [ "25ba1c86945a441428194d9ebcabbf31be75a45a" ], "author": { "name": "Romain Guy", "email": "romainguy@google.com", "time": "Tue Sep 03 16:08:00 2013 -0700" }, "committer": { "name": "Romain Guy", "email": "romainguy@google.com", "time": "Tue Sep 03 16:08:00 2013 -0700" }, "message": "Prevent NPE when cloning gradients\nBug #10436856\n\nChange-Id: I98cbce941a06842112b8caa3753a3fa32b227da9\n" }, { "commit": "3e8105e212e65005c0ef0ecc345b47eb0bf129bd", "tree": "10d9cdb1e4f8e4a9a122a912d79c3641ddb50b1d", "parents": [ "59f6b510569a4c70c43c5b9b80fa70d5a28d99f0", "25ba1c86945a441428194d9ebcabbf31be75a45a" ], "author": { "name": "Romain Guy", "email": "romainguy@google.com", "time": "Tue Sep 03 21:41:39 2013 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Tue Sep 03 21:41:39 2013 +0000" }, "message": "Merge \"Update Bitmap.Config.ARGB_4444 documentation Bug #10510122\" into klp-dev" }, { "commit": "25ba1c86945a441428194d9ebcabbf31be75a45a", "tree": "df779e4383b091162e10a6737324d7181ba99ee3", "parents": [ "5d923200846ed59e813373bde789d97d4ccc40b5" ], "author": { "name": "Romain Guy", "email": "romainguy@google.com", "time": "Tue Sep 03 11:50:23 2013 -0700" }, "committer": { "name": "Romain Guy", "email": "romainguy@google.com", "time": "Tue Sep 03 11:50:23 2013 -0700" }, "message": "Update Bitmap.Config.ARGB_4444 documentation\nBug #10510122\n\nARGB_4444 is deprecated and always replaced with ARGB_8888.\n\nChange-Id: I0da96216af701a7df00ad35913066fbfa997d790\n" }, { "commit": "a49e89d2288827e2c96bc006e1e4893d22b41f3b", "tree": "d7883db11fbdea690ee541473ab0b71e638daa8d", "parents": [ "6b115980483ec20cc3f7817c76dfea18c49a48f3" ], "author": { "name": "Jason Sams", "email": "jsams@google.com", "time": "Thu Aug 29 17:00:37 2013 -0700" }, "committer": { "name": "Jason Sams", "email": "jsams@google.com", "time": "Thu Aug 29 17:00:37 2013 -0700" }, "message": "Cleanup API typo\n\nbug 10548782\n\nChange-Id: I3654b7d1f8ea10eb51006804248cc2a7d20eabb0\n" }, { "commit": "6b115980483ec20cc3f7817c76dfea18c49a48f3", "tree": "62222f74ca0b127c46848d76a7a551d47e2e7e95", "parents": [ "a78d9a24d97818a6c9c071483d7854b560ecf228", "42ef238208679813daa204bf110f776ab02c2beb" ], "author": { "name": "Jason Sams", "email": "jsams@google.com", "time": "Thu Aug 29 21:24:28 2013 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Thu Aug 29 21:24:28 2013 +0000" }, "message": "Merge \"Unhide USAGE_IO_INPUT functions\" into klp-dev" } ], "next": "42ef238208679813daa204bf110f776ab02c2beb" }