)]}' { "log": [ { "commit": "a3f5b615d7adc5a644cbedd55100deba562ec0ac", "tree": "2f3cce676494fbdb8eb56e561881873f8f9ce4b9", "parents": [ "0ce0f72c1eb92cf654667c15477f19b4a7e84cd1", "f3847e875eb1c58094a2d159a2a6f3f0b381d77a" ], "author": { "name": "James Dong", "email": "jdong@google.com", "time": "Wed Nov 03 09:25:08 2010 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Wed Nov 03 09:25:08 2010 -0700" }, "message": "am f3847e87: Merge \"DO NOT MERGE\" into gingerbread\n\n* commit \u0027f3847e875eb1c58094a2d159a2a6f3f0b381d77a\u0027:\n DO NOT MERGE\n" }, { "commit": "6786fccf5a7979ca1b6fe4360ef47a9c9bbec9bb", "tree": "ee2d525a2d3a52fb98250755f946edee9104b40c", "parents": [ "a87ea46cb023763e0a9b0222da20b0a354f79d8d" ], "author": { "name": "James Dong", "email": "jdong@google.com", "time": "Tue Nov 02 18:43:03 2010 -0700" }, "committer": { "name": "James Dong", "email": "jdong@google.com", "time": "Tue Nov 02 19:30:01 2010 -0700" }, "message": "DO NOT MERGE\n\nFix premature release of recording frames when physical address or metadata is stored in input video buffers\n\n- bug 3158459\n\nChange-Id: If297189d2a87fc3abfda68c29ac75b490b30a902\n" }, { "commit": "a8d7b7477d99dd2671e6232e157da9954bf4699f", "tree": "1d7dc40888d00b25724c1b82e63ea26521737fab", "parents": [ "6fb9316f6bd72b406bbfc61bd210281744eea9c1", "ef8a810b3b11d177a64111125eaa44bb76624414" ], "author": { "name": "Gloria Wang", "email": "gwang@google.com", "time": "Tue Nov 02 14:59:51 2010 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Tue Nov 02 14:59:51 2010 -0700" }, "message": "am ef8a810b: Merge \"Update of DRM framework\"\n\n* commit \u0027ef8a810b3b11d177a64111125eaa44bb76624414\u0027:\n Update of DRM framework\n" }, { "commit": "c7b3ccc564448cb4b918728421f9402bc18278c5", "tree": "7d97c647cef5ae086048f62636bad3343f193459", "parents": [ "5b4d0e84d314bd58efb9dcf4e7f23f0d0e3fc630" ], "author": { "name": "Takeshi Aimi", "email": "aimitakeshi@gmail.com", "time": "Fri Oct 08 23:05:49 2010 +0900" }, "committer": { "name": "Takeshi Aimi", "email": "aimitakeshi@gmail.com", "time": "Tue Nov 02 08:06:06 2010 +0900" }, "message": "Update of DRM framework\n\n - Overload openDecryptSession() with uri parameter\n in order to accept URI of DRM content,\n Following API is added,\n DecryptHandle*openDecryptSession(const char* uri);.\n - Unify texisting three event types of processDrmInfo()\n so that caller of DRM framework does not have to handle many event types.\n - Let DrmManagerService call load/unload plugins API so that\n client of DRM framework does not have to manage plug-in load/unload.\n - Trivial fix in DrmManagerClient.java is also incorporated.\n\nChanges are made by Sony Corporation.\n\nChange-Id: If62b47fa0360718fdc943e6e6143671d7db26adc\n" }, { "commit": "df3cccf3dc6b59ec4a45d80fb483022360e13830", "tree": "ad6c69291a1bb02fbf694b0e5ce03258d419bb49", "parents": [ "96abb48dff22a54de4ddcdd427d8e5a261d0facc", "120a4594855951ed5eb185fdfc19bf98efef3ba2" ], "author": { "name": "Jeff Brown", "email": "jeffbrown@google.com", "time": "Wed Oct 27 19:31:24 2010 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Wed Oct 27 19:31:24 2010 -0700" }, "message": "am 120a4594: Drop all dispatcher state when dispatcher is disabled.\n" }, { "commit": "120a4594855951ed5eb185fdfc19bf98efef3ba2", "tree": "74fc123ad9fd79bc8d077dc019f5f669e4596e89", "parents": [ "aa93bcd62482719c146a411008e1eac94135b6a4" ], "author": { "name": "Jeff Brown", "email": "jeffbrown@google.com", "time": "Wed Oct 27 18:43:51 2010 -0700" }, "committer": { "name": "Jeff Brown", "email": "jeffbrown@google.com", "time": "Wed Oct 27 18:43:51 2010 -0700" }, "message": "Drop all dispatcher state when dispatcher is disabled.\n\nThis patch makes the dispatcher drop all of its state when it is\ndisabled (when the screen turns off). This ensures that the dispatcher\ndoes not get stuck thinking a pointer is still down if the screen\nturned off while the user was touching the display (such as a fat touch\nwhile hitting the power button).\n\nBug: 3098344\nChange-Id: If50ef5804870aa1acd3179fd4b40e3cda58dd39d\n" }, { "commit": "b8791479af814d530a3810d0516ef5628958a8d0", "tree": "512aa5507bf60631597c06e77ff58a2e2d99b76b", "parents": [ "67bb6741965c0b9f3bf6b4caf2647efc564e287e", "9084631dba8938942ddd8d4cb1e0f9149965ae8e" ], "author": { "name": "Gloria Wang", "email": "gwang@google.com", "time": "Mon Oct 25 15:23:04 2010 -0700" }, "committer": { "name": "Gloria Wang", "email": "gwang@google.com", "time": "Mon Oct 25 16:11:18 2010 -0700" }, "message": "resolved conflicts for merge of 9084631d to gingerbread-plus-aosp\n\nChange-Id: Ie2b675d50bfca3f33aee80f1a67c9f03d1f97472\n" }, { "commit": "d5770917a50a828cb4337c2a392b3e4a375624b9", "tree": "0ba25dd389bab286b27c178e9598cea45cd1cbe6", "parents": [ "c5371fadf2753d074ef117685fed05b0140d6864" ], "author": { "name": "Gloria Wang", "email": "gwang@google.com", "time": "Tue Jun 22 13:55:38 2010 -0700" }, "committer": { "name": "Gloria Wang", "email": "gwang@google.com", "time": "Mon Oct 25 12:16:56 2010 -0700" }, "message": "DRM framework support:\n- add a sniffer for DRM files\n- add DRMSource and DRMExtractor for es_based DRM\n- add pread in FileSource.cpp for container_based DRM\n- add native DRM framework API calls in the player for\n DRM audio/video playback\n\nChange-Id: I4b9ef19165c9b4f44ff40eeededb9a665e78a90f\n" }, { "commit": "2ef36763700eff5679d6012e7f078c57f1a4c465", "tree": "3b36010de56350d0b88914c4fbd729afa38acd00", "parents": [ "b34fe2f0258eb1ed512b682206b7fe65116f1dbd", "860c2df4132a2a0be9bcb0e91bfb7e79588c000f" ], "author": { "name": "Jeff Brown", "email": "jeffbrown@google.com", "time": "Sun Oct 24 14:31:41 2010 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Sun Oct 24 14:31:41 2010 -0700" }, "message": "am 860c2df4: Merge \"Add unit tests for native input and fix bugs identified.\" into gingerbread\n\nMerge commit \u0027860c2df4132a2a0be9bcb0e91bfb7e79588c000f\u0027 into gingerbread-plus-aosp\n\n* commit \u0027860c2df4132a2a0be9bcb0e91bfb7e79588c000f\u0027:\n Add unit tests for native input and fix bugs identified.\n" }, { "commit": "c3db858de9fa152480b9cf53c8c0cb793a280722", "tree": "ba337dd2df79d211a940727c5c93c112cf0de77d", "parents": [ "b6a2256e5461160a89d077b761d3253d95ce869f" ], "author": { "name": "Jeff Brown", "email": "jeffbrown@google.com", "time": "Wed Oct 20 15:33:38 2010 -0700" }, "committer": { "name": "Jeff Brown", "email": "jeffbrown@google.com", "time": "Sat Oct 23 03:52:57 2010 -0700" }, "message": "Add unit tests for native input and fix bugs identified.\n\nFixed a bug where we would lose the first touch point when swiping out of\nthe virtual key area.\n\nFixed a bug where we would not send an ACTION_MOVE event in cases where\nindividual pointers went down/up and the remaining pointers actually moved.\nThis is important since many applications do not handle pointer movements\nduring ACTION_POINTER_DOWN or ACTION_POINTER_UP. In the case of\nACTION_POINTER_UP the movement was completely lost since all pointers were\ndispatched using their old location rather than the new location.\n\nImproved motion event validation to check for duplicate pointer ids.\n\nAdded an input source constant that was missing from the NDK api but\ndefined in the framework api.\n\nAdded a timestamp when reporting added/removed devices in EventHub.\n\nBug: 3070082\nChange-Id: I3206a030f43b7616e2f48006e5a9d522c4d92e56\n" }, { "commit": "86f1b643d10e0b5b17ae01db3b81020db87b3295", "tree": "2d7deecbacb72c2cb8277711e36653343b222175", "parents": [ "482284ad0e3226b49c27bf41442c1cb150853226", "bf5efba238f81330f4b473e92b6931b85baa1cbc" ], "author": { "name": "Dianne Hackborn", "email": "hackbod@google.com", "time": "Thu Oct 21 20:17:50 2010 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Thu Oct 21 20:17:50 2010 -0700" }, "message": "am bf5efba2: Merge \"Fix issue #3117918: No way to finish a native activity\" into gingerbread\n\nMerge commit \u0027bf5efba238f81330f4b473e92b6931b85baa1cbc\u0027 into gingerbread-plus-aosp\n\n* commit \u0027bf5efba238f81330f4b473e92b6931b85baa1cbc\u0027:\n Fix issue #3117918: No way to finish a native activity\n" }, { "commit": "bf5efba238f81330f4b473e92b6931b85baa1cbc", "tree": "0c44e38500f37c552c74f4d288ae7afa8b4b8413", "parents": [ "6b3178a6323e015644590ebaee86523e4bb81773", "db28a94d499f995b467b07cee5c9b9119f538b1c" ], "author": { "name": "Dianne Hackborn", "email": "hackbod@google.com", "time": "Thu Oct 21 19:09:44 2010 -0700" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Thu Oct 21 19:09:44 2010 -0700" }, "message": "Merge \"Fix issue #3117918: No way to finish a native activity\" into gingerbread" }, { "commit": "db28a94d499f995b467b07cee5c9b9119f538b1c", "tree": "f720143b3b6a9813d26fdbc210bec10a0780f0b0", "parents": [ "7dc08fb070ff7455e794fc81645ccb4349cd152f" ], "author": { "name": "Dianne Hackborn", "email": "hackbod@google.com", "time": "Thu Oct 21 17:22:30 2010 -0700" }, "committer": { "name": "Dianne Hackborn", "email": "hackbod@google.com", "time": "Thu Oct 21 19:07:37 2010 -0700" }, "message": "Fix issue #3117918: No way to finish a native activity\n\nChange-Id: Ic53e712f7ab5412d72a31b96ecba252344b91644\n" }, { "commit": "46beb43357e32507189203db4626d0df954abe62", "tree": "9bf3e750957be3bfafe8b5bda50fe57c08093233", "parents": [ "d7cd560af506f75d07034c136bea09b409b4d408", "0c636055351f2e1d26138cf7b3bf3c82553e68c4" ], "author": { "name": "Mathias Agopian", "email": "mathias@google.com", "time": "Thu Oct 21 16:26:02 2010 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Thu Oct 21 16:26:02 2010 -0700" }, "message": "am 0c636055: Merge \"Mirror the preview for front-facing cameras. do not merge\" into gingerbread\n\nMerge commit \u00270c636055351f2e1d26138cf7b3bf3c82553e68c4\u0027 into gingerbread-plus-aosp\n\n* commit \u00270c636055351f2e1d26138cf7b3bf3c82553e68c4\u0027:\n Mirror the preview for front-facing cameras. do not merge\n" }, { "commit": "0c636055351f2e1d26138cf7b3bf3c82553e68c4", "tree": "c2a759cd036b39dd430c0d9a8d2c9878ce877df5", "parents": [ "1d79a9d9f85f932a1fd6dcddba335450b65ba4e6", "b982fb4fd36a3cd24a0bb17c964139fe4c9cbb47" ], "author": { "name": "Mathias Agopian", "email": "mathias@google.com", "time": "Thu Oct 21 16:20:07 2010 -0700" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Thu Oct 21 16:20:07 2010 -0700" }, "message": "Merge \"Mirror the preview for front-facing cameras. do not merge\" into gingerbread" }, { "commit": "8ad6335d2c22900de5b46460473495b5bcea9f99", "tree": "8d76c7c9abfbaac48d7ae8538d02ed6adbd334d5", "parents": [ "63ac8f5377833303a7f8c4d60f0d74daf903e6ea", "fa7a87fb4b3d25b0b6b0985d65848a144d28df26" ], "author": { "name": "James Dong", "email": "jdong@google.com", "time": "Wed Oct 20 21:28:38 2010 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Wed Oct 20 21:28:38 2010 -0700" }, "message": "am fa7a87fb: Merge \"File writer size estimation improvement\" into gingerbread\n\nMerge commit \u0027fa7a87fb4b3d25b0b6b0985d65848a144d28df26\u0027 into gingerbread-plus-aosp\n\n* commit \u0027fa7a87fb4b3d25b0b6b0985d65848a144d28df26\u0027:\n File writer size estimation improvement\n" }, { "commit": "b982fb4fd36a3cd24a0bb17c964139fe4c9cbb47", "tree": "1fe2daa156fed3a3d92f4a552397befda8438f18", "parents": [ "f4cd9be0390135269e22e42fd2e1fe61fdcf9863" ], "author": { "name": "Wu-cheng Li", "email": "wuchengli@google.com", "time": "Tue Oct 19 17:19:09 2010 +0800" }, "committer": { "name": "Wu-cheng Li", "email": "wuchengli@google.com", "time": "Wed Oct 20 18:29:18 2010 +0800" }, "message": "Mirror the preview for front-facing cameras. do not merge\n\nNow overlay does ROT_90 before FLIP_V or FLIP_H. It should be FLIP_V\nor FLIP_H first. The formula should be changed after overlay is fixed.\n\nbug:3059865\nChange-Id: Ie4366bf7f1fcac7383e8dfc74b1b865997bbbcc6\n" }, { "commit": "22b37fa6e0d7abbfa373e5fdf057fc6dcb2474ff", "tree": "06082fbe3f4c1c8f08aedbb01ad538d206e3f918", "parents": [ "f4cd9be0390135269e22e42fd2e1fe61fdcf9863" ], "author": { "name": "James Dong", "email": "jdong@google.com", "time": "Tue Oct 19 21:28:47 2010 -0700" }, "committer": { "name": "James Dong", "email": "jdong@google.com", "time": "Tue Oct 19 22:59:22 2010 -0700" }, "message": "File writer size estimation improvement\n\no Do not count the reserved space for moov if the meta data size is small\no Do not count the extra 1KB disturbing small file estimation.\no Reduce the default minimum reserved space from 4 KB to 3 KB.\no Estimate the moov size based on both duration AND file size limit is set\n and set it to the smaller estimated value.\n\nlow risk change\n\nbug - 3111983\n\nChange-Id: I6ac2adb979d8cc12d6b4f1813d000c989add0199\n" }, { "commit": "f2c406030874b355ca9e4e67cc0e3aff6103c23e", "tree": "cef3bae978fb412cb4d905dab3f989544aedc71e", "parents": [ "8b5161c2aed8637de9bffb1d81298d60ea237caf", "7689dd4928d1cc4080e43f83a523521b5ecf44e5" ], "author": { "name": "Jeff Brown", "email": "jeffbrown@google.com", "time": "Mon Oct 18 15:17:12 2010 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Mon Oct 18 15:17:12 2010 -0700" }, "message": "am 7689dd49: Merge \"Fix bug where home presses were not poking user activity.\" into gingerbread\n\nMerge commit \u00277689dd4928d1cc4080e43f83a523521b5ecf44e5\u0027 into gingerbread-plus-aosp\n\n* commit \u00277689dd4928d1cc4080e43f83a523521b5ecf44e5\u0027:\n Fix bug where home presses were not poking user activity.\n" }, { "commit": "e2fe69edc009a0e0348e5351cf83062224e011ac", "tree": "beb5873a0c09f8b6f5569ff158cadec5d5c69895", "parents": [ "45bd8303fe20f20843f5a76ddf42a5ace54add58" ], "author": { "name": "Jeff Brown", "email": "jeffbrown@google.com", "time": "Mon Oct 18 13:21:23 2010 -0700" }, "committer": { "name": "Jeff Brown", "email": "jeffbrown@google.com", "time": "Mon Oct 18 14:50:13 2010 -0700" }, "message": "Fix bug where home presses were not poking user activity.\n\nWe now poke user activity twice: once upon dequeueing an event\nfor dispatch and then again just before we dispatch it. The second\npoke is to compensate for the fact that it can take a few seconds to\nidentify the dispatch target (if the application is responding slowly)\nbut we want to keep the display from going to sleep for X amount of time\nafter the app gets a chance to actually receive the event. This mirrors\npre-Gingerbread behavior.\n\nRemoved some unnecessary code that filters user activity pokes when sending\nevents to KeyGuard. We don\u0027t need this because KeyGuard already tells the\npower manager to disable user activity.\n\nBug: 3101397\nChange-Id: I8c3a77601fdef8f584e84cfdd11aa79da0ff51db\n" }, { "commit": "9b2f18df2436b6c2d9735e65119b92f320bb57e2", "tree": "9cdb635b45b1f29b81ae5d517cf07f36b75a04bb", "parents": [ "ec62719c8396997b436c44906c2760e3914698b8", "bc96c2848dadaa844f95e89708d9941f73bbf400" ], "author": { "name": "Andreas Huber", "email": "andih@google.com", "time": "Mon Oct 18 11:50:19 2010 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Mon Oct 18 11:50:19 2010 -0700" }, "message": "am bc96c284: Merge \"For thumbnail extraction make sure we instantiate a decoder that allows access to the framebuffer. Implement the samsung workaround to support this by reconfiguring the decoder.\" into gingerbread\n\nMerge commit \u0027bc96c2848dadaa844f95e89708d9941f73bbf400\u0027 into gingerbread-plus-aosp\n\n* commit \u0027bc96c2848dadaa844f95e89708d9941f73bbf400\u0027:\n For thumbnail extraction make sure we instantiate a decoder that allows access to the framebuffer. Implement the samsung workaround to support this by reconfiguring the decoder.\n" }, { "commit": "5a40e394f1e6b0511542e171eaf4c3e5927efc13", "tree": "d83620f903022c1bc2b0087d71c2b257dd5a0719", "parents": [ "d1f7f4a68375f879671d300510f23d3ee78a500e" ], "author": { "name": "Andreas Huber", "email": "andih@google.com", "time": "Mon Oct 18 09:57:42 2010 -0700" }, "committer": { "name": "Andreas Huber", "email": "andih@google.com", "time": "Mon Oct 18 10:16:08 2010 -0700" }, "message": "For thumbnail extraction make sure we instantiate a decoder that allows access to the framebuffer. Implement the samsung workaround to support this by reconfiguring the decoder.\n\nrelated-to-bug: 3106534\nChange-Id: Ie28d72af2f9e93818d1840ac83aa7bc11fa57b3b\n" }, { "commit": "6ba052b4847d85831c38c9b8e2942cef4987e55b", "tree": "aa693582c047451f74ad1e45943684cde1f314ed", "parents": [ "bce520e6460e712c0985f12cf212e2d72fd1b9e4", "c1a564b108c511c0bdd699567c245b031930e718" ], "author": { "name": "Jeff Brown", "email": "jeffbrown@google.com", "time": "Fri Oct 15 18:40:39 2010 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Fri Oct 15 18:40:39 2010 -0700" }, "message": "am c1a564b1: Merge \"Add support for secure system overlays. (DO NOT MERGE)\" into gingerbread\n\nMerge commit \u0027c1a564b108c511c0bdd699567c245b031930e718\u0027 into gingerbread-plus-aosp\n\n* commit \u0027c1a564b108c511c0bdd699567c245b031930e718\u0027:\n Add support for secure system overlays. (DO NOT MERGE)\n" }, { "commit": "746c6a1c6d70769ee4b08b9a7b87d0c5aa65c2e4", "tree": "3512a5af553e8791f0f46f3142d7dabc3ffb449e", "parents": [ "13e46665ff69c1a37880762d7d611aacdf02dac7", "ff7a7a455c15077e2b691efa370619f06058f697" ], "author": { "name": "Andreas Huber", "email": "andih@google.com", "time": "Fri Oct 15 18:24:56 2010 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Fri Oct 15 18:24:56 2010 -0700" }, "message": "am ff7a7a45: Merge \"Check-in of a copy of the Khronos OpenMAX headers formerly included from external/opencore.\" into gingerbread\n\nMerge commit \u0027ff7a7a455c15077e2b691efa370619f06058f697\u0027 into gingerbread-plus-aosp\n\n* commit \u0027ff7a7a455c15077e2b691efa370619f06058f697\u0027:\n Check-in of a copy of the Khronos OpenMAX headers formerly included from external/opencore.\n" }, { "commit": "2d3f159aa9622e05a18e7f93cecd57ad673955ae", "tree": "8df18f80f44133f19ce9e669a36bdd785b31460a", "parents": [ "c9f7890a203a013646650a695157277df81b6a17" ], "author": { "name": "Jeff Brown", "email": "jeffbrown@google.com", "time": "Fri Oct 15 00:54:27 2010 -0700" }, "committer": { "name": "Jeff Brown", "email": "jeffbrown@google.com", "time": "Fri Oct 15 16:03:35 2010 -0700" }, "message": "Add support for secure system overlays. (DO NOT MERGE)\n\nThis change adds a new window type for secure system overlays\ncreated by the system itself from non-secure system overlays that\nmight be created by applications that have the system alert permission.\nSecure views ignore the presence of secure system overlays.\n\nBug: 3098519\nChange-Id: I8f8398f4fdeb0469e5d71124c21bedf121bd8c07\n" }, { "commit": "6ac35f059726cf60a364c1efd783a99c901f2d9d", "tree": "99b503aaf16306f2860d51037c014bfb5050e380", "parents": [ "e1f3976bb4eab0d7c46bc8596679d4d00695148c" ], "author": { "name": "Andreas Huber", "email": "andih@google.com", "time": "Fri Oct 15 13:30:27 2010 -0700" }, "committer": { "name": "Andreas Huber", "email": "andih@google.com", "time": "Fri Oct 15 13:30:27 2010 -0700" }, "message": "Check-in of a copy of the Khronos OpenMAX headers formerly included from external/opencore.\n\nChange-Id: Ie2ecf9558d4ee80cb5a2bbe66ad49f2165a7b09c\nrelated-to-bug: 3101573\n" }, { "commit": "5f0cbfcecc4db20f897507c826296b3aac70c592", "tree": "896363b3d748ce378f9b73909b01c9c63cbe1d14", "parents": [ "dc3ad87c04348c925aa86863ed6d25f18a8c6c36", "c1e7b2182594aa0463c4a738cc8e7eea6777ef50" ], "author": { "name": "Jeff Brown", "email": "jeffbrown@google.com", "time": "Fri Oct 15 01:31:14 2010 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Fri Oct 15 01:31:14 2010 -0700" }, "message": "am c1e7b218: Merge \"Improve input device calibration format.\" into gingerbread\n\nMerge commit \u0027c1e7b2182594aa0463c4a738cc8e7eea6777ef50\u0027 into gingerbread-plus-aosp\n\n* commit \u0027c1e7b2182594aa0463c4a738cc8e7eea6777ef50\u0027:\n Improve input device calibration format.\n" }, { "commit": "c1e7b2182594aa0463c4a738cc8e7eea6777ef50", "tree": "ac17b21bb33a8844756a72c662d76d4f5ba31317", "parents": [ "78a76fea28b8101c1860a2f1115329e3e63abda3", "c6d282bb8223ed21666878f71c5a55013ee37805" ], "author": { "name": "Jeff Brown", "email": "jeffbrown@google.com", "time": "Fri Oct 15 01:15:08 2010 -0700" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Fri Oct 15 01:15:08 2010 -0700" }, "message": "Merge \"Improve input device calibration format.\" into gingerbread" }, { "commit": "dc3ad87c04348c925aa86863ed6d25f18a8c6c36", "tree": "bbfc1757df259991362a3159742cd8147c820a56", "parents": [ "ebad42d6d35dc0dc07fe89650268453dbdff8a79", "78a76fea28b8101c1860a2f1115329e3e63abda3" ], "author": { "name": "Jeff Brown", "email": "jeffbrown@google.com", "time": "Thu Oct 14 22:21:40 2010 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Thu Oct 14 22:21:40 2010 -0700" }, "message": "am 78a76fea: Merge \"Revert to using epoll_wait().\" into gingerbread\n\nMerge commit \u002778a76fea28b8101c1860a2f1115329e3e63abda3\u0027 into gingerbread-plus-aosp\n\n* commit \u002778a76fea28b8101c1860a2f1115329e3e63abda3\u0027:\n Revert to using epoll_wait().\n" }, { "commit": "78a76fea28b8101c1860a2f1115329e3e63abda3", "tree": "c4e75c2b58ff80abd29db1527e45d8d034d13d8c", "parents": [ "3fbfee2febf13bcc46c389ebecbf91465ef211b7", "a97e50f20d39d2abf0fab77090dd82bdef4bce7a" ], "author": { "name": "Jeff Brown", "email": "jeffbrown@google.com", "time": "Thu Oct 14 22:18:43 2010 -0700" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Thu Oct 14 22:18:43 2010 -0700" }, "message": "Merge \"Revert to using epoll_wait().\" into gingerbread" }, { "commit": "c6d282bb8223ed21666878f71c5a55013ee37805", "tree": "0638ca8d0a5801ee0a5f5fb80ad1d654d4825a55", "parents": [ "75d3591b2dd60e50182542045147b9b6033c2b85" ], "author": { "name": "Jeff Brown", "email": "jeffbrown@google.com", "time": "Thu Oct 14 21:42:15 2010 -0700" }, "committer": { "name": "Jeff Brown", "email": "jeffbrown@google.com", "time": "Thu Oct 14 21:44:16 2010 -0700" }, "message": "Improve input device calibration format.\n\nAdded support for calibrating touch size for devices that report\nsize as an area measurement rather than as a width.\nFixed some bugs.\n\nBug: 3096045\nChange-Id: I30a12e73752883516ed054f8af407204bca45814\n" }, { "commit": "7e9a54d460030a871a4f05e61e943c6a694e9ef8", "tree": "bf9ceeac3814d10936174d73ee85b586b633095e", "parents": [ "a8faf91fa558be1235d508e776eb24be4429585c", "d4e03f37423bee383d17f7292753a5f67e497a28" ], "author": { "name": "Mathias Agopian", "email": "mathias@google.com", "time": "Thu Oct 14 15:17:16 2010 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Thu Oct 14 15:17:16 2010 -0700" }, "message": "am d4e03f37: addresses parts of 3096779 and 3097475\n\nMerge commit \u0027d4e03f37423bee383d17f7292753a5f67e497a28\u0027 into gingerbread-plus-aosp\n\n* commit \u0027d4e03f37423bee383d17f7292753a5f67e497a28\u0027:\n addresses parts of 3096779 and 3097475\n" }, { "commit": "d4e03f37423bee383d17f7292753a5f67e497a28", "tree": "c559d99f0e6c6fda2621c6809b20ffadfc7bcda2", "parents": [ "6d71f6a0ae9fd81ce25562aee67f841b5d8394cf" ], "author": { "name": "Mathias Agopian", "email": "mathias@google.com", "time": "Thu Oct 14 14:54:06 2010 -0700" }, "committer": { "name": "Mathias Agopian", "email": "mathias@google.com", "time": "Thu Oct 14 14:57:34 2010 -0700" }, "message": "addresses parts of 3096779 and 3097475\n\n3097475: Animation setting should control the screen on animation\n3096779: CRT power-on animation can briefly show the top app instead of lockscreen\n\nThere is now a parameter that controls wether the ON and/or OFF animation are\nperformed. we also always clear the screen to black on power off, to make\nsure it won\u0027t briefly appear on power on.\nHOWEVER, 3096779 is not 100% fixed in the case where we\u0027re doing the animation\nbecause there is a race, where SF doesn\u0027t wait (b/c it doesn\u0027t know) for the\nframework to have redrawn the lockscreen.\n\nChange-Id: Ie0f02c9225fcdf24b1e8907e268eb7da2c5b0a03\n" }, { "commit": "8fda1636e3e35f060b9046294efd3c062a1fdb84", "tree": "9c5d4cb8df12357a067f5214eb2f3dbd08d252ca", "parents": [ "e3c50a5470f64fd99438d6fd985f88d9fe20919a", "bdf8034c657147226b2390eef113ff841e0d6065" ], "author": { "name": "Kenny Root", "email": "kroot@google.com", "time": "Wed Oct 13 22:54:10 2010 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Wed Oct 13 22:54:10 2010 -0700" }, "message": "am bdf8034c: Merge \"OBB: use PBKDF2 for key generation.\" into gingerbread\n\nMerge commit \u0027bdf8034c657147226b2390eef113ff841e0d6065\u0027 into gingerbread-plus-aosp\n\n* commit \u0027bdf8034c657147226b2390eef113ff841e0d6065\u0027:\n OBB: use PBKDF2 for key generation.\n" }, { "commit": "bdf8034c657147226b2390eef113ff841e0d6065", "tree": "58be0affeafef6d38ef9e53744af1aaf1a7a8fa8", "parents": [ "cebe5b2e01f8ebbf9089aebc386caecea232df76", "3b1abba6bbc895d63da3e82e9b158c01bd12eddd" ], "author": { "name": "Kenny Root", "email": "kroot@google.com", "time": "Wed Oct 13 18:29:43 2010 -0700" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Wed Oct 13 18:29:43 2010 -0700" }, "message": "Merge \"OBB: use PBKDF2 for key generation.\" into gingerbread" }, { "commit": "3b1abba6bbc895d63da3e82e9b158c01bd12eddd", "tree": "1296e8c25a2927c94783eda83100c061fc9fe379", "parents": [ "dfc07279fc6205c38f5f39cb5ba4f0aef6b593a4" ], "author": { "name": "Kenny Root", "email": "kroot@google.com", "time": "Wed Oct 13 15:00:07 2010 -0700" }, "committer": { "name": "Kenny Root", "email": "kroot@google.com", "time": "Wed Oct 13 18:25:33 2010 -0700" }, "message": "OBB: use PBKDF2 for key generation.\n\nSwitch to using PBKDF2 for the key generation for OBBs. Any previously\ngenerated OBBs will stop being read correctly. A small pbkdf2gen program\nis available to allow generation of appropriate keys with the salts.\n\nBug: 3059950\nChange-Id: If4305c989fd692fd1150eb270dbf751e09c37295\n" }, { "commit": "5bfa3a34eaef759c3ec4def76f646eb1c0bf997f", "tree": "db253b21d2e04cb6a1c74007eaf595d6edfbd864", "parents": [ "27c7fb1a861776b4fdc2632697e4e25eee83617f", "011b5bcc0355338b7ff906656282a54ffaa04b5a" ], "author": { "name": "Mathias Agopian", "email": "mathias@google.com", "time": "Wed Oct 13 15:59:42 2010 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Wed Oct 13 15:59:42 2010 -0700" }, "message": "am 011b5bcc: Merge \"implement part of [3094280] New animation for screen on and screen off add support for screen on animation\" into gingerbread\n\nMerge commit \u0027011b5bcc0355338b7ff906656282a54ffaa04b5a\u0027 into gingerbread-plus-aosp\n\n* commit \u0027011b5bcc0355338b7ff906656282a54ffaa04b5a\u0027:\n implement part of [3094280] New animation for screen on and screen off\n" }, { "commit": "011b5bcc0355338b7ff906656282a54ffaa04b5a", "tree": "9f6d7c04c957756d2ce6f87dceab45e135e7dff3", "parents": [ "90d59d180bd963f00161e6bfaabfda432960cab6", "2d2b803a92ba531cf6c4bb7042326653255b8780" ], "author": { "name": "Mathias Agopian", "email": "mathias@google.com", "time": "Wed Oct 13 15:55:57 2010 -0700" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Wed Oct 13 15:55:57 2010 -0700" }, "message": "Merge \"implement part of [3094280] New animation for screen on and screen off add support for screen on animation\" into gingerbread" }, { "commit": "2d2b803a92ba531cf6c4bb7042326653255b8780", "tree": "4f9bfc77e4850d74b260dff622d03a175add6840", "parents": [ "e03471e12f1adcd818b5bfd9dcb894c75fe955c5" ], "author": { "name": "Mathias Agopian", "email": "mathias@google.com", "time": "Tue Oct 12 16:05:48 2010 -0700" }, "committer": { "name": "Mathias Agopian", "email": "mathias@google.com", "time": "Wed Oct 13 14:28:26 2010 -0700" }, "message": "implement part of [3094280] New animation for screen on and screen off\nadd support for screen on animation\n\nChange-Id: If50cf52ae04b95b42da7d74cf7fa96d5cb54d238\n" }, { "commit": "a127c07c42b8961881f460eb8e6a6b722139e3b9", "tree": "1c0168e56514c3afdf64d8098f68009f6a3c54ac", "parents": [ "28b93967d0e702304c7edec854a29d5ab88bfce0", "312644cdbb39522fe9cac028b15b907ce0e8e0f7" ], "author": { "name": "Andreas Huber", "email": "andih@google.com", "time": "Wed Oct 13 09:19:28 2010 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Wed Oct 13 09:19:28 2010 -0700" }, "message": "am 312644cd: Merge \"Support for writing to MPEG2 transport stream files.\" into gingerbread\n\nMerge commit \u0027312644cdbb39522fe9cac028b15b907ce0e8e0f7\u0027 into gingerbread-plus-aosp\n\n* commit \u0027312644cdbb39522fe9cac028b15b907ce0e8e0f7\u0027:\n Support for writing to MPEG2 transport stream files.\n" }, { "commit": "28b93967d0e702304c7edec854a29d5ab88bfce0", "tree": "454ead6bcaee4e07f39d13901e7fee7426fb7cdc", "parents": [ "c7ee44cbe155c2272687a0e82133f3e729eac137", "165c6579660c22edafb61fee2a0cf39334a2a905" ], "author": { "name": "Andreas Huber", "email": "andih@google.com", "time": "Wed Oct 13 09:17:13 2010 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Wed Oct 13 09:17:13 2010 -0700" }, "message": "am 165c6579: Merge \"HTTP Live content that are tagged as complete are now seekable.\" into gingerbread\n\nMerge commit \u0027165c6579660c22edafb61fee2a0cf39334a2a905\u0027 into gingerbread-plus-aosp\n\n* commit \u0027165c6579660c22edafb61fee2a0cf39334a2a905\u0027:\n HTTP Live content that are tagged as complete are now seekable.\n" }, { "commit": "312644cdbb39522fe9cac028b15b907ce0e8e0f7", "tree": "97dd25e42b1a0ccc607cdbbc60368b833c44a71e", "parents": [ "165c6579660c22edafb61fee2a0cf39334a2a905", "9adf466021d37a5062d7d3361e14bfd9e7ffeba6" ], "author": { "name": "Andreas Huber", "email": "andih@google.com", "time": "Wed Oct 13 09:14:40 2010 -0700" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Wed Oct 13 09:14:40 2010 -0700" }, "message": "Merge \"Support for writing to MPEG2 transport stream files.\" into gingerbread" }, { "commit": "165c6579660c22edafb61fee2a0cf39334a2a905", "tree": "431676c9a9c20d9a2c33041c61f348dce2143e33", "parents": [ "dfc07279fc6205c38f5f39cb5ba4f0aef6b593a4", "54d09724e3ea2af4e08dff47d7ade92a95784127" ], "author": { "name": "Andreas Huber", "email": "andih@google.com", "time": "Wed Oct 13 09:14:13 2010 -0700" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Wed Oct 13 09:14:13 2010 -0700" }, "message": "Merge \"HTTP Live content that are tagged as complete are now seekable.\" into gingerbread" }, { "commit": "9adf466021d37a5062d7d3361e14bfd9e7ffeba6", "tree": "32065c7763d46863e76d9f78ba4c76f0117ff2dc", "parents": [ "a7c76d8307a3b49bf5b8fdda3543455b0e5dd64c" ], "author": { "name": "Andreas Huber", "email": "andih@google.com", "time": "Tue Oct 12 14:17:45 2010 -0700" }, "committer": { "name": "Andreas Huber", "email": "andih@google.com", "time": "Tue Oct 12 16:05:23 2010 -0700" }, "message": "Support for writing to MPEG2 transport stream files.\n\nChange-Id: If3b7a807bc224a4b1cb2236537c3ebdc5aee0d97\n" }, { "commit": "9a12a3c8d4bb20042cf69e07d268e3a04ac71f96", "tree": "8077adbd81854c5b5571b57a5f9d20f28d92ca75", "parents": [ "090ac9f7dd883aa75c899745182471d409a2b762", "ba799098608c7be8ff1e18adfa7dc1f452205a7e" ], "author": { "name": "Joe Onorato", "email": "joeo@google.com", "time": "Tue Oct 12 14:46:23 2010 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Tue Oct 12 14:46:23 2010 -0700" }, "message": "am ba799098: Merge changes I76513387,I335fb671 into gingerbread\n\nMerge commit \u0027ba799098608c7be8ff1e18adfa7dc1f452205a7e\u0027 into gingerbread-plus-aosp\n\n* commit \u0027ba799098608c7be8ff1e18adfa7dc1f452205a7e\u0027:\n Remove dead code, and make the animation a setting.\n turn off the electron beam\n" }, { "commit": "54d09724e3ea2af4e08dff47d7ade92a95784127", "tree": "6cc008b4a8acb1ee7f47e3748baa2826257e61ce", "parents": [ "a7c76d8307a3b49bf5b8fdda3543455b0e5dd64c" ], "author": { "name": "Andreas Huber", "email": "andih@google.com", "time": "Tue Oct 12 11:34:37 2010 -0700" }, "committer": { "name": "Andreas Huber", "email": "andih@google.com", "time": "Tue Oct 12 14:32:10 2010 -0700" }, "message": "HTTP Live content that are tagged as complete are now seekable.\n\nChange-Id: I9d0d2f009f883e5baf3e9de8c5c0aa05760e4bde\nrelated-to-bug: 2368598\n" }, { "commit": "aab758e87991d1460ca94d4a5f22c0ef34641e2d", "tree": "560d9e47119175b6a5618dd16d9d9ac4a92145fd", "parents": [ "844a6b3ccaff1ad1443ad985e4527b733ce97c0e" ], "author": { "name": "Mathias Agopian", "email": "mathias@google.com", "time": "Mon Oct 11 12:37:43 2010 -0700" }, "committer": { "name": "Joe Onorato", "email": "joeo@android.com", "time": "Tue Oct 12 14:16:11 2010 -0700" }, "message": "turn off the electron beam\n\nChange-Id: I335fb6719f1d5a3f1c6f37a046fd1c2c4ed2bbc6\n" }, { "commit": "8bb7a1dfbb43dda49fb3c4f86181bcd7f969a832", "tree": "0eb8b8355abedba7b083d5ef547893ed66d3d56a", "parents": [ "0ad4a77cb78348951c349ba92ec858bfb26aeb33", "b4de3dca96b9ff18562062e181dcd8b83e641e45" ], "author": { "name": "Kenny Root", "email": "kroot@google.com", "time": "Mon Oct 11 17:31:06 2010 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Mon Oct 11 17:31:06 2010 -0700" }, "message": "am b4de3dca: Merge \"OBB: rearrange to be entirely asynchronous\" into gingerbread\n\nMerge commit \u0027b4de3dca96b9ff18562062e181dcd8b83e641e45\u0027 into gingerbread-plus-aosp\n\n* commit \u0027b4de3dca96b9ff18562062e181dcd8b83e641e45\u0027:\n OBB: rearrange to be entirely asynchronous\n" }, { "commit": "f2e0681ada3ffe1de994a51dcebd6ef045d27434", "tree": "c6f8e837d2091a890fb3d9d2882b3a534b190625", "parents": [ "d965724fdcc63a070657518542559a8b1a35a70d", "1da8d4d1697cec871dea8c30dad67e90db10bde6" ], "author": { "name": "Jeff Brown", "email": "jeffbrown@google.com", "time": "Mon Oct 11 17:26:51 2010 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Mon Oct 11 17:26:51 2010 -0700" }, "message": "am 1da8d4d1: Merge \"Fix an event injection bug when the policy is bypassed.\" into gingerbread\n\nMerge commit \u00271da8d4d1697cec871dea8c30dad67e90db10bde6\u0027 into gingerbread-plus-aosp\n\n* commit \u00271da8d4d1697cec871dea8c30dad67e90db10bde6\u0027:\n Fix an event injection bug when the policy is bypassed.\n" }, { "commit": "b4de3dca96b9ff18562062e181dcd8b83e641e45", "tree": "b2e8b6060e1dbea173de867e5258add9b08ef8f3", "parents": [ "1169f420f6df5cf5254fed883efa7e6780473c08", "af9d667ccf3e24058214cf4cc0a8aa8bc5100e3c" ], "author": { "name": "Kenny Root", "email": "kroot@google.com", "time": "Mon Oct 11 17:24:54 2010 -0700" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Mon Oct 11 17:24:54 2010 -0700" }, "message": "Merge \"OBB: rearrange to be entirely asynchronous\" into gingerbread" }, { "commit": "af9d667ccf3e24058214cf4cc0a8aa8bc5100e3c", "tree": "c59adbe6d27cf236d6920f689dd237a115fef3f9", "parents": [ "ce2f1909c74a1b90995f06a865d21260b062300b" ], "author": { "name": "Kenny Root", "email": "kroot@google.com", "time": "Fri Oct 08 09:21:39 2010 -0700" }, "committer": { "name": "Kenny Root", "email": "kroot@google.com", "time": "Mon Oct 11 17:22:03 2010 -0700" }, "message": "OBB: rearrange to be entirely asynchronous\n\nRearrange structure of MountService handling of OBBs to be entirely\nasynchronous so we don\u0027t rely on locking as much. We still need the\nlocking to support dumpsys which has been improved to output all the\ndata structures for OBBs.\n\nAdded more tests to cover more of the error return codes.\n\nOh and fix a logic inversion bug.\n\nChange-Id: I34f541192dbbb1903b24825889b8fa8f43e6e2a9\n" }, { "commit": "b931a1b4183386ba840edc1bcc507eccf11b5cbe", "tree": "f9e1ba1030d392ab288ad13e5eaba32c65a96c76", "parents": [ "b699726018a0049665d8ad6b90dbc5af0e18f135" ], "author": { "name": "Jeff Brown", "email": "jeffbrown@google.com", "time": "Mon Oct 11 14:20:19 2010 -0700" }, "committer": { "name": "Jeff Brown", "email": "jeffbrown@google.com", "time": "Mon Oct 11 16:26:13 2010 -0700" }, "message": "Fix an event injection bug when the policy is bypassed.\n\nAdded the concept of a \"trusted\" event to distinguish between events from\nattached input devices or trusted injectors vs. other applications.\nThis change enables us to move certain policy decisions out of the\ndispatcher and into the policy itself where they can be handled more\nsystematically.\n\nChange-Id: I4d56fdcdd31aaa675d452088af39a70c4e039970\n" }, { "commit": "41aabeb51305d19747687f246080f44fc2a74435", "tree": "98ac58495ec40abed5b08de8a1a2563ce93edb5b", "parents": [ "0acb0d7a4b9cb684bff6e70b4c41002fb45adc04", "1e6a3a53fc4d56e3a0f86c8721dedfd46e738a32" ], "author": { "name": "Jeff Brown", "email": "jeffbrown@google.com", "time": "Sun Oct 10 14:50:38 2010 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Sun Oct 10 14:50:38 2010 -0700" }, "message": "am 1e6a3a53: Merge \"Added more robust tracking and cancelation of events.\" into gingerbread\n\nMerge commit \u00271e6a3a53fc4d56e3a0f86c8721dedfd46e738a32\u0027 into gingerbread-plus-aosp\n\n* commit \u00271e6a3a53fc4d56e3a0f86c8721dedfd46e738a32\u0027:\n Added more robust tracking and cancelation of events.\n" }, { "commit": "b699726018a0049665d8ad6b90dbc5af0e18f135", "tree": "e711b4de7efbb4473306a208befe0e834d90c39b", "parents": [ "db56b9bd39e739474684987b83f386f50596aa5d" ], "author": { "name": "Jeff Brown", "email": "jeffbrown@google.com", "time": "Fri Oct 08 22:31:17 2010 -0700" }, "committer": { "name": "Jeff Brown", "email": "jeffbrown@google.com", "time": "Sun Oct 10 14:45:51 2010 -0700" }, "message": "Added more robust tracking and cancelation of events.\n\nThis change fixes several issues where events would be dropped in the\ninput dispatch pipeline in such a way that the dispatcher could not\naccurately track the state of the input device.\n\nGiven more robust tracking, we can now also provide robust cancelation\nof input events in cases where an application might otherwise become\nout of sync with the event stream due to ANR, app switch, policy decisions,\nor forced focus transitions.\n\nPruned some of the input dispatcher log output.\n\nMoved the responsibility for calling intercept*BeforeQueueing into\nthe input dispatcher instead of the input reader and added support for\nearly interception of injected events for events coming from trusted\nsources. This enables behaviors like injection of media keys while\nthe screen is off, haptic feedback of injected virtual keys, so injected\nevents become more \"first class\" in a way.\n\nChange-Id: Iec6ff1dd21e5f3c7feb80ea4feb5382bd090dbd9\n" }, { "commit": "2b4f1f4cb814f7a7df8d2cb9fcb5210bfe7999c7", "tree": "398decc9b6a98cf073b75b230dbcd550363b7e3e", "parents": [ "5dcf588a81a59142985736d8bb0430586f68ec08", "f72dd0190ee64914161d361be1213eda8cab7b90" ], "author": { "name": "Andreas Huber", "email": "andih@google.com", "time": "Fri Oct 08 11:18:03 2010 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Fri Oct 08 11:18:03 2010 -0700" }, "message": "am f72dd019: Merge \"Disable 10secs forward/backward seeking for rtsp as seek is a very expensive operation there. Decouple the 10sec forward/backward button functionality from seekbar functionality.\" into gingerbread\n\nMerge commit \u0027f72dd0190ee64914161d361be1213eda8cab7b90\u0027 into gingerbread-plus-aosp\n\n* commit \u0027f72dd0190ee64914161d361be1213eda8cab7b90\u0027:\n Disable 10secs forward/backward seeking for rtsp as seek is a very expensive operation there. Decouple the 10sec forward/backward button functionality from seekbar functionality.\n" }, { "commit": "f72dd0190ee64914161d361be1213eda8cab7b90", "tree": "7d3193050b07d2c017ec6df20278038b02119f7b", "parents": [ "b9bf545774b1f1dbd35c34c4060a6ebdd2bc843c", "10b9b3f3fe47cea0833fe2c7d5ed08a1185f9006" ], "author": { "name": "Andreas Huber", "email": "andih@google.com", "time": "Fri Oct 08 11:16:07 2010 -0700" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Fri Oct 08 11:16:07 2010 -0700" }, "message": "Merge \"Disable 10secs forward/backward seeking for rtsp as seek is a very expensive operation there. Decouple the 10sec forward/backward button functionality from seekbar functionality.\" into gingerbread" }, { "commit": "10b9b3f3fe47cea0833fe2c7d5ed08a1185f9006", "tree": "db45ecb6b04d3acaf38d3cd8871ed70ef8c5bbe9", "parents": [ "bb245d35b6e81d750a91815543973b0a5976352b" ], "author": { "name": "Andreas Huber", "email": "andih@google.com", "time": "Fri Oct 08 10:16:24 2010 -0700" }, "committer": { "name": "Andreas Huber", "email": "andih@google.com", "time": "Fri Oct 08 10:16:24 2010 -0700" }, "message": "Disable 10secs forward/backward seeking for rtsp as seek is a very expensive operation there. Decouple the 10sec forward/backward button functionality from seekbar functionality.\n\nChange-Id: I016e79b688774f8ee91ac53216197b5fb9cb41b2\nrelated-to-bug: 3073955\n" }, { "commit": "4f21e517d09b9d793d20d64547df330fba705b3c", "tree": "872e144dacbf5668fd8012c937f1feddb06cf0c9", "parents": [ "d96a068cc7b3519a5b7d122a12025684b6f28c76", "b37fcbfd7f9d65b90b43e0242903030c5a6517b5" ], "author": { "name": "Eric Laurent", "email": "elaurent@google.com", "time": "Fri Oct 08 08:30:03 2010 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Fri Oct 08 08:30:03 2010 -0700" }, "message": "am b37fcbfd: Merge \"Added getter for session Id to AudioSink\" into gingerbread\n\nMerge commit \u0027b37fcbfd7f9d65b90b43e0242903030c5a6517b5\u0027 into gingerbread-plus-aosp\n\n* commit \u0027b37fcbfd7f9d65b90b43e0242903030c5a6517b5\u0027:\n Added getter for session Id to AudioSink\n" }, { "commit": "b3bdf3f0086f1d921720f6dc92cabc7b6f2ab63e", "tree": "21f02868e4a39ef36117dc7e0724e0ad5adf1247", "parents": [ "36a182870527f1d71f482e9a280bc818a4609cb6" ], "author": { "name": "Eric Laurent", "email": "elaurent@google.com", "time": "Thu Oct 07 18:23:03 2010 -0700" }, "committer": { "name": "Eric Laurent", "email": "elaurent@google.com", "time": "Thu Oct 07 18:23:03 2010 -0700" }, "message": "Added getter for session Id to AudioSink\n\nAdded a method to expose the audio session id at AudioSink interface\nso that the AudioPlayer in stagefright can retrieve it.\n\nAlso:\n- Fixed audio effect send level not being initialized in mediaplayer.\n- Fixed compilation error when LOGV is enabled in mediaplayer JNI\n\nChange-Id: I4bb55454fd63d646e0e677692d737c4843fb05fb\n" }, { "commit": "a97e50f20d39d2abf0fab77090dd82bdef4bce7a", "tree": "27e8025752321b42eccd5611a827bf075395b14f", "parents": [ "d577cfd73a223279f9a5af698f55edd38a3fe4db" ], "author": { "name": "Jeff Brown", "email": "jeffbrown@google.com", "time": "Thu Oct 07 16:17:57 2010 -0700" }, "committer": { "name": "Jeff Brown", "email": "jeffbrown@google.com", "time": "Thu Oct 07 16:17:57 2010 -0700" }, "message": "Revert to using epoll_wait().\n\nThis change depends on the kernel having been patched to use hrtimers\ninstead of jiffies for scheduling epoll timeouts.\n\nChange-Id: I216bc1c4f565e67ebcb3d2ba4280cb615932bb9e\n" }, { "commit": "22cb4ef8ce9c4d5536ac5cee5c40b82bfa56ccc5", "tree": "e725626a428d290ad091d2618c9c4f0694f4dd0a", "parents": [ "9580b8ce6553ddde03db594fd4fd4f59ca61c382", "d577cfd73a223279f9a5af698f55edd38a3fe4db" ], "author": { "name": "Jeff Brown", "email": "jeffbrown@google.com", "time": "Thu Oct 07 15:46:57 2010 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Thu Oct 07 15:46:57 2010 -0700" }, "message": "am d577cfd7: Merge \"Switch Looper back to using poll() instead of epoll().\" into gingerbread\n\nMerge commit \u0027d577cfd73a223279f9a5af698f55edd38a3fe4db\u0027 into gingerbread-plus-aosp\n\n* commit \u0027d577cfd73a223279f9a5af698f55edd38a3fe4db\u0027:\n Switch Looper back to using poll() instead of epoll().\n" }, { "commit": "9580b8ce6553ddde03db594fd4fd4f59ca61c382", "tree": "bac634abd9cb09389028cbc9c3c2d80adbb7f3d2", "parents": [ "bb70837397e3fb437b7b4443b37d7a83c11e6e43", "e6ad0e477b5d4326487059e5d6c4697f97accbd1" ], "author": { "name": "Gloria Wang", "email": "gwang@google.com", "time": "Thu Oct 07 15:27:17 2010 -0700" }, "committer": { "name": "Jean-Baptiste Queru", "email": "jbq@google.com", "time": "Thu Oct 07 15:27:17 2010 -0700" }, "message": "resolved conflicts for merge of e6ad0e47 to gingerbread-plus-aosp\n\nChange-Id: I63b00932b0f8b975da31aa9a010369db2d49fd76\n" }, { "commit": "bb70837397e3fb437b7b4443b37d7a83c11e6e43", "tree": "c99194c9284fffd07e07f8cf7f8daf2adef5692e", "parents": [ "51501aa8703c15c6156ba14774f3ff41cde31700", "949f7d9066e09768e570686a5695aaba4a1dafd0" ], "author": { "name": "Andreas Huber", "email": "andih@google.com", "time": "Thu Oct 07 14:02:26 2010 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Thu Oct 07 14:02:26 2010 -0700" }, "message": "am 949f7d90: Merge \"Work to support switching transport streams mid-stream and signalling discontinuities to the decoder.\" into gingerbread\n\nMerge commit \u0027949f7d9066e09768e570686a5695aaba4a1dafd0\u0027 into gingerbread-plus-aosp\n\n* commit \u0027949f7d9066e09768e570686a5695aaba4a1dafd0\u0027:\n Work to support switching transport streams mid-stream and signalling discontinuities to the decoder.\n" }, { "commit": "45bd1159fa34b51ba077e0cde760d171ca092552", "tree": "679c5f55c40aa310039761a7f22bb861d648b9c4", "parents": [ "c0c2076e9a4dfd3b30b988d4ddd78abf9ed83166", "02654f01bc6bd2e581b4a1d2409ecea217294fa2" ], "author": { "name": "Andreas Huber", "email": "andih@google.com", "time": "Thu Oct 07 14:02:01 2010 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Thu Oct 07 14:02:01 2010 -0700" }, "message": "am 02654f01: Merge \"On this particular device the hardware video decoder spits out buffers that don\\\u0027t actually contain our video data, so we cannot use them to restore the video frame after suspend/resume.\" into gingerbread\n\nMerge commit \u002702654f01bc6bd2e581b4a1d2409ecea217294fa2\u0027 into gingerbread-plus-aosp\n\n* commit \u002702654f01bc6bd2e581b4a1d2409ecea217294fa2\u0027:\n On this particular device the hardware video decoder spits out buffers that don\u0027t actually contain our video data, so we cannot use them to restore the video frame after suspend/resume.\n" }, { "commit": "d577cfd73a223279f9a5af698f55edd38a3fe4db", "tree": "30533a98b61ae7846db76ff39c91f73980ffda2e", "parents": [ "949f7d9066e09768e570686a5695aaba4a1dafd0", "415d8c38199e258dfce92cdb0c69e056b3b51ef8" ], "author": { "name": "Jeff Brown", "email": "jeffbrown@google.com", "time": "Thu Oct 07 13:29:56 2010 -0700" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Thu Oct 07 13:29:56 2010 -0700" }, "message": "Merge \"Switch Looper back to using poll() instead of epoll().\" into gingerbread" }, { "commit": "415d8c38199e258dfce92cdb0c69e056b3b51ef8", "tree": "5bf6d167a19b272f2a153df6010a7dd6f58a274f", "parents": [ "930d6c3cd5ad387489eb1d35a38beeafe54166b6" ], "author": { "name": "Jeff Brown", "email": "jeffbrown@google.com", "time": "Tue Oct 05 15:35:37 2010 -0700" }, "committer": { "name": "Jeff Brown", "email": "jeffbrown@google.com", "time": "Thu Oct 07 13:26:39 2010 -0700" }, "message": "Switch Looper back to using poll() instead of epoll().\n\nAdded a couple of micro-optimizations to avoid calling wake() unnecessarily\nand reduce JNI overhead slightly.\n\nFixed a minor issue where we were not clearing the \"next\" field of Messages\nreturned by the MessageQueue so the Message would hold on to its successor\nand potentially prevent the GC from collecting it if the message were leaked\nsomehow.\n\nChange-Id: I488d29417ce0cdd7d0e447cda76ec978ef7f811c\n" }, { "commit": "4c19bf9833f59f58a9aaea566f0eb98a7fb7e2ea", "tree": "98365cbdcad2ebb3095dcb71afdece89fc13ed07", "parents": [ "02654f01bc6bd2e581b4a1d2409ecea217294fa2" ], "author": { "name": "Andreas Huber", "email": "andih@google.com", "time": "Wed Sep 08 14:32:20 2010 -0700" }, "committer": { "name": "Andreas Huber", "email": "andih@google.com", "time": "Thu Oct 07 11:41:43 2010 -0700" }, "message": "Work to support switching transport streams mid-stream and signalling discontinuities to the decoder.\n\nChange-Id: I7150e5e7342e1117c524856b204aadcb763e06ed\nrelated-to-bug: 2368598\n" }, { "commit": "1e1941638398e5e3e1d7b9ad88e66f574576bcfa", "tree": "e6c89a82b8298503ff96a891e706a55d48c0d574", "parents": [ "f8d2acdc57fd747278bb909c9e15b959e07d63b6" ], "author": { "name": "Andreas Huber", "email": "andih@google.com", "time": "Wed Oct 06 16:43:57 2010 -0700" }, "committer": { "name": "Andreas Huber", "email": "andih@google.com", "time": "Thu Oct 07 09:19:25 2010 -0700" }, "message": "On this particular device the hardware video decoder spits out buffers that don\u0027t actually contain our video data, so we cannot use them to restore the video frame after suspend/resume.\n\nChange-Id: I1b8fe68c1766299844fe84ebbff49cb8b3e4cc7c\nrelated-to-bug: 3070094\n" }, { "commit": "56ee1080f004110bff622e5b60c243d9cabfe120", "tree": "afd1e67174d27ee1c67e751004b1e05009cdbfa8", "parents": [ "cfc80bd5c1e4f0207357b288b1b7b8374a31ba70", "17bc4f65324a823598e7671256c815bf32ddcc95" ], "author": { "name": "Andreas Huber", "email": "andih@google.com", "time": "Tue Oct 05 14:13:16 2010 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Tue Oct 05 14:13:16 2010 -0700" }, "message": "am 17bc4f65: Merge \"Make sure to call AudioTrack::stop() instead of AudioTrack::pause() after submitting all samples to AudioTrack to make sure those remaining samples are actually played out.\" into gingerbread\n\nMerge commit \u002717bc4f65324a823598e7671256c815bf32ddcc95\u0027 into gingerbread-plus-aosp\n\n* commit \u002717bc4f65324a823598e7671256c815bf32ddcc95\u0027:\n Make sure to call AudioTrack::stop() instead of AudioTrack::pause() after submitting all samples to AudioTrack to make sure those remaining samples are actually played out.\n" }, { "commit": "c743f4506f88a14189449c719a6ec1cfe5f0f812", "tree": "f69dfc65287acea092d8769ca3e6f907567a4b6b", "parents": [ "78d15acfb20269ce263ce19514a2c0e7a98409e2" ], "author": { "name": "Andreas Huber", "email": "andih@google.com", "time": "Tue Oct 05 10:25:34 2010 -0700" }, "committer": { "name": "Andreas Huber", "email": "andih@google.com", "time": "Tue Oct 05 13:53:39 2010 -0700" }, "message": "Make sure to call AudioTrack::stop() instead of AudioTrack::pause() after submitting all samples to AudioTrack to make sure those remaining samples are actually played out.\n\nChange-Id: Id574a0203efcb5e565f1b0fe77869fc33b9a9d56\n" }, { "commit": "56364bcd0d1a1b064db3e83fdb64f948ce5c2ad7", "tree": "0ae7fc29d1870e7b13694c7245df6d9ad19b2db3", "parents": [ "f2cc2e522177683145b2daa0de0ed898b865824d", "78d15acfb20269ce263ce19514a2c0e7a98409e2" ], "author": { "name": "Jeff Brown", "email": "jeffbrown@google.com", "time": "Tue Oct 05 13:17:04 2010 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Tue Oct 05 13:17:04 2010 -0700" }, "message": "am 78d15acf: Merge \"Make secure views tolerate IME overlays.\" into gingerbread\n\nMerge commit \u002778d15acfb20269ce263ce19514a2c0e7a98409e2\u0027 into gingerbread-plus-aosp\n\n* commit \u002778d15acfb20269ce263ce19514a2c0e7a98409e2\u0027:\n Make secure views tolerate IME overlays.\n" }, { "commit": "19dfc83c376d8f5ff3b128ee4c675790cffbc02d", "tree": "06b41715a604ca7dc09cc852c28a8cd2354a0fee", "parents": [ "95037fb1a633f5bdeb4e0ece2d18a4974259c368" ], "author": { "name": "Jeff Brown", "email": "jeffbrown@google.com", "time": "Tue Oct 05 12:26:23 2010 -0700" }, "committer": { "name": "Jeff Brown", "email": "jeffbrown@google.com", "time": "Tue Oct 05 12:26:23 2010 -0700" }, "message": "Make secure views tolerate IME overlays.\n\nChange-Id: I3cf09b9d91045f4d9c558b4aace482a7b0bbd3d8\n" }, { "commit": "ff04e97faf75c435e453d4c1caf7eeac8b9c1ceb", "tree": "089714d6c07e5ec9e3bbf3cf5478c1dd264d8bc1", "parents": [ "722665c5f76e81bed646490977ea30f38aaa00da", "f461930872beb4362998642c115691bdd2e94617" ], "author": { "name": "Mathias Agopian", "email": "mathias@google.com", "time": "Mon Oct 04 20:21:14 2010 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Mon Oct 04 20:21:14 2010 -0700" }, "message": "am f4619308: Merge \"fix [2835280] Add support for cancelling buffers to ANativeWindow\" into gingerbread\n\nMerge commit \u0027f461930872beb4362998642c115691bdd2e94617\u0027 into gingerbread-plus-aosp\n\n* commit \u0027f461930872beb4362998642c115691bdd2e94617\u0027:\n fix [2835280] Add support for cancelling buffers to ANativeWindow\n" }, { "commit": "8ddd2c72ee7dd6f45e5375a197774b8671b982b7", "tree": "b3a346d011b76c96b986f831036ff95652f067cf", "parents": [ "19058877df9bf94f197a72855f810f7f6bf8d068" ], "author": { "name": "Mathias Agopian", "email": "mathias@google.com", "time": "Fri Oct 01 16:22:41 2010 -0700" }, "committer": { "name": "Mathias Agopian", "email": "mathias@google.com", "time": "Mon Oct 04 20:10:11 2010 -0700" }, "message": "fix [2835280] Add support for cancelling buffers to ANativeWindow\n\nThere is a new ANativeWindow::cancelBuffer() API that can be used to\ncancel any dequeued buffer, BEFORE it\u0027s been enqueued. The buffer is\nreturned to the list of availlable buffers. dequeue and cancel are not\nmutually thread safe, they must be called from the same thread or\nexternal synchronization must be used.\n\nChange-Id: I86cc7985bace8b6a93ad2c75d2bef5c3c2cb4d61\n" }, { "commit": "bba3b8efbe7dc9dd6fa326103ef7ddefc28d5ba5", "tree": "5da8b6283591ad47c1edca60a110fb3837a2459b", "parents": [ "9fa7926beaf6c7fe32159a7e41fae9f618ec7504", "19058877df9bf94f197a72855f810f7f6bf8d068" ], "author": { "name": "Mathias Agopian", "email": "mathias@google.com", "time": "Mon Oct 04 20:06:51 2010 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Mon Oct 04 20:06:51 2010 -0700" }, "message": "am 19058877: Merge \"refactored screenshot code\" into gingerbread\n\nMerge commit \u002719058877df9bf94f197a72855f810f7f6bf8d068\u0027 into gingerbread-plus-aosp\n\n* commit \u002719058877df9bf94f197a72855f810f7f6bf8d068\u0027:\n refactored screenshot code\n" }, { "commit": "19058877df9bf94f197a72855f810f7f6bf8d068", "tree": "f88763bcad2b9d97f19538bb0a4f40e83c4f8a8a", "parents": [ "b9aacfdfb014cc0299f7999d2a8940cd60a4cc59", "597c7f67b5f2491c6098a1de241a3f0fd274688a" ], "author": { "name": "Mathias Agopian", "email": "mathias@google.com", "time": "Mon Oct 04 20:04:42 2010 -0700" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Mon Oct 04 20:04:42 2010 -0700" }, "message": "Merge \"refactored screenshot code\" into gingerbread" }, { "commit": "a86a6c4e326bfdfc351dacca95b23bb78f78efbe", "tree": "5c7b2072a20be1393f9e02144527d39a786ed5a9", "parents": [ "c7bfb13fd92cda6ae5894ed2ee63e1ab4d7b25ee", "6f1c7bda39774fe3a1febf72b03c8ad481c1ea54" ], "author": { "name": "James Dong", "email": "jdong@google.com", "time": "Mon Oct 04 18:39:52 2010 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Mon Oct 04 18:39:52 2010 -0700" }, "message": "am 6f1c7bda: Merge \"Fixed an issue where the reserved free space in the file writer was larger than intended\" into gingerbread\n\nMerge commit \u00276f1c7bda39774fe3a1febf72b03c8ad481c1ea54\u0027 into gingerbread-plus-aosp\n\n* commit \u00276f1c7bda39774fe3a1febf72b03c8ad481c1ea54\u0027:\n Fixed an issue where the reserved free space in the file writer was larger than intended\n" }, { "commit": "6f1c7bda39774fe3a1febf72b03c8ad481c1ea54", "tree": "12cc1b22592ca6386e19a499479dd9532b351889", "parents": [ "15f107b151deff1f25f1255bdbcb630ed576ac8d", "6a9e39ac55b32a2847546ef1784c2d6c91863a55" ], "author": { "name": "James Dong", "email": "jdong@google.com", "time": "Mon Oct 04 18:37:48 2010 -0700" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Mon Oct 04 18:37:48 2010 -0700" }, "message": "Merge \"Fixed an issue where the reserved free space in the file writer was larger than intended\" into gingerbread" }, { "commit": "597c7f67b5f2491c6098a1de241a3f0fd274688a", "tree": "841774d2e67bfced0608d2344868c64ac566004e", "parents": [ "541d942000c338a15dc4b361b15b72864640d2bf" ], "author": { "name": "Mathias Agopian", "email": "mathias@google.com", "time": "Wed Sep 29 13:02:36 2010 -0700" }, "committer": { "name": "Mathias Agopian", "email": "mathias@google.com", "time": "Mon Oct 04 17:36:17 2010 -0700" }, "message": "refactored screenshot code\n\nthe core screenshot function now can capture the screen at any lower resolution\nperforming bilinear filtering.\n\nwe also now have some client code to interface with the screenshot service.\n\nit\u0027s now possible to request a screenshot at a lower resolution.\n\nChange-Id: I33689bba98507ab928d0898b21596d0d2fe4b953\n" }, { "commit": "bfa33b9484e2c0a019ab81f30261b9696df23a9b", "tree": "12be49b8e0bfced18747358526669e49ba5fa2ac", "parents": [ "b3e95d9fc4365d20a39aa3ef61da537dabf5b800", "f84a5918f5e0572c0280fa705970ef7459b45393" ], "author": { "name": "Kenny Root", "email": "kroot@google.com", "time": "Mon Oct 04 17:12:10 2010 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Mon Oct 04 17:12:10 2010 -0700" }, "message": "am f84a5918: Merge \"Use pread() in ZipFileRO for Linux\" into gingerbread\n\nMerge commit \u0027f84a5918f5e0572c0280fa705970ef7459b45393\u0027 into gingerbread-plus-aosp\n\n* commit \u0027f84a5918f5e0572c0280fa705970ef7459b45393\u0027:\n Use pread() in ZipFileRO for Linux\n" }, { "commit": "6a9e39ac55b32a2847546ef1784c2d6c91863a55", "tree": "62d33aedf7875659cd5cea087c563e50a3afd065", "parents": [ "a29643a6455df7d3d615cdc45e11c437fe4b6cee" ], "author": { "name": "James Dong", "email": "jdong@google.com", "time": "Mon Oct 04 16:41:53 2010 -0700" }, "committer": { "name": "James Dong", "email": "jdong@google.com", "time": "Mon Oct 04 16:54:59 2010 -0700" }, "message": "Fixed an issue where the reserved free space in the file writer was larger than intended\n\nThe problem was that even though user does not explicitly request the max file size\nlimit via MediaRecorder.setMaxFileSize(), the file writer sets an implicit file\nsize limit if 32-bit file offset is used on user\u0027s behalf. The reserved free space\nis estimated based on the file size, if the file size limit is set by the user.\n\nThe fix is to add an extra bool to tell the difference between an\nexplit requested file size and an implicit file limit and use that\nto set the estimated moov box size accordingly.\n\nChange-Id: I731aca6c7833aa764ed7b905edb77721577471b3\n" }, { "commit": "259ec46e8e80a9f1d0b5c7a3865a498110a7f11b", "tree": "c2987b5a006425d41438227011f5b9b5a6febb15", "parents": [ "106950f20bd352ed72ddf4490b2e19d305e36a74" ], "author": { "name": "Kenny Root", "email": "kroot@google.com", "time": "Mon Oct 04 14:20:14 2010 -0700" }, "committer": { "name": "Kenny Root", "email": "kroot@google.com", "time": "Mon Oct 04 15:17:19 2010 -0700" }, "message": "Use pread() in ZipFileRO for Linux\n\nAssetManager instances are created by zygote and passed to all its\nchildren so that they don\u0027t have to individually open\nframeworks-res.apk. This creates a problem for determining the current\nfile offset when using lseek() on those files, because you can\u0027t\nguarantee the cross-process locking of a mutex. Luckily, Linux\nimplements pread() to get around this suckiness.\n\nThe problem is that only Linux implements this, so we have to keep the\nold locking for use on host builds with aapt and friends. aapt doesn\u0027t\nhave this same problem of sharing file descriptors across forked\nprocesses, so we can keep the local AutoMutex to protect accesses of\nthose files.\n\nChange-Id: Ibe9f11499a53fe345f50fbaea438815ec0fd363e\n" }, { "commit": "ac7540733cafcca5bdb1842e1ebcb396ba064583", "tree": "3d155d892096e2f1a02119eb94a0bd775e3de687", "parents": [ "1f34ffd7e36de5d1a12d4a3901c3ac4e4e56cb99", "b58b27142a936aa76897a7040c08b8a0989a685b" ], "author": { "name": "Kenny Root", "email": "kroot@google.com", "time": "Mon Oct 04 07:41:11 2010 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Mon Oct 04 07:41:11 2010 -0700" }, "message": "am b58b2714: Merge \"ZipFileRO: moar logging and wrap close\" into gingerbread\n\nMerge commit \u0027b58b27142a936aa76897a7040c08b8a0989a685b\u0027 into gingerbread-plus-aosp\n\n* commit \u0027b58b27142a936aa76897a7040c08b8a0989a685b\u0027:\n ZipFileRO: moar logging and wrap close\n" }, { "commit": "b58b27142a936aa76897a7040c08b8a0989a685b", "tree": "98a95c36bd1b042cfd3aa830c804d69cb3064174", "parents": [ "5cab38ba11d976c54f28f4bdbced78040cba1cbb", "6cb241f9024c6923715cf4e9eeaf803a7d258750" ], "author": { "name": "Kenny Root", "email": "kroot@google.com", "time": "Mon Oct 04 07:28:20 2010 -0700" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Mon Oct 04 07:28:20 2010 -0700" }, "message": "Merge \"ZipFileRO: moar logging and wrap close\" into gingerbread" }, { "commit": "dc549d60f98d809f626c99de614960409a847054", "tree": "bb40a8371811f1c591cc22afa331e57b3d091c9e", "parents": [ "7d9c73fb6f6f79f7f92b77482a0edbd7b89f2564" ], "author": { "name": "Takeshi Aimi", "email": "aimitakeshi@gmail.com", "time": "Mon Sep 20 23:40:41 2010 +0900" }, "committer": { "name": "Takeshi Aimi", "email": "aimitakeshi@gmail.com", "time": "Mon Oct 04 22:14:53 2010 +0900" }, "message": "Update of DRM framework.\n\n - Change \"void\" type of return value to \"int\" for returning status.\n - Add some of overloaded Java APIs which accept database Uri as input.\n - Add asynchronous APIs\n - Add OnEventListener and OnErrorListener for asynchronous APIs\n - Disable debug log\n - Change decrypt() API to accept an optional buffer needed by some of DRM schemes\n\nChanges are incorporated by Sony Corporation.\n\nChange-Id: I414a165e22cc79be6ea7cd28041788aa2b6b8f7c\n" }, { "commit": "ea58d1bac2960c1794f048bfa5d1a60b1a3d23a1", "tree": "4c3f62752af1759b842444813fbda3c35a80c329", "parents": [ "e11b76d3efb056edea301d53a354d0730adf3520", "e951ef07dd8cb36ec0e127e80f5d558b8a2d6125" ], "author": { "name": "Jeff Brown", "email": "jeffbrown@google.com", "time": "Fri Oct 01 19:03:42 2010 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Fri Oct 01 19:03:42 2010 -0700" }, "message": "am e951ef07: Merge \"Wait for initial device scan to finish before updating config.\" into gingerbread\n\nMerge commit \u0027e951ef07dd8cb36ec0e127e80f5d558b8a2d6125\u0027 into gingerbread-plus-aosp\n\n* commit \u0027e951ef07dd8cb36ec0e127e80f5d558b8a2d6125\u0027:\n Wait for initial device scan to finish before updating config.\n" }, { "commit": "e11b76d3efb056edea301d53a354d0730adf3520", "tree": "7f25a0eb45fad5895e9eb23b8c802f92151af232", "parents": [ "8788d140363ed921f49d366d67bd7164e63e54ae", "f6295b35db7a7c40d4fb1c981e231bebcf13e2ba" ], "author": { "name": "Jeff Brown", "email": "jeffbrown@google.com", "time": "Fri Oct 01 19:01:14 2010 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Fri Oct 01 19:01:14 2010 -0700" }, "message": "am f6295b35: Merge \"Minor logging changes to input dispatcher to help with debugging.\" into gingerbread\n\nMerge commit \u0027f6295b35db7a7c40d4fb1c981e231bebcf13e2ba\u0027 into gingerbread-plus-aosp\n\n* commit \u0027f6295b35db7a7c40d4fb1c981e231bebcf13e2ba\u0027:\n Minor logging changes to input dispatcher to help with debugging.\n" }, { "commit": "7342bb9693f480f6c713b4a4f82a9ad9131cd667", "tree": "bd68c8bf4604123404347880da67c3f9c34935e7", "parents": [ "f2f487183052865d50c004a835360be1728b5a52" ], "author": { "name": "Jeff Brown", "email": "jeffbrown@google.com", "time": "Fri Oct 01 18:55:43 2010 -0700" }, "committer": { "name": "Jeff Brown", "email": "jeffbrown@google.com", "time": "Fri Oct 01 18:55:43 2010 -0700" }, "message": "Wait for initial device scan to finish before updating config.\n\nThis change narrows the opportunity for a race condition setting the\nresource Configuration while devices are being updated.\n\nChange-Id: I58efa563f4129ab0fce7108511d16a99dff7e451\n" }, { "commit": "6cb241f9024c6923715cf4e9eeaf803a7d258750", "tree": "455507c53e8e0d20dee11d1888cebd67ff947523", "parents": [ "306137d97f40a4f807c54a75210343c9262360d1" ], "author": { "name": "Kenny Root", "email": "kroot@google.com", "time": "Fri Oct 01 18:28:28 2010 -0700" }, "committer": { "name": "Kenny Root", "email": "kroot@google.com", "time": "Fri Oct 01 18:30:59 2010 -0700" }, "message": "ZipFileRO: moar logging and wrap close\n\nThere is apparently still a race upon reading the entry Local File\nHeader that can\u0027t be tracked down, so move the LFH check inside the\nmutex-protected block so we can call lseek again to see where we are\nwhen we log an error.\n\nAlso, close() can fail so use TEMP_FAILURE_RETRY on it so we don\u0027t\nunwittingly leak file descriptors when Mean Mr. EINTR comes a-knocking.\n\nChange-Id: I753abad0bd882fe28f7281c406fa76f64393ef4c\n" }, { "commit": "f2f487183052865d50c004a835360be1728b5a52", "tree": "98965f96bbec354c7b93de0b83a882b43bf86d2a", "parents": [ "0eaf3931a31c29f3a3883aab426b595c231c2a58" ], "author": { "name": "Jeff Brown", "email": "jeffbrown@google.com", "time": "Fri Oct 01 17:46:21 2010 -0700" }, "committer": { "name": "Jeff Brown", "email": "jeffbrown@google.com", "time": "Fri Oct 01 18:05:13 2010 -0700" }, "message": "Minor logging changes to input dispatcher to help with debugging.\n\nAdded dumpsys reporting to EventHub.\nMade the formatting a bit clearer.\nAdded \u0027Locked\u0027 suffix to some internal methods of EventHub.\n\nChange-Id: Ic449560bcce378f6361895d27c66854e9724abb0\n" }, { "commit": "57fa3e8b4c94125ddb5be015dd7fbde4a458894f", "tree": "d5d40a016e04d93b5feccba38bbe33f4d08a5248", "parents": [ "a4f1eb3d775533d9b28248022e0a5b4ec05fc2e4", "9e32a438fd87180692da55197972ecddb1a731d9" ], "author": { "name": "Jeff Brown", "email": "jeffbrown@google.com", "time": "Fri Oct 01 16:16:23 2010 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Fri Oct 01 16:16:23 2010 -0700" }, "message": "am 9e32a438: Merge \"Support haptic feedback for virtual keys defined in key layout.\" into gingerbread\n\nMerge commit \u00279e32a438fd87180692da55197972ecddb1a731d9\u0027 into gingerbread-plus-aosp\n\n* commit \u00279e32a438fd87180692da55197972ecddb1a731d9\u0027:\n Support haptic feedback for virtual keys defined in key layout.\n" }, { "commit": "0eaf3931a31c29f3a3883aab426b595c231c2a58", "tree": "e79493c39fd735a3ff237fa43a1633abd5ef9910", "parents": [ "10e2120bdd2d99e100db187d49ac6a8495c7f956" ], "author": { "name": "Jeff Brown", "email": "jeffbrown@google.com", "time": "Fri Oct 01 14:55:30 2010 -0700" }, "committer": { "name": "Jeff Brown", "email": "jeffbrown@google.com", "time": "Fri Oct 01 15:08:56 2010 -0700" }, "message": "Support haptic feedback for virtual keys defined in key layout.\n\nChange-Id: I83e4108a87332692e03791dc066206becbc7941f\n" }, { "commit": "de12c3cf56e3f27b2efc60eeae8b5e422747f2b9", "tree": "cbfc1763688551dc77514f7f6e4d8f07d10b1e7d", "parents": [ "4309b52fe19de5241113d8f9ebcdf52741e086a9", "220ab8877b234e6807b7f6d9028ba55d23220301" ], "author": { "name": "Eric Laurent", "email": "elaurent@google.com", "time": "Thu Sep 30 17:47:07 2010 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Thu Sep 30 17:47:07 2010 -0700" }, "message": "am 220ab887: Merge \"Issue 3032913: improve AudioTrack recovery time\" into gingerbread\n\nMerge commit \u0027220ab8877b234e6807b7f6d9028ba55d23220301\u0027 into gingerbread-plus-aosp\n\n* commit \u0027220ab8877b234e6807b7f6d9028ba55d23220301\u0027:\n Issue 3032913: improve AudioTrack recovery time\n" }, { "commit": "4712baab81d0b683bc22668d2278c9daff92797e", "tree": "e2af5c484425ede13606e62569ad615b184d2d8f", "parents": [ "0a972acf85ce0cf7bba5a77628e9cf59a0946bd0" ], "author": { "name": "Eric Laurent", "email": "elaurent@google.com", "time": "Thu Sep 30 16:12:31 2010 -0700" }, "committer": { "name": "Eric Laurent", "email": "elaurent@google.com", "time": "Thu Sep 30 17:21:23 2010 -0700" }, "message": "Issue 3032913: improve AudioTrack recovery time\n\nThis issue showed that when an AudioTrack underruns during a too long period\nof time and is therefore disabled by audioflinger mixer, it takes an additional\ndelay of up to 3 seconds to recover.\nThis fix adds a simple mechanism to recover immediately when the client application\nis ready to write data again in the AudioTrack buffer\n\nAlso throttle warnings on record overflows\n\nChange-Id: I8b2c71578dd134b9e60a15ee4d91b70f3799cb3d\n" }, { "commit": "5d3cef8a6d1baec29512764b9e0ba240ccd7fcfe", "tree": "c6d4d8897432b817a210424db0c11e82ce82c30b", "parents": [ "cfba8c0337e9a8d55389bcae7caa7a8db230f711", "e0c12c8803a7e2457098afc5dbf00e501d725fa0" ], "author": { "name": "Jeff Brown", "email": "jeffbrown@google.com", "time": "Thu Sep 30 15:57:29 2010 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Thu Sep 30 15:57:29 2010 -0700" }, "message": "am e0c12c88: Merge \"Move verbose logging of device capabilities to dumpsys.\" into gingerbread\n\nMerge commit \u0027e0c12c8803a7e2457098afc5dbf00e501d725fa0\u0027 into gingerbread-plus-aosp\n\n* commit \u0027e0c12c8803a7e2457098afc5dbf00e501d725fa0\u0027:\n Move verbose logging of device capabilities to dumpsys.\n" }, { "commit": "ef3d7e861154c1ce1b8f86292138fc36c30232a3", "tree": "fd94e6c198b41d9fb36d4b15d3c7cad188a2c620", "parents": [ "99f8c5ee621d78a24583a10e459ba40aab511a17" ], "author": { "name": "Jeff Brown", "email": "jeffbrown@google.com", "time": "Thu Sep 30 14:33:04 2010 -0700" }, "committer": { "name": "Jeff Brown", "email": "jeffbrown@google.com", "time": "Thu Sep 30 15:34:48 2010 -0700" }, "message": "Move verbose logging of device capabilities to dumpsys.\n\nChange-Id: I5d55eaebfdf049bd1ac1e7bab2758886cfefc9d7\n" }, { "commit": "d8e8186c887fe47977721315f439465771a96374", "tree": "ff89a03f9a84484e3573508da6c72ecfbc4b04d6", "parents": [ "f5bdeba197aba659e2dd3849a5bdfba8826c036d", "05105f7abe02b2dff91d6260b3628c8b97816bab" ], "author": { "name": "Kenny Root", "email": "kroot@google.com", "time": "Tue Sep 28 17:33:47 2010 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Tue Sep 28 17:33:47 2010 -0700" }, "message": "am 05105f7a: Update OBB API to include callbacks\n\nMerge commit \u002705105f7abe02b2dff91d6260b3628c8b97816bab\u0027 into gingerbread-plus-aosp\n\n* commit \u002705105f7abe02b2dff91d6260b3628c8b97816bab\u0027:\n Update OBB API to include callbacks\n" }, { "commit": "05105f7abe02b2dff91d6260b3628c8b97816bab", "tree": "f42676d818548d76b2c55045a1bcc4866d6feec1", "parents": [ "ea2cf2f936b03f1720bc43863e41c89ea2a7903a" ], "author": { "name": "Kenny Root", "email": "kroot@google.com", "time": "Wed Sep 22 17:29:43 2010 -0700" }, "committer": { "name": "Kenny Root", "email": "kroot@google.com", "time": "Tue Sep 28 17:23:26 2010 -0700" }, "message": "Update OBB API to include callbacks\n\nAdd a callback for users of the StorageManager API to be able to receive\nnotifications when the requested operation completes for mountObb and\nunmountObb.\n\nAdd NDK API to get to ObbInfo like the Java API has.\n\nAlso update the docs for the API and remove the \"STOPSHIP\" comments.\n\nChange-Id: I23a4409c7f8b74d3169614beba920b4d667990a4\n" }, { "commit": "d6c30e8c1521bc584f33500b8ee897dafdfec023", "tree": "9bb9c55d4b334faa445ede21cee0942ab1ed63c8", "parents": [ "c889bbfa965f4ba90636f561c5e1353289d4cb06", "be0450619528e65eebfa1d7eab78fde757d094cc" ], "author": { "name": "Andreas Huber", "email": "andih@google.com", "time": "Tue Sep 28 12:05:08 2010 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Tue Sep 28 12:05:08 2010 -0700" }, "message": "am be045061: Merge \"Instead of constantly polling the AudioPlayer to see if it reached EOS or finished seeking, initiate the notification from the AudioPlayer when the event happens.\" into gingerbread\n\nMerge commit \u0027be0450619528e65eebfa1d7eab78fde757d094cc\u0027 into gingerbread-plus-aosp\n\n* commit \u0027be0450619528e65eebfa1d7eab78fde757d094cc\u0027:\n Instead of constantly polling the AudioPlayer to see if it reached EOS or finished seeking, initiate the notification from the AudioPlayer when the event happens.\n" }, { "commit": "be0450619528e65eebfa1d7eab78fde757d094cc", "tree": "08bd4cd3f2b9784e6fcbfb0ae0c6590f48534fd1", "parents": [ "4769f57948455277d0670ef18f64824ca5d894c1", "2b359ed5b5ba4775609c13408b2cf1336c2cc45b" ], "author": { "name": "Andreas Huber", "email": "andih@google.com", "time": "Tue Sep 28 12:02:35 2010 -0700" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Tue Sep 28 12:02:35 2010 -0700" }, "message": "Merge \"Instead of constantly polling the AudioPlayer to see if it reached EOS or finished seeking, initiate the notification from the AudioPlayer when the event happens.\" into gingerbread" } ], "next": "2b359ed5b5ba4775609c13408b2cf1336c2cc45b" }