)]}' { "log": [ { "commit": "5be2304ab2a1e40ca85f2c01defa4bb33e8344d9", "tree": "406831762e76edbb91629886f4256ead2fab98be", "parents": [ "bbe860d522c7ce46eff6de49dab2ff7e4059a3d8", "654b4bf34361b0166a564d178c11ce98cf561cfa" ], "author": { "name": "Yin-Chia Yeh", "email": "yinchiayeh@google.com", "time": "Tue Dec 08 20:27:53 2015 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Tue Dec 08 20:27:53 2015 +0000" }, "message": "Merge \"Camera: fix HAL1.0 support\"" }, { "commit": "bbe860d522c7ce46eff6de49dab2ff7e4059a3d8", "tree": "966df2b509104cb57b882e5bcafb3657f7761af4", "parents": [ "4aeee811662bdb8f6f4b24884d62780deb7ca1c6" ], "author": { "name": "Marco Nelissen", "email": "marcone@google.com", "time": "Tue Dec 08 12:22:20 2015 -0800" }, "committer": { "name": "Marco Nelissen", "email": "marcone@google.com", "time": "Tue Dec 08 12:26:52 2015 -0800" }, "message": "Fix integer overflow in amrwbenc\n\nBug: 25843966\nChange-Id: Ib9b37712819d776496b7a06b9e85c5d1e43f9d25\n" }, { "commit": "654b4bf34361b0166a564d178c11ce98cf561cfa", "tree": "8a76eb9c6e4f193dab308688d03ee8bf2d0bfed3", "parents": [ "4aeee811662bdb8f6f4b24884d62780deb7ca1c6" ], "author": { "name": "Yin-Chia Yeh", "email": "yinchiayeh@google.com", "time": "Tue Dec 08 12:19:31 2015 -0800" }, "committer": { "name": "Yin-Chia Yeh", "email": "yinchiayeh@google.com", "time": "Tue Dec 08 12:22:47 2015 -0800" }, "message": "Camera: fix HAL1.0 support\n\nBug: 26050582\nChange-Id: Ic64fb005d7c804dc2b8b9c22fdbe44408646b406\n" }, { "commit": "4aeee811662bdb8f6f4b24884d62780deb7ca1c6", "tree": "83eb66edc20d9214cb5fa67297a7965492969ec0", "parents": [ "a6b3ed1b8ee37fe244dfbcbe3dbeda66b55c846d", "bb4877d143c6c7ec9b42e3c490fed58af4f39dea" ], "author": { "name": "Jeff Tinker", "email": "jtinker@google.com", "time": "Tue Dec 08 00:38:50 2015 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Tue Dec 08 00:38:50 2015 +0000" }, "message": "Merge \"Fix security vulnerability in ICrypto\"" }, { "commit": "a6b3ed1b8ee37fe244dfbcbe3dbeda66b55c846d", "tree": "4f71def928a5d8fe056fc09ba45e8d2a559fb96b", "parents": [ "d00a17d24d888dd1f6d245fbe6425865e6f56894", "169e8ebba23f461cdb57f10985e044e235457b0a" ], "author": { "name": "Yin-Chia Yeh", "email": "yinchiayeh@google.com", "time": "Mon Dec 07 20:25:55 2015 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Mon Dec 07 20:25:55 2015 +0000" }, "message": "Merge \"Camera: set mNumberOfNormalCameras correctly\"" }, { "commit": "169e8ebba23f461cdb57f10985e044e235457b0a", "tree": "fa989031a53297c5f2ff9f88c93fe5ff4c6ce4a3", "parents": [ "fd51bde24bcd19a265c8d54acbd12322caca91c2" ], "author": { "name": "Yin-Chia Yeh", "email": "yinchiayeh@google.com", "time": "Mon Dec 07 12:20:11 2015 -0800" }, "committer": { "name": "Yin-Chia Yeh", "email": "yinchiayeh@google.com", "time": "Mon Dec 07 12:20:11 2015 -0800" }, "message": "Camera: set mNumberOfNormalCameras correctly\n\nNeed to set the number correctly when a camera HAL is not present.\n\nBug: 25951590\nChange-Id: I666acf7a2a523c51f2c2ae88ff690ca9dccda08c\n" }, { "commit": "d00a17d24d888dd1f6d245fbe6425865e6f56894", "tree": "39ff774445ce9cbe36bc35f189b031bfb3b62353", "parents": [ "ec1efa072e68a7970c6bca8da0a5d436c30b6196", "b20688e7e87e99ab1ee106af043ce0cbb40bde5d" ], "author": { "name": "Andy Hung", "email": "hunga@google.com", "time": "Mon Dec 07 19:24:19 2015 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Mon Dec 07 19:24:19 2015 +0000" }, "message": "Merge \"Check for non-negative fd before close, dup, lseek, or read.\"" }, { "commit": "ec1efa072e68a7970c6bca8da0a5d436c30b6196", "tree": "90f0a477970f98b5d0ace798fe0ab861329fd7b7", "parents": [ "8fa2458708fa775c2562d836d8f87ac30d5970f4", "65bfe916ca972b95f41d7f6cc2566c2e12a3eada" ], "author": { "name": "Jean-Michel Trivi", "email": "jmtrivi@google.com", "time": "Mon Dec 07 17:56:19 2015 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Mon Dec 07 17:56:19 2015 +0000" }, "message": "Merge \"AudioPolicyManager: AudioInputDescriptor open ref count cleanup\"" }, { "commit": "b20688e7e87e99ab1ee106af043ce0cbb40bde5d", "tree": "19767be9c107ea1578095547ee56dc0ca32ea7ac", "parents": [ "6411cb684e5994834c441d94708d245d81b474a5" ], "author": { "name": "Andy Hung", "email": "hunga@google.com", "time": "Fri Dec 04 17:20:50 2015 -0800" }, "committer": { "name": "Andy Hung", "email": "hunga@google.com", "time": "Fri Dec 04 17:36:20 2015 -0800" }, "message": "Check for non-negative fd before close, dup, lseek, or read.\n\nBug: 24896328\nChange-Id: Idd8da8cf202f51f42d0a81421a91768ec3d5f025\n" }, { "commit": "8fa2458708fa775c2562d836d8f87ac30d5970f4", "tree": "f6082b84634ea178e010940b06486c0c07f6f37c", "parents": [ "0a62162accbce87db829869a15eab72eca2607b2", "8649a34c282954ccb64a507b1085313e3ceafc38" ], "author": { "name": "Eric Laurent", "email": "elaurent@google.com", "time": "Sat Dec 05 00:35:25 2015 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Sat Dec 05 00:35:25 2015 +0000" }, "message": "Merge \"audio policy: configurable engine: fix dead lock issue\"" }, { "commit": "bb4877d143c6c7ec9b42e3c490fed58af4f39dea", "tree": "2d2582f5822643fd28c20f2d35f2cc9d55da8f24", "parents": [ "3f273d10817ddb2f792ae043de692efcdf1988ae" ], "author": { "name": "Jeff Tinker", "email": "jtinker@google.com", "time": "Fri Dec 04 16:29:16 2015 -0800" }, "committer": { "name": "Jeff Tinker", "email": "jtinker@google.com", "time": "Fri Dec 04 16:29:16 2015 -0800" }, "message": "Fix security vulnerability in ICrypto\n\nb/25800375\n\nChange-Id: I03c9395f7c7de4ac5813a1207452aac57aa39484\n" }, { "commit": "65bfe916ca972b95f41d7f6cc2566c2e12a3eada", "tree": "5bba6ff35798ae91602658b6754d2ba047844d71", "parents": [ "0a62162accbce87db829869a15eab72eca2607b2" ], "author": { "name": "Jean-Michel Trivi", "email": "jmtrivi@google.com", "time": "Fri Dec 04 15:56:47 2015 -0800" }, "committer": { "name": "Jean-Michel Trivi", "email": "jmtrivi@google.com", "time": "Fri Dec 04 16:27:43 2015 -0800" }, "message": "AudioPolicyManager: AudioInputDescriptor open ref count cleanup\n\nAlways initialize the mOpenRefCount field.\nAdd functions for management for open ref count.\n\nChange-Id: I0bbd021283047abfebbc108ced68c79e29297f25\n" }, { "commit": "8649a34c282954ccb64a507b1085313e3ceafc38", "tree": "cbf999625de593a8a128a17df2c0b44c72cc4a6c", "parents": [ "3f273d10817ddb2f792ae043de692efcdf1988ae" ], "author": { "name": "François Gaffie", "email": "francois.gaffie@intel.com", "time": "Thu Dec 03 17:14:02 2015 +0100" }, "committer": { "name": "Eric Laurent", "email": "elaurent@google.com", "time": "Fri Dec 04 16:05:23 2015 -0800" }, "message": "audio policy: configurable engine: fix dead lock issue\n\nThis patch fixes a dead lock issue within configurable engine\nof the audio policy. A clear was calling itself in loop instead\nof calling clear on its base class.\n\nChange-Id: I9f7c5f6425fbba36e029664ac130cbeafeca4ddf\nSigned-off-by: François Gaffie \u003cfrancois.gaffie@intel.com\u003e\n" }, { "commit": "0a62162accbce87db829869a15eab72eca2607b2", "tree": "54f8fcc88b07a659a4e4da26c937bd779a13c728", "parents": [ "b6c63ca64d521beb489e4464ce351fd7d3360d19", "e6b4530d758f411907ce737b7475c7dc22551a78" ], "author": { "name": "Jean-Michel Trivi", "email": "jmtrivi@google.com", "time": "Fri Dec 04 17:17:03 2015 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Fri Dec 04 17:17:03 2015 +0000" }, "message": "Merge \"Validation of Number of Channels on WAV files.\" am: 8ec6ab3bfa am: bc6d05bac1\nam: e6b4530d75\n\n* commit \u0027e6b4530d758f411907ce737b7475c7dc22551a78\u0027:\n Validation of Number of Channels on WAV files.\n" }, { "commit": "b6c63ca64d521beb489e4464ce351fd7d3360d19", "tree": "39d27c15d82349b4ae48e82a7b852a4016b2c5ec", "parents": [ "ebdddf82b07fa2c4134c3c00dbbbaa1ad3286726", "465792da79bf484f4d979cf014448e14ab05adfa" ], "author": { "name": "Andy Hung", "email": "hunga@google.com", "time": "Fri Dec 04 17:16:42 2015 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Fri Dec 04 17:16:42 2015 +0000" }, "message": "DO NOT MERGE SoundPool: add lock for findSample access from SoundPoolThread am: 3d6a714980 am: 208bc477d9 -s ours am: c56555962b am: f4dfde92ea -s ours am: 92edb173a7 am: 9161b6adc9 am: 8f283a894d -s ours am: 6d3f50d9c3 am: 0357d3503f am: 6cd7a9f811 am: 83066d1046\nam: 465792da79 -s ours\n\n* commit \u0027465792da79bf484f4d979cf014448e14ab05adfa\u0027:\n DO NOT MERGE SoundPool: add lock for findSample access from SoundPoolThread\n" }, { "commit": "e6b4530d758f411907ce737b7475c7dc22551a78", "tree": "384437c451332f568132b7781b38428aac419f8f", "parents": [ "465792da79bf484f4d979cf014448e14ab05adfa", "bc6d05bac14e2a3e7e4a104f6b7e9260b42320f5" ], "author": { "name": "Jean-Michel Trivi", "email": "jmtrivi@google.com", "time": "Fri Dec 04 17:13:50 2015 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Fri Dec 04 17:13:50 2015 +0000" }, "message": "Merge \"Validation of Number of Channels on WAV files.\" am: 8ec6ab3bfa\nam: bc6d05bac1\n\n* commit \u0027bc6d05bac14e2a3e7e4a104f6b7e9260b42320f5\u0027:\n Validation of Number of Channels on WAV files.\n" }, { "commit": "bc6d05bac14e2a3e7e4a104f6b7e9260b42320f5", "tree": "5ca0170b21a27ee5027e1ab45550bdb2481f0c50", "parents": [ "e04b1e747e0c1680836dab71357cb6bd216aa575", "8ec6ab3bfa96316fabde6c23acb1e2630acac99b" ], "author": { "name": "Jean-Michel Trivi", "email": "jmtrivi@google.com", "time": "Fri Dec 04 17:10:17 2015 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Fri Dec 04 17:10:17 2015 +0000" }, "message": "Merge \"Validation of Number of Channels on WAV files.\"\nam: 8ec6ab3bfa\n\n* commit \u00278ec6ab3bfa96316fabde6c23acb1e2630acac99b\u0027:\n Validation of Number of Channels on WAV files.\n" }, { "commit": "8ec6ab3bfa96316fabde6c23acb1e2630acac99b", "tree": "ac4efd24083f658d1f01e69627c8cf09046e32c7", "parents": [ "2e12b68fad486445f230fb0435e6d5483047c85c", "778d09b607bd01888698c2110b05d3fc86c3b6ec" ], "author": { "name": "Jean-Michel Trivi", "email": "jmtrivi@google.com", "time": "Fri Dec 04 17:06:54 2015 +0000" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Fri Dec 04 17:06:54 2015 +0000" }, "message": "Merge \"Validation of Number of Channels on WAV files.\"" }, { "commit": "778d09b607bd01888698c2110b05d3fc86c3b6ec", "tree": "ac4efd24083f658d1f01e69627c8cf09046e32c7", "parents": [ "2e12b68fad486445f230fb0435e6d5483047c85c" ], "author": { "name": "Niel Alejandro Paz", "email": "niel.paz.hernandez@intel.com", "time": "Mon Jun 15 13:14:39 2015 -0500" }, "committer": { "name": "Zhiquan Liu", "email": "zhiquan.liu@intel.com", "time": "Fri Dec 04 13:51:44 2015 +0800" }, "message": "Validation of Number of Channels on WAV files.\n\nCorrects the validation of the number of channels that was causing a floating\npoint exception when this number is zero.\nIt also corrects the range of admitted channels on WAV files.\n\nChange-Id: I21f005d1f30c1fd93206c6bce0d3be4b8307059c\nSigned-off-by: Niel Alejandro Paz \u003cniel.paz.hernandez@intel.com\u003e\nSigned-off-by: Vineela Tummalapalli \u003cvineela.tummalapalli@intel.com\u003e\nSigned-off-by: Zhiquan Liu \u003czhiquan.liu@intel.com\u003e\n" }, { "commit": "ebdddf82b07fa2c4134c3c00dbbbaa1ad3286726", "tree": "39d27c15d82349b4ae48e82a7b852a4016b2c5ec", "parents": [ "cf52591e7441fcea757ca9090a66dbcdff0a73e3", "5fcd6f99944d8722c57d2b2963814a1964ecfedd" ], "author": { "name": "Eric Laurent", "email": "elaurent@google.com", "time": "Fri Dec 04 02:08:49 2015 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Fri Dec 04 02:08:49 2015 +0000" }, "message": "Merge \"audio policy: enhancing type conversion helper\"" }, { "commit": "cf52591e7441fcea757ca9090a66dbcdff0a73e3", "tree": "eeb83a07beb34bed0bde64913429767b3379958e", "parents": [ "fd51bde24bcd19a265c8d54acbd12322caca91c2", "d309fb9c8a2c4564d88fffba19c4e3688e4b862b" ], "author": { "name": "Eino-Ville Talvala", "email": "etalvala@google.com", "time": "Fri Dec 04 00:32:29 2015 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Fri Dec 04 00:32:29 2015 +0000" }, "message": "Merge \"CameraService: Remove device HALv2 support, other cleanup\"" }, { "commit": "465792da79bf484f4d979cf014448e14ab05adfa", "tree": "d5fe55a5d48f463f1d999f6a19bf0fc7a5e9b7cc", "parents": [ "ffa5d53049208edea27b88f67e7cc62a2d259319", "83066d1046795253a13d7d591d3c83de0c748d22" ], "author": { "name": "Andy Hung", "email": "hunga@google.com", "time": "Thu Dec 03 23:39:47 2015 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Thu Dec 03 23:39:47 2015 +0000" }, "message": "DO NOT MERGE SoundPool: add lock for findSample access from SoundPoolThread am: 3d6a714980 am: 208bc477d9 -s ours am: c56555962b am: f4dfde92ea -s ours am: 92edb173a7 am: 9161b6adc9 am: 8f283a894d -s ours am: 6d3f50d9c3 am: 0357d3503f am: 6cd7a9f811\nam: 83066d1046\n\n* commit \u002783066d1046795253a13d7d591d3c83de0c748d22\u0027:\n DO NOT MERGE SoundPool: add lock for findSample access from SoundPoolThread\n" }, { "commit": "fd51bde24bcd19a265c8d54acbd12322caca91c2", "tree": "bcf4f94686e32ea9b03a881a870ce57c00c516f2", "parents": [ "67602582d989ce63e563a5d41f694ae3b4425a6b", "ffa5d53049208edea27b88f67e7cc62a2d259319" ], "author": { "name": "Andy Hung", "email": "hunga@google.com", "time": "Thu Dec 03 23:31:34 2015 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Thu Dec 03 23:31:34 2015 +0000" }, "message": "Merge \"DO NOT MERGE SoundPool: add lock for findSample access from SoundPoolThread\" into lmp-dev am: 0c4d693722 am: ba49fda63a -s ours am: bb1809ace7 am: adfda28b42 am: 569d39f94a -s ours am: 975bb62996 am: b51610971c am: 047cfaf95a am: 3abe346ed2\nam: ffa5d53049 -s ours\n\n* commit \u0027ffa5d53049208edea27b88f67e7cc62a2d259319\u0027:\n DO NOT MERGE SoundPool: add lock for findSample access from SoundPoolThread\n" }, { "commit": "67602582d989ce63e563a5d41f694ae3b4425a6b", "tree": "bcf4f94686e32ea9b03a881a870ce57c00c516f2", "parents": [ "555ad363a19b34ff9f84c52f9841d7ae55748deb", "fffc234d8fa348b2bc84e6be94e5f2364e63e32b" ], "author": { "name": "Wei Jia", "email": "wjia@google.com", "time": "Thu Dec 03 23:31:17 2015 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Thu Dec 03 23:31:17 2015 +0000" }, "message": "DO NOT MERGE - libstagefright: check requested memory size before allocation for SoftMPEG4Encoder and SoftVPXEncoder. am: 6afc659b00 am: 9e1d7751b1 -s ours am: 4c0d243626 am: 862b693ba3 -s ours am: db76a879ea am: e0c9d8afd0 am: 2048dd5483 -s ours am: 7a2dbcd38b am: f766fdb625 am: 29ff7f2ac7 am: 946388cc94\nam: fffc234d8f -s ours\n\n* commit \u0027fffc234d8fa348b2bc84e6be94e5f2364e63e32b\u0027:\n DO NOT MERGE - libstagefright: check requested memory size before allocation for SoftMPEG4Encoder and SoftVPXEncoder.\n" }, { "commit": "555ad363a19b34ff9f84c52f9841d7ae55748deb", "tree": "bcf4f94686e32ea9b03a881a870ce57c00c516f2", "parents": [ "945e0d780cc19501f9414050742e422b30c64054", "694c766be9eb0057499461f3d9244e81205edc18" ], "author": { "name": "Wei Jia", "email": "wjia@google.com", "time": "Thu Dec 03 23:31:08 2015 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Thu Dec 03 23:31:08 2015 +0000" }, "message": "DO NOT MERGE - libstagefright: check requested memory size before allocation for SoftMPEG4Encoder and SoftVPXEncoder. am: 0462975291 am: 3e8e134597 -s ours am: e4223a8d32 am: bed81d6594 am: dd4576b017 -s ours am: e3bbe235f6 am: b7e63bfadb am: 2c7411483b am: 062ea7264f\nam: 694c766be9 -s ours\n\n* commit \u0027694c766be9eb0057499461f3d9244e81205edc18\u0027:\n DO NOT MERGE - libstagefright: check requested memory size before allocation for SoftMPEG4Encoder and SoftVPXEncoder.\n" }, { "commit": "945e0d780cc19501f9414050742e422b30c64054", "tree": "bcf4f94686e32ea9b03a881a870ce57c00c516f2", "parents": [ "f8ad572ea6259534dd2a9ef160e59976f5514951", "9e1e0024140e07a94eff154d84b39d639fb98923" ], "author": { "name": "Wei Jia", "email": "wjia@google.com", "time": "Thu Dec 03 23:31:00 2015 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Thu Dec 03 23:31:00 2015 +0000" }, "message": "libstagefright: check requested memory size before allocation for SoftMPEG4Encoder and SoftVPXEncoder. am: 69bd1cf225 am: bee48d7956 am: d1bcd1a80f am: ff0c114eae\nam: 9e1e002414\n\n* commit \u00279e1e0024140e07a94eff154d84b39d639fb98923\u0027:\n libstagefright: check requested memory size before allocation for SoftMPEG4Encoder and SoftVPXEncoder.\n" }, { "commit": "83066d1046795253a13d7d591d3c83de0c748d22", "tree": "578b0aa02974b2dc51c7fc59327ad5d79f96ebf3", "parents": [ "3abe346ed28c70a4e3612bf4081410414669b898", "6cd7a9f811a5d8b6232012f11833f1a16235cabc" ], "author": { "name": "Andy Hung", "email": "hunga@google.com", "time": "Thu Dec 03 23:30:49 2015 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Thu Dec 03 23:30:49 2015 +0000" }, "message": "DO NOT MERGE SoundPool: add lock for findSample access from SoundPoolThread am: 3d6a714980 am: 208bc477d9 -s ours am: c56555962b am: f4dfde92ea -s ours am: 92edb173a7 am: 9161b6adc9 am: 8f283a894d -s ours am: 6d3f50d9c3 am: 0357d3503f\nam: 6cd7a9f811\n\n* commit \u00276cd7a9f811a5d8b6232012f11833f1a16235cabc\u0027:\n DO NOT MERGE SoundPool: add lock for findSample access from SoundPoolThread\n" }, { "commit": "f8ad572ea6259534dd2a9ef160e59976f5514951", "tree": "bcf4f94686e32ea9b03a881a870ce57c00c516f2", "parents": [ "728a7aa0819cd583f09a941f26b71886533a244f", "a4d6e82d474fd8c18d27f879bd8643b918b7af91" ], "author": { "name": "Eric Laurent", "email": "elaurent@google.com", "time": "Thu Dec 03 23:30:49 2015 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Thu Dec 03 23:30:49 2015 +0000" }, "message": "Merge \"Volume should take VOLUME_MIN_DB value when audio is muted.\" am: 2e12b68fad am: e04b1e747e\nam: a4d6e82d47\n\n* commit \u0027a4d6e82d474fd8c18d27f879bd8643b918b7af91\u0027:\n Volume should take VOLUME_MIN_DB value when audio is muted.\n" }, { "commit": "ffa5d53049208edea27b88f67e7cc62a2d259319", "tree": "d5fe55a5d48f463f1d999f6a19bf0fc7a5e9b7cc", "parents": [ "fffc234d8fa348b2bc84e6be94e5f2364e63e32b", "3abe346ed28c70a4e3612bf4081410414669b898" ], "author": { "name": "Andy Hung", "email": "hunga@google.com", "time": "Thu Dec 03 23:27:32 2015 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Thu Dec 03 23:27:32 2015 +0000" }, "message": "Merge \"DO NOT MERGE SoundPool: add lock for findSample access from SoundPoolThread\" into lmp-dev am: 0c4d693722 am: ba49fda63a -s ours am: bb1809ace7 am: adfda28b42 am: 569d39f94a -s ours am: 975bb62996 am: b51610971c am: 047cfaf95a\nam: 3abe346ed2\n\n* commit \u00273abe346ed28c70a4e3612bf4081410414669b898\u0027:\n DO NOT MERGE SoundPool: add lock for findSample access from SoundPoolThread\n" }, { "commit": "6cd7a9f811a5d8b6232012f11833f1a16235cabc", "tree": "8d1565c6ea5f2071ca4fffa3017cd76609d37ed1", "parents": [ "047cfaf95aa5b2e4c18da78ce0f013c01aebe690", "0357d3503f53fe447d3490380e91102bb8122cf8" ], "author": { "name": "Andy Hung", "email": "hunga@google.com", "time": "Thu Dec 03 23:27:24 2015 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Thu Dec 03 23:27:24 2015 +0000" }, "message": "DO NOT MERGE SoundPool: add lock for findSample access from SoundPoolThread am: 3d6a714980 am: 208bc477d9 -s ours am: c56555962b am: f4dfde92ea -s ours am: 92edb173a7 am: 9161b6adc9 am: 8f283a894d -s ours am: 6d3f50d9c3\nam: 0357d3503f\n\n* commit \u00270357d3503f53fe447d3490380e91102bb8122cf8\u0027:\n DO NOT MERGE SoundPool: add lock for findSample access from SoundPoolThread\n" }, { "commit": "728a7aa0819cd583f09a941f26b71886533a244f", "tree": "13a3a7bd4227cd0977d4aeb57fc1e2febaee6244", "parents": [ "469826c69810c24f2e90291182c8501e76be31f0", "8420073fda0f6f6c68c952e030b0dbc184112e42" ], "author": { "name": "Andy Hung", "email": "hunga@google.com", "time": "Thu Dec 03 23:24:17 2015 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Thu Dec 03 23:24:17 2015 +0000" }, "message": "Merge \"NuPlayerRenderer: Allow immediate pause on next track.\"" }, { "commit": "0357d3503f53fe447d3490380e91102bb8122cf8", "tree": "3d142814f8a856dd51f44a20637b8434dfa2a9ec", "parents": [ "b51610971c26307bf50dd4c9ff5a50f512e75d6a", "6d3f50d9c31544a3cb9ae76c9ac08f92eb83c449" ], "author": { "name": "Andy Hung", "email": "hunga@google.com", "time": "Thu Dec 03 23:22:45 2015 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Thu Dec 03 23:22:45 2015 +0000" }, "message": "DO NOT MERGE SoundPool: add lock for findSample access from SoundPoolThread am: 3d6a714980 am: 208bc477d9 -s ours am: c56555962b am: f4dfde92ea -s ours am: 92edb173a7 am: 9161b6adc9 am: 8f283a894d -s ours\nam: 6d3f50d9c3\n\n* commit \u00276d3f50d9c31544a3cb9ae76c9ac08f92eb83c449\u0027:\n DO NOT MERGE SoundPool: add lock for findSample access from SoundPoolThread\n" }, { "commit": "3abe346ed28c70a4e3612bf4081410414669b898", "tree": "578b0aa02974b2dc51c7fc59327ad5d79f96ebf3", "parents": [ "946388cc942d4804fe1f308715cdb5adf135e0cc", "047cfaf95aa5b2e4c18da78ce0f013c01aebe690" ], "author": { "name": "Andy Hung", "email": "hunga@google.com", "time": "Thu Dec 03 23:19:16 2015 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Thu Dec 03 23:19:16 2015 +0000" }, "message": "Merge \"DO NOT MERGE SoundPool: add lock for findSample access from SoundPoolThread\" into lmp-dev am: 0c4d693722 am: ba49fda63a -s ours am: bb1809ace7 am: adfda28b42 am: 569d39f94a -s ours am: 975bb62996 am: b51610971c\nam: 047cfaf95a\n\n* commit \u0027047cfaf95aa5b2e4c18da78ce0f013c01aebe690\u0027:\n DO NOT MERGE SoundPool: add lock for findSample access from SoundPoolThread\n" }, { "commit": "6d3f50d9c31544a3cb9ae76c9ac08f92eb83c449", "tree": "d18a9c00f76b655077a24492529c76b27158303d", "parents": [ "975bb62996d194c43ceb5f4a34f58870a1004e59", "8f283a894dfe2d5c7d987cd62f0498c46a0ff90d" ], "author": { "name": "Andy Hung", "email": "hunga@google.com", "time": "Thu Dec 03 23:19:07 2015 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Thu Dec 03 23:19:07 2015 +0000" }, "message": "DO NOT MERGE SoundPool: add lock for findSample access from SoundPoolThread am: 3d6a714980 am: 208bc477d9 -s ours am: c56555962b am: f4dfde92ea -s ours am: 92edb173a7 am: 9161b6adc9\nam: 8f283a894d -s ours\n\n* commit \u00278f283a894dfe2d5c7d987cd62f0498c46a0ff90d\u0027:\n DO NOT MERGE SoundPool: add lock for findSample access from SoundPoolThread\n" }, { "commit": "047cfaf95aa5b2e4c18da78ce0f013c01aebe690", "tree": "8d1565c6ea5f2071ca4fffa3017cd76609d37ed1", "parents": [ "29ff7f2ac7af5499dbbd6670b981251212831b60", "b51610971c26307bf50dd4c9ff5a50f512e75d6a" ], "author": { "name": "Andy Hung", "email": "hunga@google.com", "time": "Thu Dec 03 23:14:49 2015 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Thu Dec 03 23:14:49 2015 +0000" }, "message": "Merge \"DO NOT MERGE SoundPool: add lock for findSample access from SoundPoolThread\" into lmp-dev am: 0c4d693722 am: ba49fda63a -s ours am: bb1809ace7 am: adfda28b42 am: 569d39f94a -s ours am: 975bb62996\nam: b51610971c\n\n* commit \u0027b51610971c26307bf50dd4c9ff5a50f512e75d6a\u0027:\n DO NOT MERGE SoundPool: add lock for findSample access from SoundPoolThread\n" }, { "commit": "8f283a894dfe2d5c7d987cd62f0498c46a0ff90d", "tree": "6112019db06f1b36ecaaffb6c0033d3619ef0a6b", "parents": [ "569d39f94ab77ebf219bd2f0717e1a322269cfb4", "9161b6adc9150fdefe4a48f371767ca192e54606" ], "author": { "name": "Andy Hung", "email": "hunga@google.com", "time": "Thu Dec 03 23:14:49 2015 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Thu Dec 03 23:14:49 2015 +0000" }, "message": "DO NOT MERGE SoundPool: add lock for findSample access from SoundPoolThread am: 3d6a714980 am: 208bc477d9 -s ours am: c56555962b am: f4dfde92ea -s ours am: 92edb173a7\nam: 9161b6adc9\n\n* commit \u00279161b6adc9150fdefe4a48f371767ca192e54606\u0027:\n DO NOT MERGE SoundPool: add lock for findSample access from SoundPoolThread\n" }, { "commit": "9161b6adc9150fdefe4a48f371767ca192e54606", "tree": "73ff66c06401095bb8d9fc83f21a16e99a0165bc", "parents": [ "adfda28b4211812737fd7a6d7b9729dbef35be93", "92edb173a725a1e648b926545e27110fef27a16a" ], "author": { "name": "Andy Hung", "email": "hunga@google.com", "time": "Thu Dec 03 23:11:16 2015 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Thu Dec 03 23:11:16 2015 +0000" }, "message": "DO NOT MERGE SoundPool: add lock for findSample access from SoundPoolThread am: 3d6a714980 am: 208bc477d9 -s ours am: c56555962b am: f4dfde92ea -s ours\nam: 92edb173a7\n\n* commit \u002792edb173a725a1e648b926545e27110fef27a16a\u0027:\n DO NOT MERGE SoundPool: add lock for findSample access from SoundPoolThread\n" }, { "commit": "b51610971c26307bf50dd4c9ff5a50f512e75d6a", "tree": "3d142814f8a856dd51f44a20637b8434dfa2a9ec", "parents": [ "f766fdb62590cc3c233ba51c45f2b4aade6483d4", "975bb62996d194c43ceb5f4a34f58870a1004e59" ], "author": { "name": "Andy Hung", "email": "hunga@google.com", "time": "Thu Dec 03 23:11:15 2015 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Thu Dec 03 23:11:15 2015 +0000" }, "message": "Merge \"DO NOT MERGE SoundPool: add lock for findSample access from SoundPoolThread\" into lmp-dev am: 0c4d693722 am: ba49fda63a -s ours am: bb1809ace7 am: adfda28b42 am: 569d39f94a -s ours\nam: 975bb62996\n\n* commit \u0027975bb62996d194c43ceb5f4a34f58870a1004e59\u0027:\n DO NOT MERGE SoundPool: add lock for findSample access from SoundPoolThread\n" }, { "commit": "975bb62996d194c43ceb5f4a34f58870a1004e59", "tree": "d18a9c00f76b655077a24492529c76b27158303d", "parents": [ "7a2dbcd38b27e9f626c5d7a56490b4315e5641ea", "569d39f94ab77ebf219bd2f0717e1a322269cfb4" ], "author": { "name": "Andy Hung", "email": "hunga@google.com", "time": "Thu Dec 03 23:06:27 2015 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Thu Dec 03 23:06:27 2015 +0000" }, "message": "Merge \"DO NOT MERGE SoundPool: add lock for findSample access from SoundPoolThread\" into lmp-dev am: 0c4d693722 am: ba49fda63a -s ours am: bb1809ace7 am: adfda28b42\nam: 569d39f94a -s ours\n\n* commit \u0027569d39f94ab77ebf219bd2f0717e1a322269cfb4\u0027:\n DO NOT MERGE SoundPool: add lock for findSample access from SoundPoolThread\n" }, { "commit": "92edb173a725a1e648b926545e27110fef27a16a", "tree": "73ff66c06401095bb8d9fc83f21a16e99a0165bc", "parents": [ "bb1809ace7c3e38c40b3b84e63225613e638ee91", "f4dfde92ea86c333fa04a2dc54e85791208b1ca4" ], "author": { "name": "Andy Hung", "email": "hunga@google.com", "time": "Thu Dec 03 23:06:26 2015 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Thu Dec 03 23:06:26 2015 +0000" }, "message": "DO NOT MERGE SoundPool: add lock for findSample access from SoundPoolThread am: 3d6a714980 am: 208bc477d9 -s ours am: c56555962b\nam: f4dfde92ea -s ours\n\n* commit \u0027f4dfde92ea86c333fa04a2dc54e85791208b1ca4\u0027:\n DO NOT MERGE SoundPool: add lock for findSample access from SoundPoolThread\n" }, { "commit": "569d39f94ab77ebf219bd2f0717e1a322269cfb4", "tree": "6112019db06f1b36ecaaffb6c0033d3619ef0a6b", "parents": [ "2048dd5483c76892f5c5d54ad54e9782073bed5c", "adfda28b4211812737fd7a6d7b9729dbef35be93" ], "author": { "name": "Andy Hung", "email": "hunga@google.com", "time": "Thu Dec 03 23:02:45 2015 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Thu Dec 03 23:02:45 2015 +0000" }, "message": "Merge \"DO NOT MERGE SoundPool: add lock for findSample access from SoundPoolThread\" into lmp-dev am: 0c4d693722 am: ba49fda63a -s ours am: bb1809ace7\nam: adfda28b42\n\n* commit \u0027adfda28b4211812737fd7a6d7b9729dbef35be93\u0027:\n DO NOT MERGE SoundPool: add lock for findSample access from SoundPoolThread\n" }, { "commit": "f4dfde92ea86c333fa04a2dc54e85791208b1ca4", "tree": "2e41013b650ecbb041149aea007cc56d42dc9c4c", "parents": [ "ba49fda63a38571596b197ce5a1a71d74ddb9464", "c56555962b7e0fcee2dc0a058127f8f309f19ea8" ], "author": { "name": "Andy Hung", "email": "hunga@google.com", "time": "Thu Dec 03 23:02:45 2015 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Thu Dec 03 23:02:45 2015 +0000" }, "message": "DO NOT MERGE SoundPool: add lock for findSample access from SoundPoolThread am: 3d6a714980 am: 208bc477d9 -s ours\nam: c56555962b\n\n* commit \u0027c56555962b7e0fcee2dc0a058127f8f309f19ea8\u0027:\n DO NOT MERGE SoundPool: add lock for findSample access from SoundPoolThread\n" }, { "commit": "adfda28b4211812737fd7a6d7b9729dbef35be93", "tree": "73ff66c06401095bb8d9fc83f21a16e99a0165bc", "parents": [ "e0c9d8afd0886162f19d28eb33c82878a0dada7d", "bb1809ace7c3e38c40b3b84e63225613e638ee91" ], "author": { "name": "Andy Hung", "email": "hunga@google.com", "time": "Thu Dec 03 22:58:49 2015 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Thu Dec 03 22:58:49 2015 +0000" }, "message": "Merge \"DO NOT MERGE SoundPool: add lock for findSample access from SoundPoolThread\" into lmp-dev am: 0c4d693722 am: ba49fda63a -s ours\nam: bb1809ace7\n\n* commit \u0027bb1809ace7c3e38c40b3b84e63225613e638ee91\u0027:\n DO NOT MERGE SoundPool: add lock for findSample access from SoundPoolThread\n" }, { "commit": "c56555962b7e0fcee2dc0a058127f8f309f19ea8", "tree": "af0242b197534a96d569c0396b63bc5f3991afa0", "parents": [ "0c4d6937229096d530de7ef3fca496ac2d65c051", "208bc477d92dbd2e5b4d1c0b2d000fa4c231e9d3" ], "author": { "name": "Andy Hung", "email": "hunga@google.com", "time": "Thu Dec 03 22:58:49 2015 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Thu Dec 03 22:58:49 2015 +0000" }, "message": "DO NOT MERGE SoundPool: add lock for findSample access from SoundPoolThread am: 3d6a714980\nam: 208bc477d9 -s ours\n\n* commit \u0027208bc477d92dbd2e5b4d1c0b2d000fa4c231e9d3\u0027:\n DO NOT MERGE SoundPool: add lock for findSample access from SoundPoolThread\n" }, { "commit": "bb1809ace7c3e38c40b3b84e63225613e638ee91", "tree": "73ff66c06401095bb8d9fc83f21a16e99a0165bc", "parents": [ "db76a879ea1a2b57a1561b04c3ffb39bed3155ae", "ba49fda63a38571596b197ce5a1a71d74ddb9464" ], "author": { "name": "Andy Hung", "email": "hunga@google.com", "time": "Thu Dec 03 22:55:36 2015 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Thu Dec 03 22:55:36 2015 +0000" }, "message": "Merge \"DO NOT MERGE SoundPool: add lock for findSample access from SoundPoolThread\" into lmp-dev am: 0c4d693722\nam: ba49fda63a -s ours\n\n* commit \u0027ba49fda63a38571596b197ce5a1a71d74ddb9464\u0027:\n DO NOT MERGE SoundPool: add lock for findSample access from SoundPoolThread\n" }, { "commit": "208bc477d92dbd2e5b4d1c0b2d000fa4c231e9d3", "tree": "f24b4d3f782bf473dbeb70c5e4b579bc135eaa15", "parents": [ "9e1d7751b12ea976323abc1fe7760323ab142d39", "3d6a7149802928ecf3f58b7218b0e82699b492df" ], "author": { "name": "Andy Hung", "email": "hunga@google.com", "time": "Thu Dec 03 22:55:36 2015 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Thu Dec 03 22:55:36 2015 +0000" }, "message": "DO NOT MERGE SoundPool: add lock for findSample access from SoundPoolThread\nam: 3d6a714980\n\n* commit \u00273d6a7149802928ecf3f58b7218b0e82699b492df\u0027:\n DO NOT MERGE SoundPool: add lock for findSample access from SoundPoolThread\n" }, { "commit": "8420073fda0f6f6c68c952e030b0dbc184112e42", "tree": "772ec9a8251eb16a5be9f6df2910003c36d966bd", "parents": [ "6411cb684e5994834c441d94708d245d81b474a5" ], "author": { "name": "Andy Hung", "email": "hunga@google.com", "time": "Thu Dec 03 14:41:06 2015 -0800" }, "committer": { "name": "Andy Hung", "email": "hunga@google.com", "time": "Thu Dec 03 14:55:00 2015 -0800" }, "message": "NuPlayerRenderer: Allow immediate pause on next track.\n\nPrior code required audio data to have been decoded first.\n\nBug: 25904185\nChange-Id: I52fa65b2ed53d29ddd534c2bf3070626d54bd633\n" }, { "commit": "ba49fda63a38571596b197ce5a1a71d74ddb9464", "tree": "2e41013b650ecbb041149aea007cc56d42dc9c4c", "parents": [ "862b693ba3c2abaed66968385d3d7d4a3dd70cb3", "0c4d6937229096d530de7ef3fca496ac2d65c051" ], "author": { "name": "Andy Hung", "email": "hunga@google.com", "time": "Thu Dec 03 22:52:05 2015 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Thu Dec 03 22:52:05 2015 +0000" }, "message": "Merge \"DO NOT MERGE SoundPool: add lock for findSample access from SoundPoolThread\" into lmp-dev\nam: 0c4d693722\n\n* commit \u00270c4d6937229096d530de7ef3fca496ac2d65c051\u0027:\n DO NOT MERGE SoundPool: add lock for findSample access from SoundPoolThread\n" }, { "commit": "0c4d6937229096d530de7ef3fca496ac2d65c051", "tree": "af0242b197534a96d569c0396b63bc5f3991afa0", "parents": [ "4c0d24362609e9aa9f4f6afe6ee483d3d939f663", "19c47afbc402542720ddd280e1bbde3b2277b586" ], "author": { "name": "Andy Hung", "email": "hunga@google.com", "time": "Thu Dec 03 22:48:03 2015 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Thu Dec 03 22:48:03 2015 +0000" }, "message": "Merge \"DO NOT MERGE SoundPool: add lock for findSample access from SoundPoolThread\" into lmp-dev" }, { "commit": "469826c69810c24f2e90291182c8501e76be31f0", "tree": "2b35231da050f48ea9f0c406ae782aab83c3e9a3", "parents": [ "ee25a737a29f6300d52b6dd31ce4c78b73e3cad7", "90e8a97dd5c9d391d7a2ea6a2290ed976f928379" ], "author": { "name": "Andy Hung", "email": "hunga@google.com", "time": "Thu Dec 03 19:42:37 2015 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Thu Dec 03 19:42:37 2015 +0000" }, "message": "Merge \"Use modulo position variables in AudioTrack and AudioRecord\"" }, { "commit": "3d6a7149802928ecf3f58b7218b0e82699b492df", "tree": "d1733d4792e95ae68ed843927cf38291863e4c42", "parents": [ "6afc659b00c3f4a83b9f5f3c744b7119b33340b4" ], "author": { "name": "Andy Hung", "email": "hunga@google.com", "time": "Wed Dec 02 15:55:23 2015 -0800" }, "committer": { "name": "Andy Hung", "email": "hunga@google.com", "time": "Thu Dec 03 18:54:00 2015 +0000" }, "message": "DO NOT MERGE SoundPool: add lock for findSample access from SoundPoolThread\n\nSample decoding still occurs in SoundPoolThread\nwithout holding the SoundPool lock.\n\nBug: 25781119\nChange-Id: I11fde005aa9cf5438e0390a0d2dfe0ec1dd282e8\n" }, { "commit": "fffc234d8fa348b2bc84e6be94e5f2364e63e32b", "tree": "d5fe55a5d48f463f1d999f6a19bf0fc7a5e9b7cc", "parents": [ "694c766be9eb0057499461f3d9244e81205edc18", "946388cc942d4804fe1f308715cdb5adf135e0cc" ], "author": { "name": "Wei Jia", "email": "wjia@google.com", "time": "Thu Dec 03 18:42:10 2015 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Thu Dec 03 18:42:10 2015 +0000" }, "message": "DO NOT MERGE - libstagefright: check requested memory size before allocation for SoftMPEG4Encoder and SoftVPXEncoder. am: 6afc659b00 am: 9e1d7751b1 -s ours am: 4c0d243626 am: 862b693ba3 -s ours am: db76a879ea am: e0c9d8afd0 am: 2048dd5483 -s ours am: 7a2dbcd38b am: f766fdb625 am: 29ff7f2ac7\nam: 946388cc94\n\n* commit \u0027946388cc942d4804fe1f308715cdb5adf135e0cc\u0027:\n DO NOT MERGE - libstagefright: check requested memory size before allocation for SoftMPEG4Encoder and SoftVPXEncoder.\n" }, { "commit": "946388cc942d4804fe1f308715cdb5adf135e0cc", "tree": "578b0aa02974b2dc51c7fc59327ad5d79f96ebf3", "parents": [ "062ea7264f1d80c9e0f14d6efaea4179202bd8bd", "29ff7f2ac7af5499dbbd6670b981251212831b60" ], "author": { "name": "Wei Jia", "email": "wjia@google.com", "time": "Thu Dec 03 18:33:37 2015 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Thu Dec 03 18:33:37 2015 +0000" }, "message": "DO NOT MERGE - libstagefright: check requested memory size before allocation for SoftMPEG4Encoder and SoftVPXEncoder. am: 6afc659b00 am: 9e1d7751b1 -s ours am: 4c0d243626 am: 862b693ba3 -s ours am: db76a879ea am: e0c9d8afd0 am: 2048dd5483 -s ours am: 7a2dbcd38b am: f766fdb625\nam: 29ff7f2ac7\n\n* commit \u002729ff7f2ac7af5499dbbd6670b981251212831b60\u0027:\n DO NOT MERGE - libstagefright: check requested memory size before allocation for SoftMPEG4Encoder and SoftVPXEncoder.\n" }, { "commit": "694c766be9eb0057499461f3d9244e81205edc18", "tree": "d5fe55a5d48f463f1d999f6a19bf0fc7a5e9b7cc", "parents": [ "9e1e0024140e07a94eff154d84b39d639fb98923", "062ea7264f1d80c9e0f14d6efaea4179202bd8bd" ], "author": { "name": "Wei Jia", "email": "wjia@google.com", "time": "Thu Dec 03 18:29:02 2015 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Thu Dec 03 18:29:02 2015 +0000" }, "message": "DO NOT MERGE - libstagefright: check requested memory size before allocation for SoftMPEG4Encoder and SoftVPXEncoder. am: 0462975291 am: 3e8e134597 -s ours am: e4223a8d32 am: bed81d6594 am: dd4576b017 -s ours am: e3bbe235f6 am: b7e63bfadb am: 2c7411483b\nam: 062ea7264f\n\n* commit \u0027062ea7264f1d80c9e0f14d6efaea4179202bd8bd\u0027:\n DO NOT MERGE - libstagefright: check requested memory size before allocation for SoftMPEG4Encoder and SoftVPXEncoder.\n" }, { "commit": "29ff7f2ac7af5499dbbd6670b981251212831b60", "tree": "8d1565c6ea5f2071ca4fffa3017cd76609d37ed1", "parents": [ "2c7411483b098a84de41f56c2bce6ff8518ff7a2", "f766fdb62590cc3c233ba51c45f2b4aade6483d4" ], "author": { "name": "Wei Jia", "email": "wjia@google.com", "time": "Thu Dec 03 18:29:02 2015 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Thu Dec 03 18:29:02 2015 +0000" }, "message": "DO NOT MERGE - libstagefright: check requested memory size before allocation for SoftMPEG4Encoder and SoftVPXEncoder. am: 6afc659b00 am: 9e1d7751b1 -s ours am: 4c0d243626 am: 862b693ba3 -s ours am: db76a879ea am: e0c9d8afd0 am: 2048dd5483 -s ours am: 7a2dbcd38b\nam: f766fdb625\n\n* commit \u0027f766fdb62590cc3c233ba51c45f2b4aade6483d4\u0027:\n DO NOT MERGE - libstagefright: check requested memory size before allocation for SoftMPEG4Encoder and SoftVPXEncoder.\n" }, { "commit": "f766fdb62590cc3c233ba51c45f2b4aade6483d4", "tree": "3d142814f8a856dd51f44a20637b8434dfa2a9ec", "parents": [ "b7e63bfadbd83396f68e7b99ee3b6e67f646bf58", "7a2dbcd38b27e9f626c5d7a56490b4315e5641ea" ], "author": { "name": "Wei Jia", "email": "wjia@google.com", "time": "Thu Dec 03 18:24:50 2015 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Thu Dec 03 18:24:50 2015 +0000" }, "message": "DO NOT MERGE - libstagefright: check requested memory size before allocation for SoftMPEG4Encoder and SoftVPXEncoder. am: 6afc659b00 am: 9e1d7751b1 -s ours am: 4c0d243626 am: 862b693ba3 -s ours am: db76a879ea am: e0c9d8afd0 am: 2048dd5483 -s ours\nam: 7a2dbcd38b\n\n* commit \u00277a2dbcd38b27e9f626c5d7a56490b4315e5641ea\u0027:\n DO NOT MERGE - libstagefright: check requested memory size before allocation for SoftMPEG4Encoder and SoftVPXEncoder.\n" }, { "commit": "7a2dbcd38b27e9f626c5d7a56490b4315e5641ea", "tree": "d18a9c00f76b655077a24492529c76b27158303d", "parents": [ "e3bbe235f618af53774758727c2c22d02aead97b", "2048dd5483c76892f5c5d54ad54e9782073bed5c" ], "author": { "name": "Wei Jia", "email": "wjia@google.com", "time": "Thu Dec 03 18:20:37 2015 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Thu Dec 03 18:20:37 2015 +0000" }, "message": "DO NOT MERGE - libstagefright: check requested memory size before allocation for SoftMPEG4Encoder and SoftVPXEncoder. am: 6afc659b00 am: 9e1d7751b1 -s ours am: 4c0d243626 am: 862b693ba3 -s ours am: db76a879ea am: e0c9d8afd0\nam: 2048dd5483 -s ours\n\n* commit \u00272048dd5483c76892f5c5d54ad54e9782073bed5c\u0027:\n DO NOT MERGE - libstagefright: check requested memory size before allocation for SoftMPEG4Encoder and SoftVPXEncoder.\n" }, { "commit": "062ea7264f1d80c9e0f14d6efaea4179202bd8bd", "tree": "578b0aa02974b2dc51c7fc59327ad5d79f96ebf3", "parents": [ "ff0c114eae58a2133d7ec827f670b4478489210c", "2c7411483b098a84de41f56c2bce6ff8518ff7a2" ], "author": { "name": "Wei Jia", "email": "wjia@google.com", "time": "Thu Dec 03 18:20:37 2015 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Thu Dec 03 18:20:37 2015 +0000" }, "message": "DO NOT MERGE - libstagefright: check requested memory size before allocation for SoftMPEG4Encoder and SoftVPXEncoder. am: 0462975291 am: 3e8e134597 -s ours am: e4223a8d32 am: bed81d6594 am: dd4576b017 -s ours am: e3bbe235f6 am: b7e63bfadb\nam: 2c7411483b\n\n* commit \u00272c7411483b098a84de41f56c2bce6ff8518ff7a2\u0027:\n DO NOT MERGE - libstagefright: check requested memory size before allocation for SoftMPEG4Encoder and SoftVPXEncoder.\n" }, { "commit": "2048dd5483c76892f5c5d54ad54e9782073bed5c", "tree": "6112019db06f1b36ecaaffb6c0033d3619ef0a6b", "parents": [ "dd4576b0177a26d7f52a48b18405f49d6ef1b5fb", "e0c9d8afd0886162f19d28eb33c82878a0dada7d" ], "author": { "name": "Wei Jia", "email": "wjia@google.com", "time": "Thu Dec 03 18:15:53 2015 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Thu Dec 03 18:15:53 2015 +0000" }, "message": "DO NOT MERGE - libstagefright: check requested memory size before allocation for SoftMPEG4Encoder and SoftVPXEncoder. am: 6afc659b00 am: 9e1d7751b1 -s ours am: 4c0d243626 am: 862b693ba3 -s ours am: db76a879ea\nam: e0c9d8afd0\n\n* commit \u0027e0c9d8afd0886162f19d28eb33c82878a0dada7d\u0027:\n DO NOT MERGE - libstagefright: check requested memory size before allocation for SoftMPEG4Encoder and SoftVPXEncoder.\n" }, { "commit": "2c7411483b098a84de41f56c2bce6ff8518ff7a2", "tree": "8d1565c6ea5f2071ca4fffa3017cd76609d37ed1", "parents": [ "d1bcd1a80f1b12a3c18616bca48e7afc2fff52b6", "b7e63bfadbd83396f68e7b99ee3b6e67f646bf58" ], "author": { "name": "Wei Jia", "email": "wjia@google.com", "time": "Thu Dec 03 18:15:53 2015 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Thu Dec 03 18:15:53 2015 +0000" }, "message": "DO NOT MERGE - libstagefright: check requested memory size before allocation for SoftMPEG4Encoder and SoftVPXEncoder. am: 0462975291 am: 3e8e134597 -s ours am: e4223a8d32 am: bed81d6594 am: dd4576b017 -s ours am: e3bbe235f6\nam: b7e63bfadb\n\n* commit \u0027b7e63bfadbd83396f68e7b99ee3b6e67f646bf58\u0027:\n DO NOT MERGE - libstagefright: check requested memory size before allocation for SoftMPEG4Encoder and SoftVPXEncoder.\n" }, { "commit": "e0c9d8afd0886162f19d28eb33c82878a0dada7d", "tree": "73ff66c06401095bb8d9fc83f21a16e99a0165bc", "parents": [ "bed81d6594f26cb86c542d61fa65130f3f898b1b", "db76a879ea1a2b57a1561b04c3ffb39bed3155ae" ], "author": { "name": "Wei Jia", "email": "wjia@google.com", "time": "Thu Dec 03 18:11:22 2015 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Thu Dec 03 18:11:22 2015 +0000" }, "message": "DO NOT MERGE - libstagefright: check requested memory size before allocation for SoftMPEG4Encoder and SoftVPXEncoder. am: 6afc659b00 am: 9e1d7751b1 -s ours am: 4c0d243626 am: 862b693ba3 -s ours\nam: db76a879ea\n\n* commit \u0027db76a879ea1a2b57a1561b04c3ffb39bed3155ae\u0027:\n DO NOT MERGE - libstagefright: check requested memory size before allocation for SoftMPEG4Encoder and SoftVPXEncoder.\n" }, { "commit": "b7e63bfadbd83396f68e7b99ee3b6e67f646bf58", "tree": "3d142814f8a856dd51f44a20637b8434dfa2a9ec", "parents": [ "bee48d795693f4794f807b964aa96712cbd1b6b0", "e3bbe235f618af53774758727c2c22d02aead97b" ], "author": { "name": "Wei Jia", "email": "wjia@google.com", "time": "Thu Dec 03 18:11:22 2015 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Thu Dec 03 18:11:22 2015 +0000" }, "message": "DO NOT MERGE - libstagefright: check requested memory size before allocation for SoftMPEG4Encoder and SoftVPXEncoder. am: 0462975291 am: 3e8e134597 -s ours am: e4223a8d32 am: bed81d6594 am: dd4576b017 -s ours\nam: e3bbe235f6\n\n* commit \u0027e3bbe235f618af53774758727c2c22d02aead97b\u0027:\n DO NOT MERGE - libstagefright: check requested memory size before allocation for SoftMPEG4Encoder and SoftVPXEncoder.\n" }, { "commit": "9e1e0024140e07a94eff154d84b39d639fb98923", "tree": "d5fe55a5d48f463f1d999f6a19bf0fc7a5e9b7cc", "parents": [ "a4d6e82d474fd8c18d27f879bd8643b918b7af91", "ff0c114eae58a2133d7ec827f670b4478489210c" ], "author": { "name": "Wei Jia", "email": "wjia@google.com", "time": "Thu Dec 03 18:06:48 2015 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Thu Dec 03 18:06:48 2015 +0000" }, "message": "libstagefright: check requested memory size before allocation for SoftMPEG4Encoder and SoftVPXEncoder. am: 69bd1cf225 am: bee48d7956 am: d1bcd1a80f\nam: ff0c114eae\n\n* commit \u0027ff0c114eae58a2133d7ec827f670b4478489210c\u0027:\n libstagefright: check requested memory size before allocation for SoftMPEG4Encoder and SoftVPXEncoder.\n" }, { "commit": "db76a879ea1a2b57a1561b04c3ffb39bed3155ae", "tree": "73ff66c06401095bb8d9fc83f21a16e99a0165bc", "parents": [ "e4223a8d324e03aec1130b166bf19367bd490b8f", "862b693ba3c2abaed66968385d3d7d4a3dd70cb3" ], "author": { "name": "Wei Jia", "email": "wjia@google.com", "time": "Thu Dec 03 18:06:48 2015 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Thu Dec 03 18:06:48 2015 +0000" }, "message": "DO NOT MERGE - libstagefright: check requested memory size before allocation for SoftMPEG4Encoder and SoftVPXEncoder. am: 6afc659b00 am: 9e1d7751b1 -s ours am: 4c0d243626\nam: 862b693ba3 -s ours\n\n* commit \u0027862b693ba3c2abaed66968385d3d7d4a3dd70cb3\u0027:\n DO NOT MERGE - libstagefright: check requested memory size before allocation for SoftMPEG4Encoder and SoftVPXEncoder.\n" }, { "commit": "e3bbe235f618af53774758727c2c22d02aead97b", "tree": "d18a9c00f76b655077a24492529c76b27158303d", "parents": [ "69bd1cf225328e64a5b4ae6935d2b7fe0b7b6400", "dd4576b0177a26d7f52a48b18405f49d6ef1b5fb" ], "author": { "name": "Wei Jia", "email": "wjia@google.com", "time": "Thu Dec 03 18:06:48 2015 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Thu Dec 03 18:06:48 2015 +0000" }, "message": "DO NOT MERGE - libstagefright: check requested memory size before allocation for SoftMPEG4Encoder and SoftVPXEncoder. am: 0462975291 am: 3e8e134597 -s ours am: e4223a8d32 am: bed81d6594\nam: dd4576b017 -s ours\n\n* commit \u0027dd4576b0177a26d7f52a48b18405f49d6ef1b5fb\u0027:\n DO NOT MERGE - libstagefright: check requested memory size before allocation for SoftMPEG4Encoder and SoftVPXEncoder.\n" }, { "commit": "862b693ba3c2abaed66968385d3d7d4a3dd70cb3", "tree": "50fb424f7135d6290838bebcb063c960ed897dbe", "parents": [ "3e8e1345971927e0aa5e55c34f79f6856101a96b", "4c0d24362609e9aa9f4f6afe6ee483d3d939f663" ], "author": { "name": "Wei Jia", "email": "wjia@google.com", "time": "Thu Dec 03 18:02:24 2015 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Thu Dec 03 18:02:24 2015 +0000" }, "message": "DO NOT MERGE - libstagefright: check requested memory size before allocation for SoftMPEG4Encoder and SoftVPXEncoder. am: 6afc659b00 am: 9e1d7751b1 -s ours\nam: 4c0d243626\n\n* commit \u00274c0d24362609e9aa9f4f6afe6ee483d3d939f663\u0027:\n DO NOT MERGE - libstagefright: check requested memory size before allocation for SoftMPEG4Encoder and SoftVPXEncoder.\n" }, { "commit": "dd4576b0177a26d7f52a48b18405f49d6ef1b5fb", "tree": "6112019db06f1b36ecaaffb6c0033d3619ef0a6b", "parents": [ "000321c7ee8c2a0e489d41b9a5f8bad93bdd89b2", "bed81d6594f26cb86c542d61fa65130f3f898b1b" ], "author": { "name": "Wei Jia", "email": "wjia@google.com", "time": "Thu Dec 03 18:02:24 2015 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Thu Dec 03 18:02:24 2015 +0000" }, "message": "DO NOT MERGE - libstagefright: check requested memory size before allocation for SoftMPEG4Encoder and SoftVPXEncoder. am: 0462975291 am: 3e8e134597 -s ours am: e4223a8d32\nam: bed81d6594\n\n* commit \u0027bed81d6594f26cb86c542d61fa65130f3f898b1b\u0027:\n DO NOT MERGE - libstagefright: check requested memory size before allocation for SoftMPEG4Encoder and SoftVPXEncoder.\n" }, { "commit": "4c0d24362609e9aa9f4f6afe6ee483d3d939f663", "tree": "27e9f317a6af761a4026418d9decb059a4218b3f", "parents": [ "0462975291796e414891e04bcec9da993914e458", "9e1d7751b12ea976323abc1fe7760323ab142d39" ], "author": { "name": "Wei Jia", "email": "wjia@google.com", "time": "Thu Dec 03 17:56:44 2015 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Thu Dec 03 17:56:44 2015 +0000" }, "message": "DO NOT MERGE - libstagefright: check requested memory size before allocation for SoftMPEG4Encoder and SoftVPXEncoder. am: 6afc659b00\nam: 9e1d7751b1 -s ours\n\n* commit \u00279e1d7751b12ea976323abc1fe7760323ab142d39\u0027:\n DO NOT MERGE - libstagefright: check requested memory size before allocation for SoftMPEG4Encoder and SoftVPXEncoder.\n" }, { "commit": "ff0c114eae58a2133d7ec827f670b4478489210c", "tree": "578b0aa02974b2dc51c7fc59327ad5d79f96ebf3", "parents": [ "27affe9ed6ca7c25618911e017722e5cfd89e756", "d1bcd1a80f1b12a3c18616bca48e7afc2fff52b6" ], "author": { "name": "Wei Jia", "email": "wjia@google.com", "time": "Thu Dec 03 17:56:44 2015 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Thu Dec 03 17:56:44 2015 +0000" }, "message": "libstagefright: check requested memory size before allocation for SoftMPEG4Encoder and SoftVPXEncoder. am: 69bd1cf225 am: bee48d7956\nam: d1bcd1a80f\n\n* commit \u0027d1bcd1a80f1b12a3c18616bca48e7afc2fff52b6\u0027:\n libstagefright: check requested memory size before allocation for SoftMPEG4Encoder and SoftVPXEncoder.\n" }, { "commit": "bed81d6594f26cb86c542d61fa65130f3f898b1b", "tree": "73ff66c06401095bb8d9fc83f21a16e99a0165bc", "parents": [ "7b5564e251680275d810b5c34b5d9a3caebff0fb", "e4223a8d324e03aec1130b166bf19367bd490b8f" ], "author": { "name": "Wei Jia", "email": "wjia@google.com", "time": "Thu Dec 03 17:56:44 2015 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Thu Dec 03 17:56:44 2015 +0000" }, "message": "DO NOT MERGE - libstagefright: check requested memory size before allocation for SoftMPEG4Encoder and SoftVPXEncoder. am: 0462975291 am: 3e8e134597 -s ours\nam: e4223a8d32\n\n* commit \u0027e4223a8d324e03aec1130b166bf19367bd490b8f\u0027:\n DO NOT MERGE - libstagefright: check requested memory size before allocation for SoftMPEG4Encoder and SoftVPXEncoder.\n" }, { "commit": "9e1d7751b12ea976323abc1fe7760323ab142d39", "tree": "55956286a4785e4d6b6efd5a090f149f0f9404eb", "parents": [ "781cd4f37d4b81a8e5af45a3ba6cdd4cdd209a3e", "6afc659b00c3f4a83b9f5f3c744b7119b33340b4" ], "author": { "name": "Wei Jia", "email": "wjia@google.com", "time": "Thu Dec 03 17:53:24 2015 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Thu Dec 03 17:53:24 2015 +0000" }, "message": "DO NOT MERGE - libstagefright: check requested memory size before allocation for SoftMPEG4Encoder and SoftVPXEncoder.\nam: 6afc659b00\n\n* commit \u00276afc659b00c3f4a83b9f5f3c744b7119b33340b4\u0027:\n DO NOT MERGE - libstagefright: check requested memory size before allocation for SoftMPEG4Encoder and SoftVPXEncoder.\n" }, { "commit": "d1bcd1a80f1b12a3c18616bca48e7afc2fff52b6", "tree": "8d1565c6ea5f2071ca4fffa3017cd76609d37ed1", "parents": [ "a022f6e7b7f3ef86095199ef02903051c9a6a08c", "bee48d795693f4794f807b964aa96712cbd1b6b0" ], "author": { "name": "Wei Jia", "email": "wjia@google.com", "time": "Thu Dec 03 17:53:24 2015 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Thu Dec 03 17:53:24 2015 +0000" }, "message": "libstagefright: check requested memory size before allocation for SoftMPEG4Encoder and SoftVPXEncoder. am: 69bd1cf225\nam: bee48d7956\n\n* commit \u0027bee48d795693f4794f807b964aa96712cbd1b6b0\u0027:\n libstagefright: check requested memory size before allocation for SoftMPEG4Encoder and SoftVPXEncoder.\n" }, { "commit": "e4223a8d324e03aec1130b166bf19367bd490b8f", "tree": "73ff66c06401095bb8d9fc83f21a16e99a0165bc", "parents": [ "92b6cd8da9052e17710945604cd45098ebfb25e0", "3e8e1345971927e0aa5e55c34f79f6856101a96b" ], "author": { "name": "Wei Jia", "email": "wjia@google.com", "time": "Thu Dec 03 17:53:24 2015 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Thu Dec 03 17:53:24 2015 +0000" }, "message": "DO NOT MERGE - libstagefright: check requested memory size before allocation for SoftMPEG4Encoder and SoftVPXEncoder. am: 0462975291\nam: 3e8e134597 -s ours\n\n* commit \u00273e8e1345971927e0aa5e55c34f79f6856101a96b\u0027:\n DO NOT MERGE - libstagefright: check requested memory size before allocation for SoftMPEG4Encoder and SoftVPXEncoder.\n" }, { "commit": "bee48d795693f4794f807b964aa96712cbd1b6b0", "tree": "3d142814f8a856dd51f44a20637b8434dfa2a9ec", "parents": [ "87f8cbb223ee516803dbb99699320c2484cbf3ba", "69bd1cf225328e64a5b4ae6935d2b7fe0b7b6400" ], "author": { "name": "Wei Jia", "email": "wjia@google.com", "time": "Thu Dec 03 17:50:17 2015 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Thu Dec 03 17:50:17 2015 +0000" }, "message": "libstagefright: check requested memory size before allocation for SoftMPEG4Encoder and SoftVPXEncoder.\nam: 69bd1cf225\n\n* commit \u002769bd1cf225328e64a5b4ae6935d2b7fe0b7b6400\u0027:\n libstagefright: check requested memory size before allocation for SoftMPEG4Encoder and SoftVPXEncoder.\n" }, { "commit": "3e8e1345971927e0aa5e55c34f79f6856101a96b", "tree": "50fb424f7135d6290838bebcb063c960ed897dbe", "parents": [ "313358c747b54bbdcbff97636546e0304f6f4947", "0462975291796e414891e04bcec9da993914e458" ], "author": { "name": "Wei Jia", "email": "wjia@google.com", "time": "Thu Dec 03 17:50:17 2015 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Thu Dec 03 17:50:17 2015 +0000" }, "message": "DO NOT MERGE - libstagefright: check requested memory size before allocation for SoftMPEG4Encoder and SoftVPXEncoder.\nam: 0462975291\n\n* commit \u00270462975291796e414891e04bcec9da993914e458\u0027:\n DO NOT MERGE - libstagefright: check requested memory size before allocation for SoftMPEG4Encoder and SoftVPXEncoder.\n" }, { "commit": "6afc659b00c3f4a83b9f5f3c744b7119b33340b4", "tree": "68e7a24302e124cd3e267e2e467f9447e03c6fb3", "parents": [ "b1a13d01dccbc48ea54aeb4a4ba7fce636ff1daa" ], "author": { "name": "Wei Jia", "email": "wjia@google.com", "time": "Fri Nov 20 10:34:35 2015 -0800" }, "committer": { "name": "Wei Jia", "email": "wjia@google.com", "time": "Thu Dec 03 09:40:33 2015 -0800" }, "message": "DO NOT MERGE - libstagefright: check requested memory size before allocation for SoftMPEG4Encoder and SoftVPXEncoder.\n\nBug: 25812794\nChange-Id: I96dc74734380d462583f6efa33d09946f9532809\n(cherry picked from commit 87f8cbb223ee516803dbb99699320c2484cbf3ba)\n" }, { "commit": "0462975291796e414891e04bcec9da993914e458", "tree": "27e9f317a6af761a4026418d9decb059a4218b3f", "parents": [ "09c291c838bc74bb7c10c22f7232abb946cad8ff" ], "author": { "name": "Wei Jia", "email": "wjia@google.com", "time": "Fri Nov 20 10:34:35 2015 -0800" }, "committer": { "name": "Wei Jia", "email": "wjia@google.com", "time": "Thu Dec 03 17:40:16 2015 +0000" }, "message": "DO NOT MERGE - libstagefright: check requested memory size before allocation for SoftMPEG4Encoder and SoftVPXEncoder.\n\nBug: 25812794\nChange-Id: I96dc74734380d462583f6efa33d09946f9532809\n(cherry picked from commit 87f8cbb223ee516803dbb99699320c2484cbf3ba)\n" }, { "commit": "69bd1cf225328e64a5b4ae6935d2b7fe0b7b6400", "tree": "d18a9c00f76b655077a24492529c76b27158303d", "parents": [ "681bc45d2592ed447f70d1dd14e92ad584499c9d" ], "author": { "name": "Wei Jia", "email": "wjia@google.com", "time": "Fri Nov 20 10:34:35 2015 -0800" }, "committer": { "name": "Wei Jia", "email": "wjia@google.com", "time": "Thu Dec 03 17:32:59 2015 +0000" }, "message": "libstagefright: check requested memory size before allocation for SoftMPEG4Encoder and SoftVPXEncoder.\n\nBug: 25812794\nChange-Id: I96dc74734380d462583f6efa33d09946f9532809\n(cherry picked from commit 87f8cbb223ee516803dbb99699320c2484cbf3ba)\n" }, { "commit": "a4d6e82d474fd8c18d27f879bd8643b918b7af91", "tree": "d5fe55a5d48f463f1d999f6a19bf0fc7a5e9b7cc", "parents": [ "6c44b53bfd9f3e532c9ac96ddc6e3c3ba36a4ec2", "e04b1e747e0c1680836dab71357cb6bd216aa575" ], "author": { "name": "Eric Laurent", "email": "elaurent@google.com", "time": "Thu Dec 03 16:36:52 2015 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Thu Dec 03 16:36:52 2015 +0000" }, "message": "Merge \"Volume should take VOLUME_MIN_DB value when audio is muted.\" am: 2e12b68fad\nam: e04b1e747e\n\n* commit \u0027e04b1e747e0c1680836dab71357cb6bd216aa575\u0027:\n Volume should take VOLUME_MIN_DB value when audio is muted.\n" }, { "commit": "e04b1e747e0c1680836dab71357cb6bd216aa575", "tree": "7014b09b605bfaf03985222a49dd136ff1306205", "parents": [ "0fa572b3cf0475f5a370f0e06c0b450f0ff2c05e", "2e12b68fad486445f230fb0435e6d5483047c85c" ], "author": { "name": "Eric Laurent", "email": "elaurent@google.com", "time": "Thu Dec 03 16:33:26 2015 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Thu Dec 03 16:33:26 2015 +0000" }, "message": "Merge \"Volume should take VOLUME_MIN_DB value when audio is muted.\"\nam: 2e12b68fad\n\n* commit \u00272e12b68fad486445f230fb0435e6d5483047c85c\u0027:\n Volume should take VOLUME_MIN_DB value when audio is muted.\n" }, { "commit": "2e12b68fad486445f230fb0435e6d5483047c85c", "tree": "5a29d017b134bb1e70b31100effe5ff5094cfc50", "parents": [ "b6845aff2f9f4802340d3c9b3b7e749a10a340ab", "8cf5cf7c49e6c7cff160149727b17e1ab6015409" ], "author": { "name": "Eric Laurent", "email": "elaurent@google.com", "time": "Thu Dec 03 16:30:41 2015 +0000" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Thu Dec 03 16:30:41 2015 +0000" }, "message": "Merge \"Volume should take VOLUME_MIN_DB value when audio is muted.\"" }, { "commit": "8cf5cf7c49e6c7cff160149727b17e1ab6015409", "tree": "5a29d017b134bb1e70b31100effe5ff5094cfc50", "parents": [ "b6845aff2f9f4802340d3c9b3b7e749a10a340ab" ], "author": { "name": "Safa Boumaiza", "email": "Safax.boumaiza@intel.com", "time": "Tue Nov 10 10:11:54 2015 +0100" }, "committer": { "name": "Zhiquan Liu", "email": "zhiquan.liu@intel.com", "time": "Thu Dec 03 05:43:37 2015 +0000" }, "message": "Volume should take VOLUME_MIN_DB value when audio is muted.\n\nAudio can be heard when muting volume as the minimum volume\nvalue takes 0.0f instead of VOLUME_MIN_DB (-758).\n\nThis patch fixes the minimum volume value which should be\nVOLUME_MIN_DB instead of 0.0f.\n\nChange-Id: I4cb8093b6d9f18e5330ba5f770b9133baa77542f\nSigned-off-by: Safa Boumaiza \u003cSafax.boumaiza@intel.com\u003e\nSigned-off-by: Zhiquan Liu \u003czhiquan.liu@intel.com\u003e\n" }, { "commit": "19c47afbc402542720ddd280e1bbde3b2277b586", "tree": "d2c3657298566f4466ea0f6ee51217ffe1a9b7a1", "parents": [ "09c291c838bc74bb7c10c22f7232abb946cad8ff" ], "author": { "name": "Andy Hung", "email": "hunga@google.com", "time": "Wed Dec 02 15:55:23 2015 -0800" }, "committer": { "name": "Andy Hung", "email": "hunga@google.com", "time": "Wed Dec 02 18:05:32 2015 -0800" }, "message": "DO NOT MERGE SoundPool: add lock for findSample access from SoundPoolThread\n\nSample decoding still occurs in SoundPoolThread\nwithout holding the SoundPool lock.\n\nBug: 25781119\nChange-Id: I11fde005aa9cf5438e0390a0d2dfe0ec1dd282e8\n" }, { "commit": "ee25a737a29f6300d52b6dd31ce4c78b73e3cad7", "tree": "807461d00cb78bc5f0495d4f44b55d77838b48b8", "parents": [ "a424b43eaab3db9d16a56ce3641f04b37a504c1a", "6c44b53bfd9f3e532c9ac96ddc6e3c3ba36a4ec2" ], "author": { "name": "Wei Jia", "email": "wjia@google.com", "time": "Thu Dec 03 01:43:00 2015 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Thu Dec 03 01:43:00 2015 +0000" }, "message": "libstagefright: check requested memory size before allocation for SoftMPEG4Encoder and SoftVPXEncoder. am: 87f8cbb223 am: a022f6e7b7 am: 27affe9ed6\nam: 6c44b53bfd\n\n* commit \u00276c44b53bfd9f3e532c9ac96ddc6e3c3ba36a4ec2\u0027:\n libstagefright: check requested memory size before allocation for SoftMPEG4Encoder and SoftVPXEncoder.\n" }, { "commit": "6c44b53bfd9f3e532c9ac96ddc6e3c3ba36a4ec2", "tree": "e6578b13acd58c385e25f66ff97d9db4b7246eef", "parents": [ "fa81e4dfe69c972a7da44b0bc945a6ef12366e35", "27affe9ed6ca7c25618911e017722e5cfd89e756" ], "author": { "name": "Wei Jia", "email": "wjia@google.com", "time": "Thu Dec 03 01:38:53 2015 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Thu Dec 03 01:38:53 2015 +0000" }, "message": "libstagefright: check requested memory size before allocation for SoftMPEG4Encoder and SoftVPXEncoder. am: 87f8cbb223 am: a022f6e7b7\nam: 27affe9ed6\n\n* commit \u002727affe9ed6ca7c25618911e017722e5cfd89e756\u0027:\n libstagefright: check requested memory size before allocation for SoftMPEG4Encoder and SoftVPXEncoder.\n" }, { "commit": "27affe9ed6ca7c25618911e017722e5cfd89e756", "tree": "578b0aa02974b2dc51c7fc59327ad5d79f96ebf3", "parents": [ "35997452876b7ec164534b5267535076597495cd", "a022f6e7b7f3ef86095199ef02903051c9a6a08c" ], "author": { "name": "Wei Jia", "email": "wjia@google.com", "time": "Thu Dec 03 01:31:02 2015 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Thu Dec 03 01:31:02 2015 +0000" }, "message": "libstagefright: check requested memory size before allocation for SoftMPEG4Encoder and SoftVPXEncoder. am: 87f8cbb223\nam: a022f6e7b7\n\n* commit \u0027a022f6e7b7f3ef86095199ef02903051c9a6a08c\u0027:\n libstagefright: check requested memory size before allocation for SoftMPEG4Encoder and SoftVPXEncoder.\n" }, { "commit": "a022f6e7b7f3ef86095199ef02903051c9a6a08c", "tree": "8d1565c6ea5f2071ca4fffa3017cd76609d37ed1", "parents": [ "ddbebb92f831784dc143d2cd8492ce690e238744", "87f8cbb223ee516803dbb99699320c2484cbf3ba" ], "author": { "name": "Wei Jia", "email": "wjia@google.com", "time": "Thu Dec 03 01:27:33 2015 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Thu Dec 03 01:27:33 2015 +0000" }, "message": "libstagefright: check requested memory size before allocation for SoftMPEG4Encoder and SoftVPXEncoder.\nam: 87f8cbb223\n\n* commit \u002787f8cbb223ee516803dbb99699320c2484cbf3ba\u0027:\n libstagefright: check requested memory size before allocation for SoftMPEG4Encoder and SoftVPXEncoder.\n" }, { "commit": "a424b43eaab3db9d16a56ce3641f04b37a504c1a", "tree": "b4a438ff126212d2e35055bb47b52edc4f87c216", "parents": [ "2a4e18da8ee0521a48285643586159946298caef", "d6dabe95eb59c3d95f94825d08a6028bab06cbdc" ], "author": { "name": "Daichi Hirono", "email": "hirono@google.com", "time": "Thu Dec 03 01:10:49 2015 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Thu Dec 03 01:10:49 2015 +0000" }, "message": "Merge \"Skip an interface that does not have MTP interface class.\"" }, { "commit": "2a4e18da8ee0521a48285643586159946298caef", "tree": "dfc925389d78d5d6fe872665d9fb5221a1ece9d2", "parents": [ "74721e5cf4b007cfcb644224df1f50a64891a412", "f7d65ee34f64e8fad9c5af3f11da783193caf5f9" ], "author": { "name": "Glenn Kasten", "email": "gkasten@google.com", "time": "Thu Dec 03 00:18:21 2015 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Thu Dec 03 00:18:21 2015 +0000" }, "message": "Merge \"Add logging to help diagnose a rare bug\"" }, { "commit": "74721e5cf4b007cfcb644224df1f50a64891a412", "tree": "21bb8c795b8f3f1c3922b4468e379bd3cccaeb38", "parents": [ "d08bf350e15dd7bf47466bdc8efbd23d3272a687", "818da521b6a487518f54614b9eba68957a8d8aeb" ], "author": { "name": "Glenn Kasten", "email": "gkasten@google.com", "time": "Thu Dec 03 00:18:12 2015 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Thu Dec 03 00:18:12 2015 +0000" }, "message": "Merge \"Fix build warnings\"" }, { "commit": "d08bf350e15dd7bf47466bdc8efbd23d3272a687", "tree": "3c50afa26be659c07405a0d2952767f465cc7294", "parents": [ "cf6c76583acbac014ba40079ddd3dfa341162e87", "883ff4f4c41ae9bf84d1912ab054fe38f7505dd0" ], "author": { "name": "Dan Austin", "email": "danielaustin@google.com", "time": "Wed Dec 02 23:49:07 2015 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Wed Dec 02 23:49:07 2015 +0000" }, "message": "Merge \"Ignore benign overflows\"" }, { "commit": "cf6c76583acbac014ba40079ddd3dfa341162e87", "tree": "351c87245078519670a6e00fdd0ea48a7a7d701a", "parents": [ "327c68cffe13da1614f2fe30f8aad6a8f557af0a", "d0609ad390ff8bb1cafebdf363bf1d15e63b949f" ], "author": { "name": "Eric Laurent", "email": "elaurent@google.com", "time": "Wed Dec 02 23:46:17 2015 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Wed Dec 02 23:46:17 2015 +0000" }, "message": "Merge \"audio policy: move device_category type outside volume class\"" }, { "commit": "883ff4f4c41ae9bf84d1912ab054fe38f7505dd0", "tree": "a794e7835f68922dea155ac0f869475a46cda771", "parents": [ "3f273d10817ddb2f792ae043de692efcdf1988ae" ], "author": { "name": "Marco Nelissen", "email": "marcone@google.com", "time": "Wed Dec 02 15:44:39 2015 -0800" }, "committer": { "name": "Marco Nelissen", "email": "marcone@google.com", "time": "Wed Dec 02 15:44:39 2015 -0800" }, "message": "Ignore benign overflows\n\nBug: 25843966\nChange-Id: I40fe7aee3f40f224c0984a9bbeefb99d364345ac\n" }, { "commit": "327c68cffe13da1614f2fe30f8aad6a8f557af0a", "tree": "fdf5cbbac73026e03cce96da5e508a57e03bc639", "parents": [ "2698408e1cbeca3539e3812c67097ffa5e328a47", "221761b3aa3fb5b0160dfef3bab414fcc348dd56" ], "author": { "name": "Ronghua Wu", "email": "ronghuawu@google.com", "time": "Wed Dec 02 22:17:27 2015 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Wed Dec 02 22:17:27 2015 +0000" }, "message": "Merge \"Use oom score instead of process state to indicate process priority.\"" }, { "commit": "2698408e1cbeca3539e3812c67097ffa5e328a47", "tree": "1c5096fb8a6eb67640f836fedf2289d8dcb5b0bc", "parents": [ "ea800d4550a4f6698a4d3c401d7d37ae0d54f1a6", "fa81e4dfe69c972a7da44b0bc945a6ef12366e35" ], "author": { "name": "Chris Elliott", "email": "chriselliott@google.com", "time": "Wed Dec 02 22:10:17 2015 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Wed Dec 02 22:10:17 2015 +0000" }, "message": "DO NOT MERGE Revert \"AwesomePlayer: Separate cache buffer watermarks for offload audio\" am: 3599745287\nam: fa81e4dfe6 -s ours\n\n* commit \u0027fa81e4dfe69c972a7da44b0bc945a6ef12366e35\u0027:\n DO NOT MERGE Revert \"AwesomePlayer: Separate cache buffer watermarks for offload audio\"\n" }, { "commit": "ea800d4550a4f6698a4d3c401d7d37ae0d54f1a6", "tree": "1c5096fb8a6eb67640f836fedf2289d8dcb5b0bc", "parents": [ "2f90c51d42efa881a9e54e4f4efadf99398304f9", "abab38e493b0efa24bfda1edec3d9d11c32789a6" ], "author": { "name": "Chris Elliott", "email": "chriselliott@google.com", "time": "Wed Dec 02 22:10:09 2015 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Wed Dec 02 22:10:09 2015 +0000" }, "message": "DO NOT MERGE Revert \"AwesomePlayer: Stop posting buffering events once at EOS\" am: 92e4151434\nam: abab38e493 -s ours\n\n* commit \u0027abab38e493b0efa24bfda1edec3d9d11c32789a6\u0027:\n DO NOT MERGE Revert \"AwesomePlayer: Stop posting buffering events once at EOS\"\n" }, { "commit": "fa81e4dfe69c972a7da44b0bc945a6ef12366e35", "tree": "64cb95ba210e3ee01edf5c9e82e58235efea0adf", "parents": [ "abab38e493b0efa24bfda1edec3d9d11c32789a6", "35997452876b7ec164534b5267535076597495cd" ], "author": { "name": "Chris Elliott", "email": "chriselliott@google.com", "time": "Wed Dec 02 22:05:18 2015 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Wed Dec 02 22:05:18 2015 +0000" }, "message": "DO NOT MERGE Revert \"AwesomePlayer: Separate cache buffer watermarks for offload audio\"\nam: 3599745287\n\n* commit \u002735997452876b7ec164534b5267535076597495cd\u0027:\n DO NOT MERGE Revert \"AwesomePlayer: Separate cache buffer watermarks for offload audio\"\n" }, { "commit": "abab38e493b0efa24bfda1edec3d9d11c32789a6", "tree": "fd68c0d967477bc4f621cce5b1a13693adbdc423", "parents": [ "c71f9a1b36ac8b5dcde889b954f7f35e107b084a", "92e41514344227f0c0cf09e9a989b455c8490fda" ], "author": { "name": "Chris Elliott", "email": "chriselliott@google.com", "time": "Wed Dec 02 22:05:10 2015 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Wed Dec 02 22:05:10 2015 +0000" }, "message": "DO NOT MERGE Revert \"AwesomePlayer: Stop posting buffering events once at EOS\"\nam: 92e4151434\n\n* commit \u002792e41514344227f0c0cf09e9a989b455c8490fda\u0027:\n DO NOT MERGE Revert \"AwesomePlayer: Stop posting buffering events once at EOS\"\n" }, { "commit": "818da521b6a487518f54614b9eba68957a8d8aeb", "tree": "2bebe90e0200afccc7833698cc2eb89507204e1b", "parents": [ "2f90c51d42efa881a9e54e4f4efadf99398304f9" ], "author": { "name": "Glenn Kasten", "email": "gkasten@google.com", "time": "Wed Dec 02 13:53:26 2015 -0800" }, "committer": { "name": "Glenn Kasten", "email": "gkasten@google.com", "time": "Wed Dec 02 13:53:45 2015 -0800" }, "message": "Fix build warnings\n\nChange-Id: Ic329a9852589247ed797b6a6cfed735ff3af184a\n" }, { "commit": "f7d65ee34f64e8fad9c5af3f11da783193caf5f9", "tree": "a4480f4fedd254ad9aba751bcc1c3620beb9cd3e", "parents": [ "4d81d15fdaf302d20740bcaaa3100b62dd49e243" ], "author": { "name": "Glenn Kasten", "email": "gkasten@google.com", "time": "Wed Dec 02 13:45:01 2015 -0800" }, "committer": { "name": "Glenn Kasten", "email": "gkasten@google.com", "time": "Wed Dec 02 13:46:43 2015 -0800" }, "message": "Add logging to help diagnose a rare bug\n\nBug: 25911696\nChange-Id: Idca44ed873f0a9fa911e9cb1c3a09b4e7e4f23eb\n" } ], "next": "35997452876b7ec164534b5267535076597495cd" }