)]}' { "log": [ { "commit": "b7e0281900db002e9aed8dff0e2fbcd8b22bf91d", "tree": "90bf33482ae9e5ffa42a49e5ba85c05b501e093a", "parents": [ "7cb77c1a0d86b0fbc8774cd90cc81debc3508be1", "406dd5d1e48752177753666867403542e1f400ca" ], "author": { "name": "James Dong", "email": "jdong@google.com", "time": "Mon Dec 12 15:29:46 2011 -0800" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Mon Dec 12 15:29:46 2011 -0800" }, "message": "am 406dd5d1: am aadbd80b: Fixed the false drm recognition.\n\n* commit \u0027406dd5d1e48752177753666867403542e1f400ca\u0027:\n Fixed the false drm recognition.\n" }, { "commit": "2fc93533d2689d510c93931bc02ad602fa0e46f2", "tree": "8f6b21666e66532de1dd0adbae44805b61bb91df", "parents": [ "2ff8cc2438866f791d8fe888573b5fba103e2cd0", "9f62e15f40eafa55bb46bc3cd7b80d03e606b5fb" ], "author": { "name": "Andreas Huber", "email": "andih@google.com", "time": "Mon Dec 12 08:32:28 2011 -0800" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Mon Dec 12 08:32:28 2011 -0800" }, "message": "Merge \"Support for parsing of \"folded\" RTSP header values and some tweaks to the AMR assembler\"" }, { "commit": "130f62ab014ad95e6dc03ff219a581c8b93c82e4", "tree": "d75ba9ab43fb6ae324f7a27c6b9917e9357618b3", "parents": [ "95ea6d6d5d56a7e9e533abe2837ed2379c4271e1" ], "author": { "name": "Owen Lin", "email": "owenlin@google.com", "time": "Mon Dec 12 16:17:34 2011 +0800" }, "committer": { "name": "Owen Lin", "email": "owenlin@google.com", "time": "Mon Dec 12 16:17:34 2011 +0800" }, "message": "Fix the build. (Change LOGV to ALOGV)\n\nChange-Id: I14104540cfbd2bcdd7af1534db20554b88c4c0ce\n" }, { "commit": "1f7817e1461f4af304d60cc3849d532288e4d2de", "tree": "26a8e93eb7f0d714c4c81a854491244c9d620b86", "parents": [ "61a8b5301b9cf3abef9f1b9fa5af55912cb9d9c7", "ebfce84f7fd3e25fa08c36b155db91df90a59b3d" ], "author": { "name": "Andreas Huber", "email": "andih@google.com", "time": "Fri Dec 09 18:09:21 2011 -0800" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Fri Dec 09 18:09:21 2011 -0800" }, "message": "am ebfce84f: am 68f592a8: Merge \"Don\\\u0027t perform RTSP seeks right away but queue them for 200ms\" into ics-mr1\n\n* commit \u0027ebfce84f7fd3e25fa08c36b155db91df90a59b3d\u0027:\n Don\u0027t perform RTSP seeks right away but queue them for 200ms\n" }, { "commit": "61a8b5301b9cf3abef9f1b9fa5af55912cb9d9c7", "tree": "6bc79b64860b23538297e36f12ab15977375f70a", "parents": [ "47730f1582dfa67909293d6d5b88ff89c5ad6ed5", "aa82c39bdb4ad9c1fdcb09f3bea11be5197d3ce6" ], "author": { "name": "Andreas Huber", "email": "andih@google.com", "time": "Fri Dec 09 18:09:19 2011 -0800" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Fri Dec 09 18:09:19 2011 -0800" }, "message": "am aa82c39b: am 0ba9380a: Merge \"Fix Bitreader \"putBits\" implementation, make sure we emulate timestamps\" into ics-mr1\n\n* commit \u0027aa82c39bdb4ad9c1fdcb09f3bea11be5197d3ce6\u0027:\n Fix Bitreader \"putBits\" implementation, make sure we emulate timestamps\n" }, { "commit": "9f62e15f40eafa55bb46bc3cd7b80d03e606b5fb", "tree": "e5e24884d6b3d908dd06aa9c6293236b395f22bd", "parents": [ "1108e8ddad3ddf0dbc660229ca3be6de7f600c3a" ], "author": { "name": "Andreas Huber", "email": "andih@google.com", "time": "Fri Dec 09 15:09:56 2011 -0800" }, "committer": { "name": "Andreas Huber", "email": "andih@google.com", "time": "Fri Dec 09 15:09:56 2011 -0800" }, "message": "Support for parsing of \"folded\" RTSP header values and some tweaks to the AMR assembler\n\ncontributed by Samsung (untested).\n\nChange-Id: I182561fe0a1a564126bdbb317e96aa52bf525726\n" }, { "commit": "aac2f9c66ccb181544f822a1af7397a8e25455e7", "tree": "36f4aa1ad6d152ee8c1ee73ee3995db65cbe6646", "parents": [ "bdc18b28eb04b8c8cc00313096f8bfb142e407e3", "a5038d169f47b2e2278c0056495dfd4808803f8a" ], "author": { "name": "Jeff Tinker", "email": "jtinker@google.com", "time": "Fri Dec 09 14:25:49 2011 -0800" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Fri Dec 09 14:25:49 2011 -0800" }, "message": "am a5038d16: am a693a4b5: Merge \"Fix ANRs due to Widevine DRM plugin sniff taking too long.\" into ics-mr1\n\n* commit \u0027a5038d169f47b2e2278c0056495dfd4808803f8a\u0027:\n Fix ANRs due to Widevine DRM plugin sniff taking too long.\n" }, { "commit": "aadbd80b307c817698ce5110ff8e002804d1b230", "tree": "be5cab6d739c403a2a1a5a0b5a38c5bf2f330fd3", "parents": [ "be5f49fb6e17e0b9588d3b94022b7e3eb6d47317" ], "author": { "name": "James Dong", "email": "jdong@google.com", "time": "Thu Dec 08 19:31:59 2011 -0800" }, "committer": { "name": "James Dong", "email": "jdong@google.com", "time": "Thu Dec 08 21:01:31 2011 -0800" }, "message": "Fixed the false drm recognition.\n\nChange-Id: If0198e52ff7bbd7422f219f55a37aae97f7d74f1\n\nrelated-to-bug: 5732033\n" }, { "commit": "68f592a8210af27df4339089bbee47fb602cae6a", "tree": "2fca3bf426f6b8b70cc4373067a610800fefd9c8", "parents": [ "0ba9380a337d5e2eae9fd9e4eb8039403ed3815b", "21902a8a489140902ff868f5957a16cacd11a7a3" ], "author": { "name": "Andreas Huber", "email": "andih@google.com", "time": "Thu Dec 08 13:33:16 2011 -0800" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Thu Dec 08 13:33:16 2011 -0800" }, "message": "Merge \"Don\u0027t perform RTSP seeks right away but queue them for 200ms\" into ics-mr1" }, { "commit": "21902a8a489140902ff868f5957a16cacd11a7a3", "tree": "dbcf162d407b15873c002d3402be0dfb71cf86d3", "parents": [ "a693a4b5553584a01b8b6b3640dc0393d2d88f28" ], "author": { "name": "Andreas Huber", "email": "andih@google.com", "time": "Thu Dec 08 13:04:50 2011 -0800" }, "committer": { "name": "Andreas Huber", "email": "andih@google.com", "time": "Thu Dec 08 13:04:50 2011 -0800" }, "message": "Don\u0027t perform RTSP seeks right away but queue them for 200ms\n\nand only execute the last one.\n\nChange-Id: I9ab342396ec9c9c03624a4b0306d1e180ceca000\nrelated-to-bug: 5732960\n" }, { "commit": "f6ae711450581d248e646b8d8d6b0bf75c4d19ea", "tree": "7e84bdb1401096a6554698e6660c500d4eb8f10c", "parents": [ "a693a4b5553584a01b8b6b3640dc0393d2d88f28" ], "author": { "name": "Andreas Huber", "email": "andih@google.com", "time": "Thu Dec 08 12:27:47 2011 -0800" }, "committer": { "name": "Andreas Huber", "email": "andih@google.com", "time": "Thu Dec 08 12:27:47 2011 -0800" }, "message": "Fix Bitreader \"putBits\" implementation, make sure we emulate timestamps\n\nif we don\u0027t receive npt time mapping from the rtsp server (i.e. live stream)\n\nChange-Id: I5147d665bd90c9a303ad6ffdafbf770f930f917c\nrelated-to-bug: 5660357\n" }, { "commit": "a693a4b5553584a01b8b6b3640dc0393d2d88f28", "tree": "62267263a423392d6592626c748397585a971686", "parents": [ "8e0ecbfc97606ea30d0d8216fea635888f766b9d", "d0d19db1ca1c289b069db33f4665bcb9386064e9" ], "author": { "name": "Jeff Tinker", "email": "jtinker@google.com", "time": "Thu Dec 08 00:13:43 2011 -0800" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Thu Dec 08 00:13:43 2011 -0800" }, "message": "Merge \"Fix ANRs due to Widevine DRM plugin sniff taking too long.\" into ics-mr1" }, { "commit": "1321bc1fa3e6dcafcf3185b4efe2f9721ecdfef1", "tree": "3754791182b2fb44d087b90412a0f1641d27caba", "parents": [ "9650b018e3b1ed42de9b48f3c0eaf4e04733f065", "ca402cdcacfdcd2978a22d59f446c93aad34c75e" ], "author": { "name": "James Dong", "email": "jdong@google.com", "time": "Wed Dec 07 23:05:03 2011 -0800" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Wed Dec 07 23:05:03 2011 -0800" }, "message": "Merge \"Update onVideoSizeChanged() callback method Java doc to explicitly specify the conditions under which the width/height passed to the callback could be 0.\"" }, { "commit": "d0d19db1ca1c289b069db33f4665bcb9386064e9", "tree": "5a616b32226523983b62a41e9a5ba9092599a6a9", "parents": [ "5a7c91769f011bc150c9def9edab9cccb4761c66" ], "author": { "name": "Jeff Tinker", "email": "jtinker@google.com", "time": "Wed Dec 07 20:23:20 2011 -0800" }, "committer": { "name": "Jeff Tinker", "email": "jtinker@google.com", "time": "Wed Dec 07 20:23:20 2011 -0800" }, "message": "Fix ANRs due to Widevine DRM plugin sniff taking too long.\n\nAdd a Widevine-specific format sniffer to avoid having to\nrefetch data from the remote server.\n\nChange-Id: I5fdb21fe7a0d6e74f2a6f06e6fbf8070b068ac60\nrelated-to-bug: 5725548\n" }, { "commit": "71087709aad07cc6492f64444acf9acc48495003", "tree": "d44c4646d60ccd83e836ece23a858b72851b0e76", "parents": [ "0a2909840fae6d16efc5f7afb313b03fd401cbd9", "c81e0ad9bd438575389623f523a28e2e6ca69236" ], "author": { "name": "Eric Laurent", "email": "elaurent@google.com", "time": "Wed Dec 07 16:45:07 2011 -0800" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Wed Dec 07 16:45:07 2011 -0800" }, "message": "Merge \"Fix audio effect tests\"" }, { "commit": "7554c57c173352c0b3e9026b54fdda9fad101f8b", "tree": "c255bfdb0439a1cd049170e4e44f246e19e1336e", "parents": [ "131746ba380c4c55b075e7aac00a395821526ccd", "6727a43f6d8ff193b86ca90b2daa761c47157638" ], "author": { "name": "Dave Burke", "email": "daveburke@google.com", "time": "Wed Dec 07 14:11:14 2011 -0800" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Wed Dec 07 14:11:14 2011 -0800" }, "message": "am 6727a43f: am 54a53841: Merge \"Fetch at least 192KB to avoid our mp3 sniffer from blocking on data.\" into ics-mr1\n\n* commit \u00276727a43f6d8ff193b86ca90b2daa761c47157638\u0027:\n Fetch at least 192KB to avoid our mp3 sniffer from blocking on data.\n" }, { "commit": "7dea9aaff5ce855df1ac2ede4eb9520f506603a8", "tree": "23efb624e472d9d1819b7f249c783704ac21077e", "parents": [ "791a31832ab586f056c2bcab8e0515d4bb1e2f7a" ], "author": { "name": "Andreas Huber", "email": "andih@google.com", "time": "Wed Dec 07 12:50:47 2011 -0800" }, "committer": { "name": "Andreas Huber", "email": "andih@google.com", "time": "Wed Dec 07 12:50:47 2011 -0800" }, "message": "Fetch at least 192KB to avoid our mp3 sniffer from blocking on data.\n\nChange-Id: Icb10c129249bb9b69e91f6633a385840c94efa59\nrelated-to-bug: 5666532\n" }, { "commit": "b808af7daf74d27d3c745cd6d62007f344d37e53", "tree": "ee48f017fca2899cca7e5a8711fad8386e12f624", "parents": [ "bb60ee97664667c7774aa3c45b473332a3757d21", "6b67215235d6c419f22fb1cfc6768d35147c9607" ], "author": { "name": "Narayan Kamath", "email": "narayan@google.com", "time": "Wed Dec 07 04:15:43 2011 -0800" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Wed Dec 07 04:15:43 2011 -0800" }, "message": "Merge \"Allow data uris to be data sources\"" }, { "commit": "ca402cdcacfdcd2978a22d59f446c93aad34c75e", "tree": "36c7217db45eb2e7fda1fea5fe33d7e1228ae6d0", "parents": [ "738a154a1b27ff908616c336d4adf400a141eebf" ], "author": { "name": "James Dong", "email": "jdong@google.com", "time": "Tue Dec 06 17:55:38 2011 -0800" }, "committer": { "name": "James Dong", "email": "jdong@google.com", "time": "Tue Dec 06 17:58:22 2011 -0800" }, "message": "Update onVideoSizeChanged() callback method Java doc to explicitly specify the conditions under which the width/height passed\nto the callback could be 0.\n\nChange-Id: Ie921f0af8284eccfd02c4a5826ed41fe19f9676f\nrelated-to-bug: 5613451\n" }, { "commit": "2fe9130f227b31e3d24987f442c3374f2299d9f5", "tree": "127399ffe03b7d961b45dcb5ade2cb22df2d08f4", "parents": [ "9c316f3c6ac785fd27be97a119dfe8f1303a8ed4", "2be608f88cd469b40a472551f22a9d40903beede" ], "author": { "name": "Hong Teng", "email": "hongteng@google.com", "time": "Tue Dec 06 16:59:45 2011 -0800" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Tue Dec 06 16:59:45 2011 -0800" }, "message": "am 2be608f8: am 6db79c35: Merge \"Fix for issue 5712743 video editor functional test : testPreviewDuringExport fails -Correct the invalid filename, which contains control character. And with the invalid filename, the cts fails only on crespo, but passes on stingray an\n\n* commit \u00272be608f88cd469b40a472551f22a9d40903beede\u0027:\n Fix for issue 5712743 video editor functional test : testPreviewDuringExport fails -Correct the invalid filename, which contains control character. And with the invalid filename, the cts fails only on crespo, but passes on stingray and prime.\n" }, { "commit": "9c316f3c6ac785fd27be97a119dfe8f1303a8ed4", "tree": "ca073d5c34840f6fac41900d3bced91c38cd2379", "parents": [ "e49e8cc4e799a2a6793c148b6a4b74d8f69026dd", "d49ec62cfb0469c39f2b5d79cbf2a6f69cceb7d7" ], "author": { "name": "Amith Yamasani", "email": "yamasani@google.com", "time": "Tue Dec 06 16:59:44 2011 -0800" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Tue Dec 06 16:59:44 2011 -0800" }, "message": "am d49ec62c: am f3364080: Merge \"New and improved silent mode on lockscreen.\" into ics-mr1\n\n* commit \u0027d49ec62cfb0469c39f2b5d79cbf2a6f69cceb7d7\u0027:\n New and improved silent mode on lockscreen.\n" }, { "commit": "6db79c35c0cb4e26c6aff4a913777fd21069fd3c", "tree": "d378ffeb4bf00794e95dea10584f3f93507f49d1", "parents": [ "f336408000c4be36045401fb4df89528249e7383", "96bea6a5e9a362c21fbdb98f0e67212de7dffdc6" ], "author": { "name": "Hong Teng", "email": "hongteng@google.com", "time": "Tue Dec 06 15:37:25 2011 -0800" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Tue Dec 06 15:37:25 2011 -0800" }, "message": "Merge \"Fix for issue 5712743 video editor functional test : testPreviewDuringExport fails -Correct the invalid filename, which contains control character. And with the invalid filename, the cts fails only on crespo, but passes on stingray and prime.\" into ics-mr1" }, { "commit": "f336408000c4be36045401fb4df89528249e7383", "tree": "a7a4d540cd262e9a3f13e65681739f70d7730912", "parents": [ "720efc43d89ce9fd50b66f22cdb1bb4363cfb291", "6243edd818b84adfbe712d5d233d6414b33653ac" ], "author": { "name": "Amith Yamasani", "email": "yamasani@google.com", "time": "Tue Dec 06 15:36:10 2011 -0800" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Tue Dec 06 15:36:10 2011 -0800" }, "message": "Merge \"New and improved silent mode on lockscreen.\" into ics-mr1" }, { "commit": "6243edd818b84adfbe712d5d233d6414b33653ac", "tree": "8f6ee51bc79caa36157a05bed45dc7c22805a9bf", "parents": [ "40cb30c2df2176c03f24cbdc194e3af5a4f64758" ], "author": { "name": "Amith Yamasani", "email": "yamasani@google.com", "time": "Mon Dec 05 19:58:48 2011 -0800" }, "committer": { "name": "Amith Yamasani", "email": "yamasani@google.com", "time": "Tue Dec 06 14:48:38 2011 -0800" }, "message": "New and improved silent mode on lockscreen.\n\n3-state item to toggle between Silent/Vibrate/Ringer in long-press power menu.\nNo volume dialog on lockscreen, unless Power menu is up.\n\nSet VIBRATE_IN_SILENT\u003d1 when upgrading device.\n\nChange-Id: I097d216f96c4abdbd83420e0c477106951b3607d\n" }, { "commit": "6b8b5a0a4183c0f8d1d5ceacc9e50194589a77d3", "tree": "31346f222158d07924e8910b8b4546ea15e576ac", "parents": [ "05d630691127c022befd071b2bede87c707112a9", "cb064917cf070aaac48a3a04e0179638801e6565" ], "author": { "name": "James Dong", "email": "jdong@google.com", "time": "Tue Dec 06 12:52:52 2011 -0800" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Tue Dec 06 12:52:52 2011 -0800" }, "message": "Merge \"DO NOT MERGE - Consider I-Frame at zeroeth position when searching for sync frames\" into ics-mr1" }, { "commit": "96bea6a5e9a362c21fbdb98f0e67212de7dffdc6", "tree": "53cb79e1f43d63f3ad118112fea23e81a18a5f39", "parents": [ "613ed4c69a53e6ffb1f104c7d45a0c6dd41c8eb0" ], "author": { "name": "Hong Teng", "email": "hongteng@google.com", "time": "Tue Dec 06 11:51:47 2011 -0800" }, "committer": { "name": "Hong Teng", "email": "hongteng@google.com", "time": "Tue Dec 06 11:51:47 2011 -0800" }, "message": "Fix for issue 5712743 video editor functional test : testPreviewDuringExport fails\n-Correct the invalid filename, which contains control character.\n And with the invalid filename, the cts fails only on crespo, but passes on stingray and prime.\n\nChange-Id: I77862e55e8ee990f72f617a804f26fd724914b5b\n" }, { "commit": "92f604c4d465572efccfd7b1572080f48dc972c1", "tree": "acc74404b9b98a01f2668802b3bc9e567ab3ae68", "parents": [ "4079702ac27b51282a25de5f7c20f6fba6b71995" ], "author": { "name": "Andreas Huber", "email": "andih@google.com", "time": "Tue Dec 06 10:01:27 2011 -0800" }, "committer": { "name": "Andreas Huber", "email": "andih@google.com", "time": "Tue Dec 06 11:24:34 2011 -0800" }, "message": "DO NOT MERGE: Remove the AVI extractor.\n\nChange-Id: Ifce6c0d3d87aad2f5cc7f40ad6304936cbfa795e\n" }, { "commit": "6b67215235d6c419f22fb1cfc6768d35147c9607", "tree": "41fd0b6c17e48c1118bd42924ddbecd4d53cf0a3", "parents": [ "4a3d5b04daa74dc3bd5084b3395892b5565e6288" ], "author": { "name": "Narayan Kamath", "email": "narayan@google.com", "time": "Wed Nov 16 15:57:29 2011 +0000" }, "committer": { "name": "Narayan Kamath", "email": "narayan@google.com", "time": "Tue Dec 06 17:31:39 2011 +0000" }, "message": "Allow data uris to be data sources\n\nbug:5571010\nChange-Id: I0b6ae6c729ac34d46e9990fcceb08294eb4f7c58\n" }, { "commit": "cb064917cf070aaac48a3a04e0179638801e6565", "tree": "994ebd9aa8991ce94f23f5c537abccee6b290358", "parents": [ "f2e1249846a17c69d728189a8dc67f37261f0a59" ], "author": { "name": "James Dong", "email": "jdong@google.com", "time": "Mon Dec 05 12:41:06 2011 -0800" }, "committer": { "name": "James Dong", "email": "jdong@google.com", "time": "Mon Dec 05 14:29:18 2011 -0800" }, "message": "DO NOT MERGE - Consider I-Frame at zeroeth position when searching for sync frames\n\nThe current logic does not check the I-frame at zeroeth position and therefore\nfor the files with only 1 I-Frame at zeroeth postion does not play.\n\nOriginally authored by Braganza Sam Robertsh \u003csam.braganza@samsung.com\u003e\n\nDo not merge to master branch since we made some improvement to SampleTable.cpp in the master branch.\n\nChange-Id: I068184dec71986f14a586f769c2af1f52b4bcf94\nrelated-to-bug: 5711942\n" }, { "commit": "68d2f95328f262e88bccc02621c3ae5c56128aee", "tree": "7e0bfb82a4d981e4211d8d8104703b6cc11d127c", "parents": [ "7da48db9c5c071cfc1c54a3709a02c1300dccd76", "07bacabe747e06e0855a1389cebe20cd60867944" ], "author": { "name": "Andreas Huber", "email": "andih@google.com", "time": "Mon Dec 05 13:30:52 2011 -0800" }, "committer": { "name": "Andreas Huber", "email": "andih@google.com", "time": "Mon Dec 05 13:31:17 2011 -0800" }, "message": "resolved conflicts for merge of 07bacabe to master\n\nChange-Id: Idb56996f7c1b78d96e3d3d3f08419c4d122db0b1\n" }, { "commit": "b8e651a6757c8e55fc3d9e5e86a13ead7326e91d", "tree": "8e6d0b2c9b8d07d5bbdaac9b85399544e847bc83", "parents": [ "f57c1388860486a70cc773f2cfeaa3ea3b38a473" ], "author": { "name": "Andreas Huber", "email": "andih@google.com", "time": "Mon Dec 05 11:34:43 2011 -0800" }, "committer": { "name": "Andreas Huber", "email": "andih@google.com", "time": "Mon Dec 05 11:34:43 2011 -0800" }, "message": "Properly identify how much metadata we need to cache in order to instantiate\n\nthe extractor without blocking (and therefore be able to abort).\n\nChange-Id: Id2acdde897e02baaeabadae70b7c95b66c9041b3\nrelated-to-bug: 5666532\n" }, { "commit": "89972657bd7fdd9def17fe75e2529865b2369722", "tree": "9583e67ad035bbf897c6680093aaf2fb4eed04fe", "parents": [ "97c7bbbba7a05aa479a60d17b60aaa7badb90c14", "f8dad0b37d9aa2476ef3ab84b9f4a7a9f4c960e4" ], "author": { "name": "Amith Yamasani", "email": "yamasani@google.com", "time": "Fri Dec 02 17:49:31 2011 -0800" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Fri Dec 02 17:49:31 2011 -0800" }, "message": "am f8dad0b3: am afd01086: Merge \"Further volume improvements.\" into ics-mr1\n\n* commit \u0027f8dad0b37d9aa2476ef3ab84b9f4a7a9f4c960e4\u0027:\n Further volume improvements.\n" }, { "commit": "29f1c32eea12ab33547af73fb0e5dcf432e6979c", "tree": "d06e74143c2cd64ab0c1425b4b646e52cd6f13d0", "parents": [ "7ea817e58d283434c624e1b2b6dcdba2e409133b", "5126f1d413b4fcb0aff5b364e1e5a41c89ca665c" ], "author": { "name": "Hong Teng", "email": "hongteng@google.com", "time": "Fri Dec 02 13:44:10 2011 -0800" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Fri Dec 02 13:44:10 2011 -0800" }, "message": "am 5126f1d4: am 613ed4c6: Merge \"Fixd for 5490443 Native crash while exporting a video - Add new onError callback to PreviewProgressListener, which is used to indicate video editor application for the error that has occurred during priviewing. With this modification, \n\n* commit \u00275126f1d413b4fcb0aff5b364e1e5a41c89ca665c\u0027:\n Fixd for 5490443 Native crash while exporting a video - Add new onError callback to PreviewProgressListener, which is used to indicate video editor application for the error that has occurred during priviewing. With this modification, the application must implement the onError method, and then VideoEditorPreviewTest.java is changed accordingly.\n" }, { "commit": "7944c1b19f04583c595732695d63f333cd051eb4", "tree": "68fecc447a58a5af1cd92ac7031fdf3e07cccc45", "parents": [ "7a1ad63d16ac42482b3e043ef7a8474452aa057c" ], "author": { "name": "Mike Lockwood", "email": "lockwood@google.com", "time": "Thu Dec 01 16:58:41 2011 -0500" }, "committer": { "name": "Mike Lockwood", "email": "lockwood@google.com", "time": "Fri Dec 02 15:12:47 2011 -0500" }, "message": "MTP: Add support for restricting PTP to only certain subdirectories of the storage DO NOT MERGE\n\nBug: 5527220\n\nChange-Id: I81d6de590ea3002118ba46eb4b6d5fe9061c998c\nSigned-off-by: Mike Lockwood \u003clockwood@google.com\u003e\n" }, { "commit": "7a1ad63d16ac42482b3e043ef7a8474452aa057c", "tree": "4958f73cdfed3bb170378f53fa2de21e19b5c7d8", "parents": [ "55347e65e229ed63f7e18cb5b82639174c0f54bb" ], "author": { "name": "Mike Lockwood", "email": "lockwood@google.com", "time": "Thu Dec 01 18:36:06 2011 -0500" }, "committer": { "name": "Mike Lockwood", "email": "lockwood@google.com", "time": "Fri Dec 02 15:12:30 2011 -0500" }, "message": "MTP: Don\u0027t attempt to read more than 16K at a time from the MTP driver DO NOT MERGE\n\nThis could happen sometimes if other operations increased the size of the\ndata packet buffer to \u003e 16K\n\nChange-Id: I10f85f0ce32df39f46b0a984361958c0a13f6800\nSigned-off-by: Mike Lockwood \u003clockwood@google.com\u003e\n" }, { "commit": "afd01086795c7c1f6950a709180b2361625b8b6a", "tree": "e60d1c42d3e8d76e70776585167dbc8605ff9a74", "parents": [ "f96aa3b197b96f9cb276485420c09a7b36606599", "2ef6f1bb5603c2e221191117695725237f49a5d5" ], "author": { "name": "Amith Yamasani", "email": "yamasani@google.com", "time": "Fri Dec 02 11:22:32 2011 -0800" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Fri Dec 02 11:22:32 2011 -0800" }, "message": "Merge \"Further volume improvements.\" into ics-mr1" }, { "commit": "d62da2d0da976ea5590471c3b70ebf013e41ce8b", "tree": "5459ef0d691a45b6691f65ac11763a2bcb88cf8c", "parents": [ "6a5c1a9574e857a80c8e4ca13f3b5f0439d331c9" ], "author": { "name": "Jean-Michel Trivi", "email": "jmtrivi@google.com", "time": "Fri Dec 02 09:54:16 2011 -0800" }, "committer": { "name": "Jean-Michel Trivi", "email": "jmtrivi@google.com", "time": "Fri Dec 02 09:54:16 2011 -0800" }, "message": "Remove unused variable and imports in AudioManager\n\nRemove unused imports.\nRemove private mHandler variable: it was assigned a new Handler\n object but was never accessed.\n\nChange-Id: I63cd08aa38701ea157fef7d3185a58a6e2a95822\n" }, { "commit": "613ed4c69a53e6ffb1f104c7d45a0c6dd41c8eb0", "tree": "a81e8f435c3db8d7b1f4705f7c7154c333d681fb", "parents": [ "e21dabf654e3d90e50e95174d5e9670bc930c194", "63149c81adf79f43c6508647614247277f8052e2" ], "author": { "name": "Hong Teng", "email": "hongteng@google.com", "time": "Fri Dec 02 09:32:02 2011 -0800" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Fri Dec 02 09:32:02 2011 -0800" }, "message": "Merge \"Fixd for 5490443 Native crash while exporting a video - Add new onError callback to PreviewProgressListener, which is used to indicate video editor application for the error that has occurred during priviewing. With this modification, the application must implement the onError method, and then VideoEditorPreviewTest.java is changed accordingly.\" into ics-mr1" }, { "commit": "6a5c1a9574e857a80c8e4ca13f3b5f0439d331c9", "tree": "2fe42989e2f0534bcb5ecea476ed64ab17d5d3b4", "parents": [ "09bd918c5d710cf500a3f16bc4021348c1677507", "73e56d935e7c9b8a06e4781c4995e407e118f93d" ], "author": { "name": "Mike Lockwood", "email": "lockwood@google.com", "time": "Fri Dec 02 08:17:33 2011 -0800" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Fri Dec 02 08:17:33 2011 -0800" }, "message": "Merge \"MTP: Add support for restricting PTP to only certain subdirectories of the storage\"" }, { "commit": "09bd918c5d710cf500a3f16bc4021348c1677507", "tree": "a0f9d991cf7be7f5b6534a96836ee33a22898b21", "parents": [ "e3c7329084d665d2b78ffc34474931ddc4af9429", "1958dc27c952da3a590750023e391e0d481a4328" ], "author": { "name": "Mike Lockwood", "email": "lockwood@google.com", "time": "Fri Dec 02 08:10:03 2011 -0800" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Fri Dec 02 08:10:03 2011 -0800" }, "message": "Merge \"MTP: Don\u0027t attempt to read more than 16K at a time from the MTP driver\"" }, { "commit": "73e56d935e7c9b8a06e4781c4995e407e118f93d", "tree": "f35e4e26f2be4e533528ffc41ebd101ee1fc2abd", "parents": [ "1958dc27c952da3a590750023e391e0d481a4328" ], "author": { "name": "Mike Lockwood", "email": "lockwood@google.com", "time": "Thu Dec 01 16:58:41 2011 -0500" }, "committer": { "name": "Mike Lockwood", "email": "lockwood@google.com", "time": "Fri Dec 02 11:08:39 2011 -0500" }, "message": "MTP: Add support for restricting PTP to only certain subdirectories of the storage\n\nBug: 5527220\n\nChange-Id: If68e7481617ecb62abd24e2d89e6b7dfdf95ba2b\nSigned-off-by: Mike Lockwood \u003clockwood@google.com\u003e\n" }, { "commit": "ee07e110d92005f9dbd317a23721d9b7c9a5ed37", "tree": "f261621b9f9477c00ddc8a525704e91cbaa9e104", "parents": [ "db918cf171afd3d4b3c22aab6dd3403d1dec94de", "6cfa9e6c507a721f647518569c89db9560056079" ], "author": { "name": "Eric Laurent", "email": "elaurent@google.com", "time": "Thu Dec 01 20:38:15 2011 -0800" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Thu Dec 01 20:38:15 2011 -0800" }, "message": "am 6cfa9e6c: am 0d3a2e93: Merge \"AudioService: strengthen A2DP device detection\" into ics-mr1\n\n* commit \u00276cfa9e6c507a721f647518569c89db9560056079\u0027:\n AudioService: strengthen A2DP device detection\n" }, { "commit": "0d3a2e93394efa4729e5c29ff4515f9f2644b8c3", "tree": "b7025b5a939a5bdacd751e3b29c8b2d7349455db", "parents": [ "bfb3dec22dd397b57c8bbc1d6d18ed98cd413b10", "6bc7f2cd30b6bd90806942b0722e22daa2108493" ], "author": { "name": "Eric Laurent", "email": "elaurent@google.com", "time": "Thu Dec 01 20:34:08 2011 -0800" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Thu Dec 01 20:34:08 2011 -0800" }, "message": "Merge \"AudioService: strengthen A2DP device detection\" into ics-mr1" }, { "commit": "1958dc27c952da3a590750023e391e0d481a4328", "tree": "44f69cae3253dee6da256a8da37175cee0d63e53", "parents": [ "d01d261183a4b832c2575ae0d82f68125605b21e" ], "author": { "name": "Mike Lockwood", "email": "lockwood@google.com", "time": "Thu Dec 01 18:36:06 2011 -0500" }, "committer": { "name": "Mike Lockwood", "email": "lockwood@google.com", "time": "Thu Dec 01 18:37:29 2011 -0500" }, "message": "MTP: Don\u0027t attempt to read more than 16K at a time from the MTP driver\n\nThis could happen sometimes if other operations increased the size of the\ndata packet buffer to \u003e 16K\n\nChange-Id: I4d316c7e2e558d3dd861d39accae6514fd9a62f5\nSigned-off-by: Mike Lockwood \u003clockwood@google.com\u003e\n" }, { "commit": "2ef6f1bb5603c2e221191117695725237f49a5d5", "tree": "3bcbff95c91f81308cd8520563b28179df796e59", "parents": [ "0433c157141b9122f6c61498e909770f1db27c7c" ], "author": { "name": "Amith Yamasani", "email": "yamasani@google.com", "time": "Thu Dec 01 14:01:30 2011 -0800" }, "committer": { "name": "Amith Yamasani", "email": "yamasani@google.com", "time": "Thu Dec 01 15:05:54 2011 -0800" }, "message": "Further volume improvements.\n\n- Remove silent mode from Power menu\n- Show volume dialog on lockscreen\n- Allow beeps when adjusting volume in lockscreen\n\nBug: 5586083\nChange-Id: I93052a8ec5004c784f20e04488af9382d495e711\n" }, { "commit": "d01d261183a4b832c2575ae0d82f68125605b21e", "tree": "0dceeaedcf550341c556dbf2a6b015dba824d39a", "parents": [ "8077b4feba20505e329ba907feb5e8a456d7d150", "a54a06b3f0533f7287456ab35c4d88049156d91e" ], "author": { "name": "Glenn Kasten", "email": "gkasten@google.com", "time": "Thu Dec 01 13:55:41 2011 -0800" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Thu Dec 01 13:55:41 2011 -0800" }, "message": "Merge \"Add README for media \"automated\" tests\"" }, { "commit": "a54a06b3f0533f7287456ab35c4d88049156d91e", "tree": "42e2280d27b01ab8e13fe9902ed9b54d6c1e156d", "parents": [ "d2a28b3ee07e27cc374d07b02995fb865474aae7" ], "author": { "name": "Glenn Kasten", "email": "gkasten@google.com", "time": "Thu Dec 01 13:35:32 2011 -0800" }, "committer": { "name": "Glenn Kasten", "email": "gkasten@google.com", "time": "Thu Dec 01 13:35:32 2011 -0800" }, "message": "Add README for media \"automated\" tests\n\nChange-Id: I92e611fb6df2d870ded9e246963277ecc35b0d15\n" }, { "commit": "f8ebb32d1fa8fc521f47d83ffa77e20ded066c45", "tree": "50b87e59a11c1df4a59fec70a749ffcb27cd019a", "parents": [ "89b262990fc82b1b928519744b1640ead406f110", "10526a0bfe070ac4d1e550a81ed68be35d261b16" ], "author": { "name": "Andreas Huber", "email": "andih@google.com", "time": "Thu Dec 01 10:22:19 2011 -0800" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Thu Dec 01 10:22:19 2011 -0800" }, "message": "am 10526a0b: am 2c2ed7be: Merge \"Fixes a typo in AVIExtractor that would advertise the wrong video dimensions\" into ics-mr1\n\n* commit \u002710526a0bfe070ac4d1e550a81ed68be35d261b16\u0027:\n Fixes a typo in AVIExtractor that would advertise the wrong video dimensions\n" }, { "commit": "1fc2e60d59abfe1c4d7f9611c685c894ad1a383f", "tree": "defea6ddc1b9ede4f1c2de36b119cd04ab25cd8c", "parents": [ "90ea4c4d30ccafb51e024ab3c34a4655d06eec4c" ], "author": { "name": "Andreas Huber", "email": "andih@google.com", "time": "Thu Dec 01 10:02:37 2011 -0800" }, "committer": { "name": "Andreas Huber", "email": "andih@google.com", "time": "Thu Dec 01 10:02:37 2011 -0800" }, "message": "Fixes a typo in AVIExtractor that would advertise the wrong video dimensions\n\nChange-Id: I587a5ce259b04c973ed2d7614e874cb74c521aab\nrelated-to-bug: 5696324\n" }, { "commit": "63149c81adf79f43c6508647614247277f8052e2", "tree": "88903ac924756e62b577ede1aa72e01c70a9cb0f", "parents": [ "a6f8ebc616cfe3185ae2513ef2f846e8d32b551e" ], "author": { "name": "Hong Teng", "email": "hongteng@google.com", "time": "Wed Nov 30 16:54:46 2011 -0800" }, "committer": { "name": "Hong Teng", "email": "hongteng@google.com", "time": "Thu Dec 01 09:43:42 2011 -0800" }, "message": "Fixd for 5490443 Native crash while exporting a video\n- Add new onError callback to PreviewProgressListener, which is\nused to indicate video editor application for the error that has occurred during\npriviewing.\nWith this modification, the application must implement the onError method,\nand then VideoEditorPreviewTest.java is changed accordingly.\n\nChange-Id: I15610b8907fcf8bd35a3c69ad7c07b5175a6e309\n" }, { "commit": "6bc7f2cd30b6bd90806942b0722e22daa2108493", "tree": "59332a3c88ae9deaef386b238397035aeb93fd99", "parents": [ "e35581ad5ad635f9dcfe4ab6a432c48b46b782cd" ], "author": { "name": "Eric Laurent", "email": "elaurent@google.com", "time": "Tue Nov 29 18:49:40 2011 -0800" }, "committer": { "name": "Eric Laurent", "email": "elaurent@google.com", "time": "Wed Nov 30 17:08:44 2011 -0800" }, "message": "AudioService: strengthen A2DP device detection\n\nIf the intent BluetoothA2dp.ACTION_CONNECTION_STATE_CHANGED is broadcast\nbefore AudioService is started, The A2DP device connection is never detected\nby the audio framework resulting in audio not being routed to A2DP unless the device\nis rebooted or the A2DP headset reconnected.\n\nMake sure that A2DP device connection state is sampled when\nboot completed event is received.\n\nIssue 5665159\n\nChange-Id: I04d82020afc00af28c5ea0bb9879ed55bcc9b6f3\n" }, { "commit": "df96385b9acf9ec74c62edc34ffa9c8d9dae1c03", "tree": "156e5102fa53ad3debbe864bc1780925d693fa71", "parents": [ "267a4b0627f98b020725e860b0a3c128067131b1", "c040e1e77923d81050f2d3dbdac5d07e01be72f6" ], "author": { "name": "Jamie Gennis", "email": "jgennis@google.com", "time": "Wed Nov 30 10:50:49 2011 -0800" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Wed Nov 30 10:50:49 2011 -0800" }, "message": "am c040e1e7: am 6f1dd757: Merge \"SurfaceMediaSource: use the vid enc usage bit\" into ics-mr1\n\n* commit \u0027c040e1e77923d81050f2d3dbdac5d07e01be72f6\u0027:\n SurfaceMediaSource: use the vid enc usage bit\n" }, { "commit": "db85b54395c2866f07178558079cbc1813ff420c", "tree": "e97ace34340c2d586eeb5d8672609de4bc170bc1", "parents": [ "7a44d68249d64585c55ad7525ff2271f853850ac", "3d630e867d63edfb1e941859108f635c1995b76e" ], "author": { "name": "Andreas Huber", "email": "andih@google.com", "time": "Wed Nov 30 09:53:40 2011 -0800" }, "committer": { "name": "Andreas Huber", "email": "andih@google.com", "time": "Wed Nov 30 09:53:40 2011 -0800" }, "message": "resolved conflicts for merge of 3d630e86 to master\n\nChange-Id: I9eb7b7c1668b5f0de85ec8b1e9257cf1ec4d8b9e\n" }, { "commit": "44ddd1ff887395d747ded17f1f6b52f059320fcd", "tree": "b5c1f2300d9657ebd9794bad44e497a4cc77a053", "parents": [ "e7b3e09a5ed21dab938a7efdc215bb20d2769702" ], "author": { "name": "James Dong", "email": "jdong@google.com", "time": "Tue Nov 29 17:59:29 2011 -0800" }, "committer": { "name": "James Dong", "email": "jdong@google.com", "time": "Tue Nov 29 18:00:03 2011 -0800" }, "message": "Fix the broken build\n\nChange-Id: Ib508514891474d24f14ac69d721b0c9c700a0c3f\n" }, { "commit": "6f1dd757cb158d17c76baeb170f7db2271802ef8", "tree": "e965c66766e6d362eca7e7b4474107740874dc7f", "parents": [ "f296ee697409b4b55bef17d534edbc24a4619f0f", "6deb4b538ecf5cbd4418492bfb6b79df67eedfb7" ], "author": { "name": "Jamie Gennis", "email": "jgennis@google.com", "time": "Tue Nov 29 17:25:09 2011 -0800" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Tue Nov 29 17:25:09 2011 -0800" }, "message": "Merge \"SurfaceMediaSource: use the vid enc usage bit\" into ics-mr1" }, { "commit": "e7b3e09a5ed21dab938a7efdc215bb20d2769702", "tree": "8eb7926dfeac4f205e501e55b25ea30f2cfc38d2", "parents": [ "848bffd8fa07f0e16d0ac5eed95085288ff43d9f", "52607c5364446df6ac5b2f55cb50e146e6023a4f" ], "author": { "name": "Andreas Huber", "email": "andih@google.com", "time": "Tue Nov 29 16:33:04 2011 -0800" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Tue Nov 29 16:33:04 2011 -0800" }, "message": "am 52607c53: am d12dc284: Merge \"If an error occurs that prevents us from reallocating buffers during a format change\" into ics-mr1\n\n* commit \u002752607c5364446df6ac5b2f55cb50e146e6023a4f\u0027:\n If an error occurs that prevents us from reallocating buffers during a format change\n" }, { "commit": "848bffd8fa07f0e16d0ac5eed95085288ff43d9f", "tree": "b7ef7703f0a0b33df7d6a263c8cb3bfb5c371d9b", "parents": [ "baeda5135bb1b4a87334c41834f3532ab73a4022", "074133b260f8d12e484e93b9aa5a33a4983b7349" ], "author": { "name": "Andreas Huber", "email": "andih@google.com", "time": "Tue Nov 29 16:33:02 2011 -0800" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Tue Nov 29 16:33:02 2011 -0800" }, "message": "am 074133b2: am 351143fb: Merge \"Updated (internal) API for IStreamSource to signal discontinuities\" into ics-mr1\n\n* commit \u0027074133b260f8d12e484e93b9aa5a33a4983b7349\u0027:\n Updated (internal) API for IStreamSource to signal discontinuities\n" }, { "commit": "a3f887bd30bb5f79751f52c13e68f75b8195ccf1", "tree": "1f8bd55d70535474fbd1c5b65c483e2c9283c1ea", "parents": [ "b7a4db0a53cff6162d6981f9657a2ac70925ad73", "998a929ababe60b6e4d2f823ba63897a39322fd4" ], "author": { "name": "Andreas Huber", "email": "andih@google.com", "time": "Tue Nov 29 15:14:44 2011 -0800" }, "committer": { "name": "Andreas Huber", "email": "andih@google.com", "time": "Tue Nov 29 15:14:44 2011 -0800" }, "message": "resolved conflicts for merge of 998a929a to master\n\nChange-Id: Id5cfbcf20e5ec28782cc88075040cf9edebfdfe8\n" }, { "commit": "564fee36667e2699c59a29102136220dc2f65862", "tree": "94999b9598b150f31723238b513a928eb5672a35", "parents": [ "d12dc28460f622ab29e83fa688ad83a8263e9417", "551aeac336b426ae962e232d5223e7b994aaf1e1" ], "author": { "name": "Andreas Huber", "email": "andih@google.com", "time": "Tue Nov 29 14:09:10 2011 -0800" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Tue Nov 29 14:09:10 2011 -0800" }, "message": "Merge \"Make sure we can properly shutdown even if\" into ics-mr1" }, { "commit": "d12dc28460f622ab29e83fa688ad83a8263e9417", "tree": "47fa98e5e289300bbb65f48af427b4d6d68fa54b", "parents": [ "351143fb0e2fcfb7dc2ef1045d693c71eb0ea329", "d03e7d62d5a5eda07e19b0bbc1eaa6ed82d860c5" ], "author": { "name": "Andreas Huber", "email": "andih@google.com", "time": "Tue Nov 29 14:09:03 2011 -0800" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Tue Nov 29 14:09:03 2011 -0800" }, "message": "Merge \"If an error occurs that prevents us from reallocating buffers during a format change\" into ics-mr1" }, { "commit": "351143fb0e2fcfb7dc2ef1045d693c71eb0ea329", "tree": "e62eb07e221bd3d64ecaffbcbe5483dc89d1df6b", "parents": [ "405a4e34032f8a07028138266fe9f79f6753b466", "a10613fea8e9d8a73385d37ad92f9c56d8828ce6" ], "author": { "name": "Andreas Huber", "email": "andih@google.com", "time": "Tue Nov 29 14:08:45 2011 -0800" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Tue Nov 29 14:08:45 2011 -0800" }, "message": "Merge \"Updated (internal) API for IStreamSource to signal discontinuities\" into ics-mr1" }, { "commit": "405a4e34032f8a07028138266fe9f79f6753b466", "tree": "62352e960b6fe93d856304089387041104d706ac", "parents": [ "be6ab576ff0e3bf2a8dc3feee6f476061afbda30", "66a051af37c3d7a610802c0c58906dc0faefa6be" ], "author": { "name": "Andreas Huber", "email": "andih@google.com", "time": "Tue Nov 29 14:08:13 2011 -0800" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Tue Nov 29 14:08:13 2011 -0800" }, "message": "Merge \"Finer granularity discontinuity support.\" into ics-mr1" }, { "commit": "a10613fea8e9d8a73385d37ad92f9c56d8828ce6", "tree": "5be4f71fbf79a2f5e1131d63b53a647ecc072f15", "parents": [ "fed7a99a5294856d930e18225898828bd6755be1" ], "author": { "name": "Andreas Huber", "email": "andih@google.com", "time": "Tue Nov 29 11:57:35 2011 -0800" }, "committer": { "name": "Andreas Huber", "email": "andih@google.com", "time": "Tue Nov 29 11:59:10 2011 -0800" }, "message": "Updated (internal) API for IStreamSource to signal discontinuities\n\nChange-Id: Idd4b9d8e7cec16b3e3c91c70e75144d42be30f96\nrelated-to-bug: 5553055\n" }, { "commit": "aa2892edc7bb2b915771679d9811ec54a26db366", "tree": "49c0dc6ac659e69b4a2b7c4c439d60b7d759e3e6", "parents": [ "1e773932a1658128b80508f081de3c80655465d2", "f3918c5bd4bc9f02f74da42995564150ca2dd382" ], "author": { "name": "Mathias Agopian", "email": "mathias@google.com", "time": "Tue Nov 29 11:47:03 2011 -0800" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Tue Nov 29 11:47:03 2011 -0800" }, "message": "Merge changes If4126023,Iacda2386,I1eb691f7,Ib56139f8\n\n* changes:\n Add support for sending VSYNC events to the framework\n BitTube::read now handles EAGAIN\n split ComposerService out of SurfaceComposerClient.h\n rewrite SF\u0027s message loop on top of Looper\n" }, { "commit": "9a8246c8d1ea324b6704bf4fe0b77ade1c2f3639", "tree": "7870060b4752aa7750dd5b8e05be0ec023a0b764", "parents": [ "2f9e260185e9c83800ba14fdc7abeb95a399f526", "77d1ebbd7bd42d849911e680a63eec02e8b444db" ], "author": { "name": "Yu Shan Emily Lau", "email": "yslau@google.com", "time": "Mon Nov 28 19:57:26 2011 -0800" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Mon Nov 28 19:57:26 2011 -0800" }, "message": "am 77d1ebbd: am 4e5d3f2c: Merge \"Add the min fps option to set the min fps in the media recorder test. Add the procmem log to the media memory stress test.\" into ics-mr1\n\n* commit \u002777d1ebbd7bd42d849911e680a63eec02e8b444db\u0027:\n Add the min fps option to set the min fps in the media recorder test. Add the procmem log to the media memory stress test.\n" }, { "commit": "99b4523b753f35122e23e90c95f57399c3f8bb10", "tree": "7118f56a7208ee8d849cfa1ade8873be8227dfa0", "parents": [ "37ac88f994c5b8af291acd9c8d7eb5e22ce3c489" ], "author": { "name": "Yu Shan Emily Lau", "email": "yslau@google.com", "time": "Wed Nov 23 19:02:01 2011 -0800" }, "committer": { "name": "Yu Shan Emily Lau", "email": "yslau@google.com", "time": "Mon Nov 28 17:56:02 2011 -0800" }, "message": "Add the min fps option to set\nthe min fps in the media recorder test.\nAdd the procmem log to the media\nmemory stress test.\n\nChange-Id: Icf82f12adeca7072a171991d1d6a994e4bb7764a\n" }, { "commit": "66a051af37c3d7a610802c0c58906dc0faefa6be", "tree": "239db41f3a82a16f603dbeebef3da869b1d966bc", "parents": [ "e35581ad5ad635f9dcfe4ab6a432c48b46b782cd" ], "author": { "name": "Andreas Huber", "email": "andih@google.com", "time": "Mon Nov 28 12:36:11 2011 -0800" }, "committer": { "name": "Andreas Huber", "email": "andih@google.com", "time": "Mon Nov 28 16:45:13 2011 -0800" }, "message": "Finer granularity discontinuity support.\n\nNo clients can signal a format change on either audio or video track (or both)\nand a time discontinuity (timestamps changed) independantly.\n\nChange-Id: I3e6cf4e7c260e85759879d61a9b517f68431c22f\nrelated-to-bug: 5553055\n" }, { "commit": "551aeac336b426ae962e232d5223e7b994aaf1e1", "tree": "531855a6ed7be8612dfbf95dcca71d6088434acf", "parents": [ "e35581ad5ad635f9dcfe4ab6a432c48b46b782cd" ], "author": { "name": "Andreas Huber", "email": "andih@google.com", "time": "Mon Nov 28 16:27:35 2011 -0800" }, "committer": { "name": "Andreas Huber", "email": "andih@google.com", "time": "Mon Nov 28 16:27:35 2011 -0800" }, "message": "Make sure we can properly shutdown even if\n\na) one of the two decoders has a pending discontinuity\nb) the renderer holds on to all output buffers for that decoder\nc) the renderer is paused\n\nif all three conditions are met the decoder won\u0027t ask for more input data\nand therefore never see the discontinuity.\n\nTo avoid this we briefly resume the renderer just before shutting down.\n\nChange-Id: I9e08af2a1eb4298d1cd00497d6aa33f4ad184e9a\nrelated-to-bug: 5655016\n" }, { "commit": "3f15700a012b1ab0097eaf90caf0540ba6caa529", "tree": "548cf135dc366cfd34e430024e89b8e0b58a35b4", "parents": [ "16aca5197244f9066968658735611a0dbbe46403" ], "author": { "name": "Mathias Agopian", "email": "mathias@google.com", "time": "Thu Nov 17 17:48:35 2011 -0800" }, "committer": { "name": "Mathias Agopian", "email": "mathias@google.com", "time": "Mon Nov 28 15:21:57 2011 -0800" }, "message": "split ComposerService out of SurfaceComposerClient.h\n\nChange-Id: I1eb691f7ca263d5895d871ab675bb5826e0323c6\n" }, { "commit": "d03e7d62d5a5eda07e19b0bbc1eaa6ed82d860c5", "tree": "e64d854927bfab0c6c1982002a2a071004d5aaf6", "parents": [ "e35581ad5ad635f9dcfe4ab6a432c48b46b782cd" ], "author": { "name": "Andreas Huber", "email": "andih@google.com", "time": "Mon Nov 28 10:54:12 2011 -0800" }, "committer": { "name": "Andreas Huber", "email": "andih@google.com", "time": "Mon Nov 28 10:54:12 2011 -0800" }, "message": "If an error occurs that prevents us from reallocating buffers during a format change\n\nwe need to transition to executing state anyway to be able to properly flush/shutdown\nin the future.\n\nChange-Id: Ie48bc09ea31942009ae3a5a45aabc9ffad9fb91f\nrelated-to-bug: 5655016\n" }, { "commit": "f53453d59615e3709e683215ea4ddaf6daf9bc91", "tree": "18153af312d67e5c25363d899fac6ddf3ae37495", "parents": [ "b1e72b6826455a19a80dab14612da7f22e0e1a75", "7e6265e0d216e0b872a5f103af1c7bb022ade06e" ], "author": { "name": "James Dong", "email": "jdong@google.com", "time": "Tue Nov 22 17:36:45 2011 -0800" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Tue Nov 22 17:36:45 2011 -0800" }, "message": "Merge \"Fix a subtitle bug: multiple blank lines in SubRip(srt) file.\"" }, { "commit": "55cadf7eca8dffa981054d3521fd279fefe9b6f4", "tree": "739dc96c2d52f6050b056e8b64765b72f3983b1a", "parents": [ "ec24b0217e6e6de9ebcfb72154dbde2070f53e5a", "4d592c59e684ed3e6f0db4b05c37ba8774b8d410" ], "author": { "name": "dujin.cha", "email": "dujin.cha@samsung.com", "time": "Tue Nov 22 13:22:00 2011 -0800" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Tue Nov 22 13:22:00 2011 -0800" }, "message": "am 4d592c59: am eabde3d4: am fe464a76: [Prime K] Fix gabage character issue\n\n* commit \u00274d592c59e684ed3e6f0db4b05c37ba8774b8d410\u0027:\n [Prime K] Fix gabage character issue\n" }, { "commit": "eabde3d4a9027a19443a31c7c7cda3d44fb0ffe0", "tree": "61c6212cb0987cd45b47d3ed10bd5d6601ec8ee5", "parents": [ "eff6ed0fee42e4324ceb8d5a20be09bb2f34aa9f", "fe464a76d8fc858be971dbb5e67b1d22fd925347" ], "author": { "name": "dujin.cha", "email": "dujin.cha@samsung.com", "time": "Tue Nov 22 13:18:27 2011 -0800" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Tue Nov 22 13:18:27 2011 -0800" }, "message": "am fe464a76: [Prime K] Fix gabage character issue\n\n* commit \u0027fe464a76d8fc858be971dbb5e67b1d22fd925347\u0027:\n [Prime K] Fix gabage character issue\n" }, { "commit": "fe464a76d8fc858be971dbb5e67b1d22fd925347", "tree": "5fae81310242c8fc3dd782d3ee5e858d2e67784a", "parents": [ "e36657e5416dbc9c1b22cc73174a958fafdfd736" ], "author": { "name": "dujin.cha", "email": "dujin.cha@samsung.com", "time": "Tue Nov 22 12:13:33 2011 +0900" }, "committer": { "name": "Marco Nelissen", "email": "marcone@google.com", "time": "Tue Nov 22 10:28:21 2011 -0800" }, "message": "[Prime K] Fix gabage character issue\n\nKorean characters show up as gabage characters in Music player.\nReason : MTP service does not set the locale for the MediaScanner\nSolution : Set locale when MtpDatabase creates MediaScanner.\n\nBug ID : 5567433\nSigned-off-by: dujin.cha \u003cdujin.cha@samsung.com\u003e\n\nChange-Id: I4bfe5f603c113170d45bd57a8709c21c665e260b\n" }, { "commit": "72a845d53900048c13edf4a4ac33386f3332e838", "tree": "9b324d488f64d3989ed2fda81df376a9ed7b2f5e", "parents": [ "5b17f73573e778c3ac22e41d13d4633f1f1d3f9f", "31626b3075335f4cf579342e99436bb45870cf55" ], "author": { "name": "Andreas Huber", "email": "andih@google.com", "time": "Tue Nov 22 08:43:28 2011 -0800" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Tue Nov 22 08:43:28 2011 -0800" }, "message": "am 31626b30: am cb6fbc89: Merge \"Report a runtime error instead of asserting on malformed avc configuration data.\" into ics-mr1\n\n* commit \u002731626b3075335f4cf579342e99436bb45870cf55\u0027:\n Report a runtime error instead of asserting on malformed avc configuration data.\n" }, { "commit": "cb6fbc89c25298643ab342b4a228e772b0e56978", "tree": "66e96e1e6c7aa64d5bb6a84e10b46213fbf296a0", "parents": [ "631885746868cbf03f89e655a6f4fac96449e8a4", "0ba8660ea6d88a1809508c31bd3b1da8e8dfabd3" ], "author": { "name": "Andreas Huber", "email": "andih@google.com", "time": "Tue Nov 22 08:39:11 2011 -0800" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Tue Nov 22 08:39:11 2011 -0800" }, "message": "Merge \"Report a runtime error instead of asserting on malformed avc configuration data.\" into ics-mr1" }, { "commit": "7e6265e0d216e0b872a5f103af1c7bb022ade06e", "tree": "52895b6f393685263d0be5fd45f9995f3a81de70", "parents": [ "07679d191e9ae03b8ad78020968a79ad89e6cde0" ], "author": { "name": "Insun Kang", "email": "insun@google.com", "time": "Tue Nov 22 20:59:31 2011 +0900" }, "committer": { "name": "Insun Kang", "email": "insun@google.com", "time": "Tue Nov 22 21:11:49 2011 +0900" }, "message": "Fix a subtitle bug: multiple blank lines in SubRip(srt) file.\n\nTimedTextParser should handle multiple blank lines between subtitles\nin SRT format.\n\nChange-Id: Id81e0a14d9984141f68b9f0919942c85562301b3\n" }, { "commit": "4e2ecdd8a78f25f4c234877d5321ebd4e4c0e8f7", "tree": "fc7fc0c14ceeb9811298b19197bc9c132a78883a", "parents": [ "24692d6c9e35e99ec77f5fb57c53bfeef30315a1", "d0a254566f5f0be5607b4d64839a575c888c94f6" ], "author": { "name": "James Dong", "email": "jdong@google.com", "time": "Mon Nov 21 21:08:55 2011 -0800" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Mon Nov 21 21:08:55 2011 -0800" }, "message": "am d0a25456: am 02740dc4: Merge \"Fix log spamming during time lapse video recording\" into ics-mr1\n\n* commit \u0027d0a254566f5f0be5607b4d64839a575c888c94f6\u0027:\n Fix log spamming during time lapse video recording\n" }, { "commit": "6deb4b538ecf5cbd4418492bfb6b79df67eedfb7", "tree": "c7a3bb6bdbe11d49b220c53b4d1eed518b29d560", "parents": [ "b8d20d028ca590f6a9c57e0e8fee5e5f80e9ae54" ], "author": { "name": "Jamie Gennis", "email": "jgennis@google.com", "time": "Mon Nov 21 16:51:47 2011 -0800" }, "committer": { "name": "Jamie Gennis", "email": "jgennis@google.com", "time": "Mon Nov 21 17:48:19 2011 -0800" }, "message": "SurfaceMediaSource: use the vid enc usage bit\n\nThis change makes SurfaceMediaSource add the VIDEO_ENC usage bit when\nallocating its GraphicBuffers rather than the HW_TEXTURE bit.\n\nChange-Id: Ie20e225c894fdbc31cad6bb82b3b64c7e98074eb\n" }, { "commit": "96af14d9b013496accf40a85a66fefcba3ac0111", "tree": "0d77b5fc0a82fc4b82bb1b1df83a92473cc0fb69", "parents": [ "7859c1842c1f2e3c43415dfb5337a0b005bdb1c4" ], "author": { "name": "James Dong", "email": "jdong@google.com", "time": "Sun Nov 20 09:45:44 2011 -0800" }, "committer": { "name": "James Dong", "email": "jdong@google.com", "time": "Mon Nov 21 12:09:51 2011 -0800" }, "message": "Fix log spamming during time lapse video recording\n\nChange-Id: I4fc0809203684ebb02eaf217d7abad00aefc898f\n\nrelated-to-bug: 5626569\n" }, { "commit": "c81e0ad9bd438575389623f523a28e2e6ca69236", "tree": "818719abe1363682a35fcaa124b24110820bdbb9", "parents": [ "26650aef868a47db67c085ca734d9ea14f269d74" ], "author": { "name": "Eric Laurent", "email": "elaurent@google.com", "time": "Fri Nov 18 17:27:08 2011 -0800" }, "committer": { "name": "Eric Laurent", "email": "elaurent@google.com", "time": "Fri Nov 18 17:27:08 2011 -0800" }, "message": "Fix audio effect tests\n\nMake sure that audio effect tests relying on audio to actually play on\nthe music stream are not affected by current ringer mode. Silent mode\ncan mute music stream on tablets.\n\nIssue 5638685.\n\nChange-Id: Icdf14696986145ae3f50fc15d358335487d3525f\n" }, { "commit": "7ff7821a601a39fffb318e29873957b4a3703c46", "tree": "1e3cbf41ef8ef551d73c5f303739a126301c6f9f", "parents": [ "d8a3cabcb11c02c54b76590e0f60c32b43b9f2fc", "d4b22ab4889f9b1885bfc0dc45667c846a171a98" ], "author": { "name": "Marco Nelissen", "email": "marcone@google.com", "time": "Fri Nov 18 15:07:21 2011 -0800" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Fri Nov 18 15:07:21 2011 -0800" }, "message": "am d4b22ab4: status_t !\u003d bool\n\n* commit \u0027d4b22ab4889f9b1885bfc0dc45667c846a171a98\u0027:\n status_t !\u003d bool\n" }, { "commit": "d4b22ab4889f9b1885bfc0dc45667c846a171a98", "tree": "4fa2350acd3bdc0d6cf1bca1740e7cf4c142050b", "parents": [ "366113fa1bea5ef39cf6557f18ff00310eb6e458" ], "author": { "name": "Marco Nelissen", "email": "marcone@google.com", "time": "Fri Nov 18 13:10:56 2011 -0800" }, "committer": { "name": "Marco Nelissen", "email": "marcone@google.com", "time": "Fri Nov 18 14:21:34 2011 -0800" }, "message": "status_t !\u003d bool\n\nb/5567433\n\nChange-Id: I255ab8c3b0b5e0ea6a5cc7c05df757c667f3855e\n" }, { "commit": "1cad15207df78babcd5871effa63604f78f597ac", "tree": "bcc6a25ab35c333b4ae5ee65e74caae2e56c07c4", "parents": [ "33d4dde0580176c23f0773f8e18f99ba1111b023" ], "author": { "name": "Marco Nelissen", "email": "marcone@google.com", "time": "Fri Nov 18 13:10:56 2011 -0800" }, "committer": { "name": "Marco Nelissen", "email": "marcone@google.com", "time": "Fri Nov 18 13:10:56 2011 -0800" }, "message": "status_t !\u003d bool\n\nb/5567433\n\nChange-Id: I255ab8c3b0b5e0ea6a5cc7c05df757c667f3855e\n" }, { "commit": "0ba8660ea6d88a1809508c31bd3b1da8e8dfabd3", "tree": "9e7a57f403f0bbe83e7c785b814cb03bc016c009", "parents": [ "dea90a0e1c9c1d15657024893b6793dc21bc27ef" ], "author": { "name": "Andreas Huber", "email": "andih@google.com", "time": "Fri Nov 18 12:22:59 2011 -0800" }, "committer": { "name": "Andreas Huber", "email": "andih@google.com", "time": "Fri Nov 18 12:22:59 2011 -0800" }, "message": "Report a runtime error instead of asserting on malformed avc configuration data.\n\nChange-Id: Ibcd9c3fb5b6532eba843ed80ecdcdacaf50d8845\nrelated-to-bug: 5641069\n" }, { "commit": "aa25761114b143ed3182d97004ec1366c2ae850e", "tree": "60f713214ef7835ae2815115e017d83b50c2b001", "parents": [ "a93a7d6d15295e36b54b928bc57f0b5ca239714a", "624efe45671131903fb5165f6133ba39486092ab" ], "author": { "name": "Andreas Huber", "email": "andih@google.com", "time": "Thu Nov 17 13:20:16 2011 -0800" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Thu Nov 17 13:20:16 2011 -0800" }, "message": "am 624efe45: am c1b1709b: Merge \"Make sure not to cancel pending seek/EOS notifications on a cache underrun...\" into ics-mr1\n\n* commit \u0027624efe45671131903fb5165f6133ba39486092ab\u0027:\n Make sure not to cancel pending seek/EOS notifications on a cache underrun...\n" }, { "commit": "7418e385f4523b94662d3fef614dac26d8a36885", "tree": "b6981d801614f1a93f9858f3fd044365aa2e6797", "parents": [ "b447e9ce1d3dc603a8879340f36a4ca4f22d6b62", "376c393039451e572ce60e0da933fbd70ae12a4a" ], "author": { "name": "Glenn Kasten", "email": "gkasten@google.com", "time": "Thu Nov 17 07:14:41 2011 -0800" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Thu Nov 17 07:14:41 2011 -0800" }, "message": "Merge \"MidiFile uses C++ Thread not createThreadEtc\"" }, { "commit": "b447e9ce1d3dc603a8879340f36a4ca4f22d6b62", "tree": "0d9f68cf4a74e2602a74f38f7b2b66fd27350ad9", "parents": [ "77c5f4def49357a89abd9849b0bab950179d71f4", "9c0227a63c9903cf407da4a713ff619e49c6bc73" ], "author": { "name": "Glenn Kasten", "email": "gkasten@google.com", "time": "Thu Nov 17 07:14:29 2011 -0800" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Thu Nov 17 07:14:29 2011 -0800" }, "message": "Merge \"JetPlayer uses C++ Thread not createThreadEtc\"" }, { "commit": "376c393039451e572ce60e0da933fbd70ae12a4a", "tree": "0391bca7457d8bc0b5440231affcb816b5c6170b", "parents": [ "5a4718183340a108b55eba7bf755b4432153caa1" ], "author": { "name": "Glenn Kasten", "email": "gkasten@google.com", "time": "Thu Jun 23 17:11:35 2011 -0700" }, "committer": { "name": "Glenn Kasten", "email": "gkasten@google.com", "time": "Wed Nov 16 15:43:31 2011 -0800" }, "message": "MidiFile uses C++ Thread not createThreadEtc\n\nThis permits leveraging future improvements to Thread.\n\nChange-Id: I323b709e935c47fa3c6041cb8b82fda994e78b56\n" }, { "commit": "9c0227a63c9903cf407da4a713ff619e49c6bc73", "tree": "fa4abf755c8d500a684879a00ddfa3f38a341075", "parents": [ "5a4718183340a108b55eba7bf755b4432153caa1" ], "author": { "name": "Glenn Kasten", "email": "gkasten@google.com", "time": "Thu Jun 23 16:43:24 2011 -0700" }, "committer": { "name": "Glenn Kasten", "email": "gkasten@google.com", "time": "Wed Nov 16 15:25:30 2011 -0800" }, "message": "JetPlayer uses C++ Thread not createThreadEtc\n\nThis permits leveraging future improvements to Thread.\n\nChange-Id: I60deed8565ed54f13d9f770c76504e411b154276\n" }, { "commit": "99d544332a6e79d9f4fa6d981f95e8ba6c037ab7", "tree": "ca499ce5649c307ed0c7f931c74adf0d6bdab68d", "parents": [ "5a4718183340a108b55eba7bf755b4432153caa1" ], "author": { "name": "Glenn Kasten", "email": "gkasten@google.com", "time": "Wed Jun 22 16:15:25 2011 -0700" }, "committer": { "name": "Glenn Kasten", "email": "gkasten@google.com", "time": "Wed Nov 16 14:52:55 2011 -0800" }, "message": "Bug 4903178 Restore priority and cgroup on stop\n\nOn AudioTrack and AudioRecord stop or failed start, restore the priority\nand cgroup of the caller to their previous values, rather than forcing\nto NORMAL. Dependent on new thread APIs.\n\nAlso fixes bug where priority was set to AUDIO but cgroup not set.\n\nChange-Id: Ib83893918fb4fdf57c6b87884b51038997a631d8\n" }, { "commit": "22cf4b0c5f76c9bcf9103af21b29c9b532ea52c2", "tree": "16f49a7e3488e3b55b86e84f826116bcde729669", "parents": [ "c7403258528a08ab74f7c29277d0c34ba6edc53d" ], "author": { "name": "Andreas Huber", "email": "andih@google.com", "time": "Wed Nov 16 10:46:05 2011 -0800" }, "committer": { "name": "Andreas Huber", "email": "andih@google.com", "time": "Wed Nov 16 10:46:05 2011 -0800" }, "message": "Make sure not to cancel pending seek/EOS notifications on a cache underrun...\n\nor they are lost for good.\n\nChange-Id: I2f9f53efb05db4077961137c9dc8c27edac4ec62\nrelated-to-bug: 5544907\n" }, { "commit": "0e7d85fa93a5f5975b437277439b3c65f86cf275", "tree": "9583c9f67deea73d392e692331da2650a381dd38", "parents": [ "ca127baa0675bc1168019fbb1f9812dbbe4613d7", "4e72e2bfc24afe053ca98c6de2591a4057cfd9fa" ], "author": { "name": "James Dong", "email": "jdong@google.com", "time": "Tue Nov 15 20:19:55 2011 -0800" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Tue Nov 15 20:19:55 2011 -0800" }, "message": "am 4e72e2bf: am 4fdc36e6: Merge \"Document that release() should be called with onPause() and onStop() for media objects\" into ics-mr1\n\n* commit \u00274e72e2bfc24afe053ca98c6de2591a4057cfd9fa\u0027:\n Document that release() should be called with onPause() and onStop() for media objects\n" }, { "commit": "4fdc36e6d6003cdce911678f0b233697554f8dbf", "tree": "5071202f980d8e18e80f00d2987facb075b416a6", "parents": [ "45f05c9580739ffe2d665cec50efb0bb57d757ba", "89ca6983eb2be21848f5ac884a2c118f152c83e6" ], "author": { "name": "James Dong", "email": "jdong@google.com", "time": "Tue Nov 15 20:13:03 2011 -0800" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Tue Nov 15 20:13:03 2011 -0800" }, "message": "Merge \"Document that release() should be called with onPause() and onStop() for media objects\" into ics-mr1" }, { "commit": "29270da5f7dee7e81b9d69446c7d2030aea6ff74", "tree": "ff0b4b61184e438fdbfac5139e50160469664fe1", "parents": [ "dff37bc674310beeb2aaf296130b8bbaa0e2ead2", "4978c1a5b07782d622ca9e3eedd649a5927d226f" ], "author": { "name": "Jean-Michel Trivi", "email": "jmtrivi@google.com", "time": "Tue Nov 15 18:28:39 2011 -0800" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Tue Nov 15 18:28:39 2011 -0800" }, "message": "am 4978c1a5: am 0ddb0143: Merge \"Fix 5623252 unlink to death of audio focus client early\" into ics-mr1\n\n* commit \u00274978c1a5b07782d622ca9e3eedd649a5927d226f\u0027:\n Fix 5623252 unlink to death of audio focus client early\n" }, { "commit": "89ca6983eb2be21848f5ac884a2c118f152c83e6", "tree": "3d270f87edbba1a0ee42a63364b61a5f22bcc768", "parents": [ "b3b66af2b5b4ccca1f507290ab6f138a3cbffc3e" ], "author": { "name": "James Dong", "email": "jdong@google.com", "time": "Mon Nov 14 19:01:26 2011 -0800" }, "committer": { "name": "James Dong", "email": "jdong@google.com", "time": "Tue Nov 15 18:08:06 2011 -0800" }, "message": "Document that release() should be called with onPause() and onStop() for media objects\n\nChange-Id: I12dd734b4314df4f0573ad56a1714348e50da05e\nrelated-to-bug: 5616833\n" }, { "commit": "e7edc868538e83152e7bc35c830fee0d629baefc", "tree": "10b740a8dd1b3d18ce353da65faea9feb940e5be", "parents": [ "34a62348be92034a9fb7582e51754224785568dc" ], "author": { "name": "Jean-Michel Trivi", "email": "jmtrivi@google.com", "time": "Tue Nov 15 16:27:05 2011 -0800" }, "committer": { "name": "Jean-Michel Trivi", "email": "jmtrivi@google.com", "time": "Tue Nov 15 17:41:05 2011 -0800" }, "message": "Fix 5623252 unlink to death of audio focus client early\n\nWhen removing an entry in the audio focus stack, don\u0027t wait for\n this object\u0027s finalizer to unlink to the death of the associated\n client, and unlink right away.\nThe FocusStackEntry.unlinkToDeath() method is made safe to call\n by catching the exception it can throw inside its body.\n\nChange-Id: Id347a933d72dcb41531adff2854fb00277032cc9\n" }, { "commit": "cc6c20f5321e39ee75172f329450dd60a69c980f", "tree": "c7c3ca11811eb608a786120a3a00dbb9362f8257", "parents": [ "0e02e42140d54410ec90e21e90af23cc8b4da31d", "716747f7cb29b45e41c2870f12d39095f4ed80c8" ], "author": { "name": "Hong Teng", "email": "hongteng@google.com", "time": "Tue Nov 15 13:07:07 2011 -0800" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Tue Nov 15 13:07:07 2011 -0800" }, "message": "am 716747f7: am 481ffa50: Merge \"Fix for issue 5309336 -add videoeditor maximum prefetch YUV frames in media_profiles.xml to limit the total memory usage.\" into ics-mr1\n\n* commit \u0027716747f7cb29b45e41c2870f12d39095f4ed80c8\u0027:\n Fix for issue 5309336 -add videoeditor maximum prefetch YUV frames in media_profiles.xml to limit the total memory usage.\n" }, { "commit": "eb80b31b5548650675c078ccfffc3091402a9382", "tree": "91395268faadfcb0a488ccca5db68fbd943294b2", "parents": [ "7c4dee75b8a9db10ff1c5456ea7d13bfc61f35ab", "87597d9ce00691f05703f728c17548df2bbc9cc2" ], "author": { "name": "Jean-Michel Trivi", "email": "jmtrivi@google.com", "time": "Tue Nov 15 13:06:57 2011 -0800" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Tue Nov 15 13:06:57 2011 -0800" }, "message": "am 87597d9c: am 538dc6ac: Merge \"Fix 5615747 Don\\\u0027t leak remote control client death handlers\" into ics-mr1\n\n* commit \u002787597d9ce00691f05703f728c17548df2bbc9cc2\u0027:\n Fix 5615747 Don\u0027t leak remote control client death handlers\n" }, { "commit": "481ffa505bb1d8f5089ea98e3b5960d409b6819c", "tree": "e27a4ae290b172cb6afc4d7559e32994e810762d", "parents": [ "ce33622aed7fb25a14ef957cdc78b78cc4602be9", "7eb531970305f938c8e3bdc564bed6156fbd8f06" ], "author": { "name": "Hong Teng", "email": "hongteng@google.com", "time": "Tue Nov 15 09:42:37 2011 -0800" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Tue Nov 15 09:42:37 2011 -0800" }, "message": "Merge \"Fix for issue 5309336 -add videoeditor maximum prefetch YUV frames in media_profiles.xml to limit the total memory usage.\" into ics-mr1" } ], "next": "a9509736c85c19fe4ad4ba97a0545f0422a3dfc1" }