)]}' { "log": [ { "commit": "a0d77cd6bf5f4ee3ee9d67ad26e7f9981991d4e7", "tree": "0fcfaa98191e91c3f464a93937ef51daf331d9a9", "parents": [ "d0f5664abb5a8d94ae13f63a5f3491b47383ee2f" ], "author": { "name": "Glenn Kasten", "email": "gkasten@google.com", "time": "Fri Aug 09 14:32:40 2013 -0700" }, "committer": { "name": "Glenn Kasten", "email": "gkasten@android.com", "time": "Fri Aug 09 16:01:03 2013 -0700" }, "message": "Fix SoundPool.play() looping regression in 4.3 DO NOT MERGE\n\nThe change I7370d6e59a7ef26dfb284a8b058d5ab2e0a42ccf caused a regression\nin SoundPool looping when using SoundPool\u0027s streaming implementation.\nThis reverts a portion of that change.\n\nBug: https://code.google.com/p/android/issues/detail?id\u003d58113\nBug: 10171337\nChange-Id: I8af0dc8683a7c7f225c80f0eb4d39770667b52e5\n" }, { "commit": "d0f5664abb5a8d94ae13f63a5f3491b47383ee2f", "tree": "cfd1f8e07656fe523b22ef3d7a31d38e42bbf422", "parents": [ "b687ff9f2e02790e8a8e3964cb73e87546cd72dd", "a355bb4f5ce39a77d05f62263d4be888e903c4cd" ], "author": { "name": "Andreas Huber", "email": "andih@google.com", "time": "Thu Aug 08 15:52:47 2013 +0000" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Thu Aug 08 15:52:48 2013 +0000" }, "message": "Merge \"Handle undefined NAL type for h264 streaming\"" }, { "commit": "b687ff9f2e02790e8a8e3964cb73e87546cd72dd", "tree": "89581f56db6f3468fae334b1de81a23488aa48e5", "parents": [ "d0ef1ccd987e650e025b840e72f91770d03a5110", "eb144bbbd0b18427562b0d7db5b38e11f9484739" ], "author": { "name": "Glenn Kasten", "email": "gkasten@android.com", "time": "Thu Aug 01 19:37:52 2013 +0000" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Thu Aug 01 19:37:52 2013 +0000" }, "message": "Merge \"Fix mismatched delete/new couple\"" }, { "commit": "d0ef1ccd987e650e025b840e72f91770d03a5110", "tree": "dba78b1a839d35dd2f32c4a8710f8e2bfeb4fe39", "parents": [ "1bb59258458350af518170558120783bc2f9e61d", "3e3af91f70b20623fa5f3845f26260235c0b212d" ], "author": { "name": "Andreas Huber", "email": "andih@google.com", "time": "Wed Jul 31 15:43:56 2013 +0000" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Wed Jul 31 15:43:56 2013 +0000" }, "message": "Merge \"rtsp handle response line ended with \u0027\\n\u0027\"" }, { "commit": "3e3af91f70b20623fa5f3845f26260235c0b212d", "tree": "dba78b1a839d35dd2f32c4a8710f8e2bfeb4fe39", "parents": [ "1bb59258458350af518170558120783bc2f9e61d" ], "author": { "name": "Yajun Zeng", "email": "beanz@marvell.com", "time": "Tue May 14 10:00:10 2013 +0800" }, "committer": { "name": "Yajun Zeng", "email": "beanz@marvell.com", "time": "Wed Jul 31 11:31:46 2013 +0800" }, "message": "rtsp handle response line ended with \u0027\\n\u0027\n\nChange-Id: I5bfafd3fa2c95083e833da2846556282eada2b02\nSigned-off-by: Yajun Zeng \u003cbeanz@marvell.com\u003e\n" }, { "commit": "eb144bbbd0b18427562b0d7db5b38e11f9484739", "tree": "c9ca9b64b648eef884e088f55c3693c0ddbc9c40", "parents": [ "1bb59258458350af518170558120783bc2f9e61d" ], "author": { "name": "Andrei V. FOMITCHEV", "email": "andreix.fomitchev@intel.com", "time": "Tue Oct 09 11:33:25 2012 +0200" }, "committer": { "name": "David Wagner", "email": "david.wagner@intel.com", "time": "Tue Jul 30 14:42:08 2013 +0200" }, "message": "Fix mismatched delete/new couple\n\nIn RecordThread::readInputParameters(), mRsmpInBuffer is allocated\nwith new[] and should be freed with delete[] instead of delete.\n\nThis error has been found by valgrind.\n\nChange-Id: I2f947abb658a21a7d1e61eebb99270cb37d2d147\nSigned-off-by: Andrei V. FOMITCHEV \u003candreix.fomitchev@intel.com\u003e\nSigned-off-by: David Wagner \u003cdavid.wagner@intel.com\u003e\nSigned-off-by: Jack Ren \u003cjack.ren@intel.com\u003e\nSigned-off-by: Bruce Beare \u003cbruce.j.beare@intel.com\u003e\n" }, { "commit": "a355bb4f5ce39a77d05f62263d4be888e903c4cd", "tree": "c7c34e03d8e6b476aa467ebf3b2a4b5d063555af", "parents": [ "1bb59258458350af518170558120783bc2f9e61d" ], "author": { "name": "Patrik2 Carlsson", "email": "patrik2.carlsson@sonyericsson.com", "time": "Fri Nov 16 16:18:03 2012 +0100" }, "committer": { "name": "Johan Redestig", "email": "johan.redestig@sonymobile.com", "time": "Sat Jul 27 17:48:38 2013 +0000" }, "message": "Handle undefined NAL type for h264 streaming\n\nPackages of undefined NAL type (0) was observed but lead to deleting\nthe subsequent package due to the current assembler implementation.\nIdentifying and ignoring this package without returning an error\nhandles undefined packages without side-effects.\n\nChange-Id: I02e15b8682bee3154b3c4acf82639a28417f0c85\n" }, { "commit": "1bb59258458350af518170558120783bc2f9e61d", "tree": "130ea2f4111654771de0807a0ffd2fda5ba92365", "parents": [ "0a95b17c93f8ca0a4ed46bdc5797aa81f46f028c", "ba83e61a56e2189fba4be1fe4485ea0ce76a7225" ], "author": { "name": "The Android Open Source Project", "email": "initial-contribution@android.com", "time": "Wed Jul 10 08:34:46 2013 -0700" }, "committer": { "name": "The Android Open Source Project", "email": "initial-contribution@android.com", "time": "Wed Jul 10 08:34:46 2013 -0700" }, "message": "Reconcile with jb-mr2-zeroday-release - do not merge\n\nChange-Id: Ie4a7e41d8d28b46966f6aadfd38af5516c082f04\n" }, { "commit": "ba83e61a56e2189fba4be1fe4485ea0ce76a7225", "tree": "4700e3363f26d6cc69f6eccbf82db96dc39503f1", "parents": [ "a2520db02bead68d4980783c41500ae96511bdf8", "af06050932e00a03bed7b12c8ac86d90008052f2" ], "author": { "name": "The Android Automerger", "email": "android-build@google.com", "time": "Wed Jul 10 05:55:16 2013 -0700" }, "committer": { "name": "The Android Automerger", "email": "android-build@google.com", "time": "Wed Jul 10 05:55:16 2013 -0700" }, "message": "merge in jb-mr2-zeroday-release history after reset to jb-mr2-dev\n" }, { "commit": "0a95b17c93f8ca0a4ed46bdc5797aa81f46f028c", "tree": "130ea2f4111654771de0807a0ffd2fda5ba92365", "parents": [ "adaa78c901a2f2509965b7acc1cde848dfc6bafe", "af06050932e00a03bed7b12c8ac86d90008052f2" ], "author": { "name": "The Android Open Source Project", "email": "initial-contribution@android.com", "time": "Tue Jul 09 09:37:21 2013 -0700" }, "committer": { "name": "The Android Open Source Project", "email": "initial-contribution@android.com", "time": "Tue Jul 09 09:37:21 2013 -0700" }, "message": "Reconcile with jb-mr2-zeroday-release - do not merge\n\nChange-Id: I9a9eea4a01ba78b06cb79a26db9b0bcb52f5fd7b\n" }, { "commit": "adaa78c901a2f2509965b7acc1cde848dfc6bafe", "tree": "130ea2f4111654771de0807a0ffd2fda5ba92365", "parents": [ "06a4604e77b5872857ef95fe712b6ce00c7aa506", "a2520db02bead68d4980783c41500ae96511bdf8" ], "author": { "name": "Zhijun He", "email": "zhijunhe@google.com", "time": "Tue Jul 09 08:00:35 2013 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Tue Jul 09 08:00:35 2013 -0700" }, "message": "am a2520db0: camera2/3: set preview callback oneshot flag during still capture\n\n* commit \u0027a2520db02bead68d4980783c41500ae96511bdf8\u0027:\n camera2/3: set preview callback oneshot flag during still capture\n" }, { "commit": "af06050932e00a03bed7b12c8ac86d90008052f2", "tree": "08608bdb6a061244b8cb7405a11f3bde8ff12ae7", "parents": [ "4a5c009bc2389304cf078c270bceb656479367d2", "15e5c9f49ad92ce985c9d0c2fe2767df2833b12c" ], "author": { "name": "The Android Automerger", "email": "android-build@google.com", "time": "Tue Jul 09 05:55:21 2013 -0700" }, "committer": { "name": "The Android Automerger", "email": "android-build@google.com", "time": "Tue Jul 09 05:55:21 2013 -0700" }, "message": "merge in jb-mr2-zeroday-release history after reset to jb-mr2-dev\n" }, { "commit": "a2520db02bead68d4980783c41500ae96511bdf8", "tree": "4700e3363f26d6cc69f6eccbf82db96dc39503f1", "parents": [ "4a5c009bc2389304cf078c270bceb656479367d2" ], "author": { "name": "Zhijun He", "email": "zhijunhe@google.com", "time": "Mon Jul 08 16:12:32 2013 -0700" }, "committer": { "name": "Zhijun He", "email": "zhijunhe@google.com", "time": "Mon Jul 08 17:22:16 2013 -0700" }, "message": "camera2/3: set preview callback oneshot flag during still capture\n\nPreview callback oneshot flag need set when a still picture is being captured\nand preview callback oneshot is enabled, otherwise, the callback enabling status\ncould be lost when preview is restarted after still catpure.\n\nBug 9742091\n\nChange-Id: If9562369013e53727edfdd16f3d00d6a9392e70d\n" }, { "commit": "06a4604e77b5872857ef95fe712b6ce00c7aa506", "tree": "1bd43bfc13e12c0e189ceb55e978ff0fb6db0974", "parents": [ "291967728b02ad9a7d5545b0eb1ec0c4c3d664af", "4a5c009bc2389304cf078c270bceb656479367d2" ], "author": { "name": "Eino-Ville Talvala", "email": "etalvala@google.com", "time": "Mon Jul 08 16:47:27 2013 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Mon Jul 08 16:47:27 2013 -0700" }, "message": "am 4a5c009b: Camera2/3: As a fallback, unilaterally free old recording buffers\n\n* commit \u00274a5c009bc2389304cf078c270bceb656479367d2\u0027:\n Camera2/3: As a fallback, unilaterally free old recording buffers\n" }, { "commit": "291967728b02ad9a7d5545b0eb1ec0c4c3d664af", "tree": "1f4bebe3e7480d719ed2431427db16475730558e", "parents": [ "1468dd9cefe11d5938a5497688f99701b6b14706", "15e5c9f49ad92ce985c9d0c2fe2767df2833b12c" ], "author": { "name": "The Android Open Source Project", "email": "initial-contribution@android.com", "time": "Mon Jul 08 15:33:11 2013 -0700" }, "committer": { "name": "The Android Open Source Project", "email": "initial-contribution@android.com", "time": "Mon Jul 08 15:33:11 2013 -0700" }, "message": "Reconcile with jb-mr2-zeroday-release - do not merge\n\nChange-Id: I13e45e13c3abf52cef3fb58de3f4707fb8fedaac\n" }, { "commit": "1468dd9cefe11d5938a5497688f99701b6b14706", "tree": "1f4bebe3e7480d719ed2431427db16475730558e", "parents": [ "8ebdfa8b021ed338f9916a1f30d756b989afa3bd", "c582fde93ded7219107157333a9e46d780adcf9c" ], "author": { "name": "Jean-Baptiste Queru", "email": "jbq@google.com", "time": "Mon Jul 08 13:42:25 2013 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Mon Jul 08 13:42:25 2013 -0700" }, "message": "am c582fde9: resolved conflicts for merge of c158971f to stage-aosp-master\n\n* commit \u0027c582fde93ded7219107157333a9e46d780adcf9c\u0027:\n Store rtsp accessunit until PLAY response parsed\n" }, { "commit": "c582fde93ded7219107157333a9e46d780adcf9c", "tree": "f160b266ecfa9eef394f1ba7755f9e5bac422fd0", "parents": [ "5de9ef20d596bc20f53cba664f1ac7e358910ea2", "c158971f13ea4f496dc7836c698f1220fa4e4bba" ], "author": { "name": "Jean-Baptiste Queru", "email": "jbq@google.com", "time": "Mon Jul 08 13:36:08 2013 -0700" }, "committer": { "name": "Jean-Baptiste Queru", "email": "jbq@google.com", "time": "Mon Jul 08 13:36:08 2013 -0700" }, "message": "resolved conflicts for merge of c158971f to stage-aosp-master\n\nChange-Id: I3d77b86f7e616af62a826fc37126706ad8ff6158\n" }, { "commit": "4a5c009bc2389304cf078c270bceb656479367d2", "tree": "08608bdb6a061244b8cb7405a11f3bde8ff12ae7", "parents": [ "eced745af7d2d27a8c45e04eb071d4fb30cd3e48" ], "author": { "name": "Eino-Ville Talvala", "email": "etalvala@google.com", "time": "Wed Jul 03 16:56:11 2013 -0700" }, "committer": { "name": "Eino-Ville Talvala", "email": "etalvala@google.com", "time": "Mon Jul 08 13:12:10 2013 -0700" }, "message": "Camera2/3: As a fallback, unilaterally free old recording buffers\n\nWhen starting a recording session, check for and clear out recording\nbuffers still owned by stagefright from a previous recording session,\nif any. There should never be any, but in case they are due to a bug\nelsewhere in the system, clearing out the buffers makes recovery\npossible.\n\nBug: 9591080\nChange-Id: I3a2a1256860bd174381cd525948419f985c9b415\n" }, { "commit": "c158971f13ea4f496dc7836c698f1220fa4e4bba", "tree": "a302e54672cb84f5f8906670cf4f8a5cbfdf00af", "parents": [ "365ed394c4135d9d42082c85638c076aed4bd156", "bbbf9c4552402ab18b255f4058e9e6e506f3f106" ], "author": { "name": "Jean-Baptiste Queru", "email": "jbq@google.com", "time": "Mon Jul 08 19:35:13 2013 +0000" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Mon Jul 08 19:35:13 2013 +0000" }, "message": "Merge \"Store rtsp accessunit until PLAY response parsed\"" }, { "commit": "8ebdfa8b021ed338f9916a1f30d756b989afa3bd", "tree": "61a4c5ce548145dd0fe1409ecd2d95f359b42edb", "parents": [ "c26ab375ebb1bce6c3a99a46a72d8369170255ca", "5de9ef20d596bc20f53cba664f1ac7e358910ea2" ], "author": { "name": "Jean-Baptiste Queru", "email": "jbq@google.com", "time": "Mon Jul 08 12:20:16 2013 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Mon Jul 08 12:20:16 2013 -0700" }, "message": "am 5de9ef20: am 365ed394: Merge \"Typo in CameraParameters::set\"\n\n* commit \u00275de9ef20d596bc20f53cba664f1ac7e358910ea2\u0027:\n Typo in CameraParameters::set\n" }, { "commit": "5de9ef20d596bc20f53cba664f1ac7e358910ea2", "tree": "ed66ac85621e0d2aa6e885540aee671cefa73b02", "parents": [ "5d2ab2a6d5e90c045d0989ef1be6c66a2295ee2d", "365ed394c4135d9d42082c85638c076aed4bd156" ], "author": { "name": "Jean-Baptiste Queru", "email": "jbq@google.com", "time": "Mon Jul 08 12:15:36 2013 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Mon Jul 08 12:15:36 2013 -0700" }, "message": "am 365ed394: Merge \"Typo in CameraParameters::set\"\n\n* commit \u0027365ed394c4135d9d42082c85638c076aed4bd156\u0027:\n Typo in CameraParameters::set\n" }, { "commit": "365ed394c4135d9d42082c85638c076aed4bd156", "tree": "d6a60649001b824ee9f23846492e0e85e16fdecb", "parents": [ "8eef093c213094c7efb655ef4d9e31439646bd7f", "4c18eb30b493a4cd8d56bbcf8acb526b97c401a4" ], "author": { "name": "Jean-Baptiste Queru", "email": "jbq@google.com", "time": "Mon Jul 08 19:00:51 2013 +0000" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Mon Jul 08 19:00:57 2013 +0000" }, "message": "Merge \"Typo in CameraParameters::set\"" }, { "commit": "c26ab375ebb1bce6c3a99a46a72d8369170255ca", "tree": "b9bf6363d011a4c4f7e3a193ab3f286767719832", "parents": [ "046d9c8dad97118535778cf93efc662ceb5fec8d", "5d2ab2a6d5e90c045d0989ef1be6c66a2295ee2d" ], "author": { "name": "Jean-Baptiste Queru", "email": "jbq@google.com", "time": "Mon Jul 08 11:29:15 2013 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Mon Jul 08 11:29:15 2013 -0700" }, "message": "am 5d2ab2a6: am 8eef093c: Merge \"libstagefright: Use LOG_BASIC when use chromium http stack\"\n\n* commit \u00275d2ab2a6d5e90c045d0989ef1be6c66a2295ee2d\u0027:\n libstagefright: Use LOG_BASIC when use chromium http stack\n" }, { "commit": "046d9c8dad97118535778cf93efc662ceb5fec8d", "tree": "ac8d2ad8ad65d9d9812b20f209bbc47be6b43f64", "parents": [ "9f0e05978e236352fd2a4a7c6dce909755c36ead", "061979253985e59c4fcb82ede232717736e633b1" ], "author": { "name": "Jean-Baptiste Queru", "email": "jbq@google.com", "time": "Mon Jul 08 11:25:40 2013 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Mon Jul 08 11:25:40 2013 -0700" }, "message": "am 06197925: am 267363ee: Merge \"Prevent Media Server crash while the AwesomePlayer getBitrate return true with mBitrate equals to zero.\"\n\n* commit \u0027061979253985e59c4fcb82ede232717736e633b1\u0027:\n Prevent Media Server crash while the AwesomePlayer getBitrate return true with mBitrate equals to zero.\n" }, { "commit": "5d2ab2a6d5e90c045d0989ef1be6c66a2295ee2d", "tree": "82db445e4950d59cbdc185dcda1606c5a345ddbe", "parents": [ "061979253985e59c4fcb82ede232717736e633b1", "8eef093c213094c7efb655ef4d9e31439646bd7f" ], "author": { "name": "Jean-Baptiste Queru", "email": "jbq@google.com", "time": "Mon Jul 08 11:25:39 2013 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Mon Jul 08 11:25:39 2013 -0700" }, "message": "am 8eef093c: Merge \"libstagefright: Use LOG_BASIC when use chromium http stack\"\n\n* commit \u00278eef093c213094c7efb655ef4d9e31439646bd7f\u0027:\n libstagefright: Use LOG_BASIC when use chromium http stack\n" }, { "commit": "9f0e05978e236352fd2a4a7c6dce909755c36ead", "tree": "539b172729d0a44025e5331c7a2fda6b1f86d0ae", "parents": [ "9a25c012915f2209fff1479b246ae8eba38c3eff", "7266bc80850dc327e9f18c27b81613f959399630" ], "author": { "name": "Jean-Baptiste Queru", "email": "jbq@google.com", "time": "Mon Jul 08 11:25:34 2013 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Mon Jul 08 11:25:34 2013 -0700" }, "message": "am 7266bc80: am ca7f1609: Merge \"Prevent double disconnects in RTSPSource\"\n\n* commit \u00277266bc80850dc327e9f18c27b81613f959399630\u0027:\n Prevent double disconnects in RTSPSource\n" }, { "commit": "8eef093c213094c7efb655ef4d9e31439646bd7f", "tree": "ccaa3bfa58530e0bf7f5cbc55df46febb4622d47", "parents": [ "267363ee2836ff9bc18d7fdd93aaedf19de546ad", "300df42a7f51f2666d7ef4e73ac04101bbbb11bb" ], "author": { "name": "Jean-Baptiste Queru", "email": "jbq@google.com", "time": "Mon Jul 08 18:23:45 2013 +0000" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Mon Jul 08 18:23:45 2013 +0000" }, "message": "Merge \"libstagefright: Use LOG_BASIC when use chromium http stack\"" }, { "commit": "061979253985e59c4fcb82ede232717736e633b1", "tree": "39e6d96715dfe7f032d7eeb843ee71b0d3c638bc", "parents": [ "7266bc80850dc327e9f18c27b81613f959399630", "267363ee2836ff9bc18d7fdd93aaedf19de546ad" ], "author": { "name": "Jean-Baptiste Queru", "email": "jbq@google.com", "time": "Mon Jul 08 11:21:48 2013 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Mon Jul 08 11:21:48 2013 -0700" }, "message": "am 267363ee: Merge \"Prevent Media Server crash while the AwesomePlayer getBitrate return true with mBitrate equals to zero.\"\n\n* commit \u0027267363ee2836ff9bc18d7fdd93aaedf19de546ad\u0027:\n Prevent Media Server crash while the AwesomePlayer getBitrate return true with mBitrate equals to zero.\n" }, { "commit": "7266bc80850dc327e9f18c27b81613f959399630", "tree": "661b92b78a01707e05a62323b286132f8714b02f", "parents": [ "47a1fe04637793f48d808261b1fac47acc3de1e1", "ca7f160921a4a1a5da32ebe8fab1067bd8998a1f" ], "author": { "name": "Jean-Baptiste Queru", "email": "jbq@google.com", "time": "Mon Jul 08 11:21:45 2013 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Mon Jul 08 11:21:45 2013 -0700" }, "message": "am ca7f1609: Merge \"Prevent double disconnects in RTSPSource\"\n\n* commit \u0027ca7f160921a4a1a5da32ebe8fab1067bd8998a1f\u0027:\n Prevent double disconnects in RTSPSource\n" }, { "commit": "267363ee2836ff9bc18d7fdd93aaedf19de546ad", "tree": "7f62b3fa90d6c6ba4de1e2f45305c3f520e3ecf4", "parents": [ "ca7f160921a4a1a5da32ebe8fab1067bd8998a1f", "b9b8d14d89019ba7b9d183f0fbad2af924a0cd95" ], "author": { "name": "Jean-Baptiste Queru", "email": "jbq@google.com", "time": "Mon Jul 08 18:17:43 2013 +0000" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Mon Jul 08 18:17:43 2013 +0000" }, "message": "Merge \"Prevent Media Server crash while the AwesomePlayer getBitrate return true with mBitrate equals to zero.\"" }, { "commit": "ca7f160921a4a1a5da32ebe8fab1067bd8998a1f", "tree": "86eba1233c510ecc2217ae7d49c1780834d87c6e", "parents": [ "a9aa6baa5d86fc1a5bd37fc636d766d9e3ad2507", "0ad03bc59d090a0455f858d2f629834c105f6f37" ], "author": { "name": "Jean-Baptiste Queru", "email": "jbq@google.com", "time": "Mon Jul 08 18:17:02 2013 +0000" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Mon Jul 08 18:17:03 2013 +0000" }, "message": "Merge \"Prevent double disconnects in RTSPSource\"" }, { "commit": "15e5c9f49ad92ce985c9d0c2fe2767df2833b12c", "tree": "6c0f3fb81cacec3e1a2762d7c360a1446f8a61b7", "parents": [ "eced745af7d2d27a8c45e04eb071d4fb30cd3e48", "fc99165001048eac94aefbf29bcae5071493d484" ], "author": { "name": "The Android Automerger", "email": "android-build@google.com", "time": "Mon Jul 08 05:55:23 2013 -0700" }, "committer": { "name": "The Android Automerger", "email": "android-build@google.com", "time": "Mon Jul 08 05:55:23 2013 -0700" }, "message": "merge in jb-mr2-zeroday-release history after reset to jb-mr2-dev\n" }, { "commit": "9a25c012915f2209fff1479b246ae8eba38c3eff", "tree": "af538ebd502f0d834f5e9a10799f3e508bdfa55b", "parents": [ "ace2378c934b61fbd865b5ade9ff7d0df81dabe3", "eced745af7d2d27a8c45e04eb071d4fb30cd3e48" ], "author": { "name": "Jeff Tinker", "email": "jtinker@google.com", "time": "Sun Jul 07 12:26:16 2013 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Sun Jul 07 12:26:16 2013 -0700" }, "message": "am eced745a: Merge \"Part of fix for TEE resource leaks when app crashes\" into jb-mr2-dev\n\n* commit \u0027eced745af7d2d27a8c45e04eb071d4fb30cd3e48\u0027:\n Part of fix for TEE resource leaks when app crashes\n" }, { "commit": "eced745af7d2d27a8c45e04eb071d4fb30cd3e48", "tree": "6c0f3fb81cacec3e1a2762d7c360a1446f8a61b7", "parents": [ "f59a4b393f4844c5bbc8d6212364bdddea33d232", "3d3f67f3afa45e6b49d85b20942ee8184a33c1a4" ], "author": { "name": "Jeff Tinker", "email": "jtinker@google.com", "time": "Sun Jul 07 19:21:55 2013 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Sun Jul 07 19:21:56 2013 +0000" }, "message": "Merge \"Part of fix for TEE resource leaks when app crashes\" into jb-mr2-dev" }, { "commit": "3d3f67f3afa45e6b49d85b20942ee8184a33c1a4", "tree": "ecf87485ed6235279de2022c056c0f370b2af8d5", "parents": [ "a691ff3c03e38e148bbefed35ebb15e552a12613" ], "author": { "name": "Jeff Tinker", "email": "jtinker@google.com", "time": "Wed Jul 03 15:38:58 2013 -0700" }, "committer": { "name": "Jeff Tinker", "email": "jtinker@google.com", "time": "Wed Jul 03 16:23:39 2013 -0700" }, "message": "Part of fix for TEE resource leaks when app crashes\n\nbug: 9672606\nChange-Id: I98cf65260d5e43d34e3897452f6f26ed2c89294e\n" }, { "commit": "ace2378c934b61fbd865b5ade9ff7d0df81dabe3", "tree": "b3146af4726c4a98a245e58ad1941fb7844c6418", "parents": [ "f64bd473e4c500dc54923baac7261e6d2d72daa6", "f59a4b393f4844c5bbc8d6212364bdddea33d232" ], "author": { "name": "Eric Laurent", "email": "elaurent@google.com", "time": "Wed Jul 03 08:16:46 2013 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Wed Jul 03 08:16:46 2013 -0700" }, "message": "am f59a4b39: fix scheduling policy service death detection\n\n* commit \u0027f59a4b393f4844c5bbc8d6212364bdddea33d232\u0027:\n fix scheduling policy service death detection\n" }, { "commit": "b9b8d14d89019ba7b9d183f0fbad2af924a0cd95", "tree": "cc5f9c3451e2a232932b4a52c46ba26dfefebd96", "parents": [ "a9aa6baa5d86fc1a5bd37fc636d766d9e3ad2507" ], "author": { "name": "hovanchen", "email": "hovanchen@fihspec.com", "time": "Tue Jul 02 15:07:44 2013 +0800" }, "committer": { "name": "Cheng-Hao Chen", "email": "hovanchen@fihspec.com", "time": "Wed Jul 03 01:15:59 2013 +0000" }, "message": "Prevent Media Server crash while the AwesomePlayer getBitrate return true with mBitrate equals to zero.\n\n[Cause]\n - getBitrate(int64_t *bitrate) will return true if mBitrate \u003d 0.\n - Then, in getCachedDuration_l(int64_t *durationUs, bool *eos), \n we might execute the following function when \n getBitrate(\u0026bitrate) \u003d true and bitrate \u003d 0.\n *durationUs \u003d cachedDataRemaining * 8000000ll / bitrate;\n - Mediaserver will be crashed when divided by zero.\n - The mediaserver crash often occur when DLNA IOP tests on Golden DMS\n with AAC_ADTS_320 audio.\n[Solution]\n - Prevent the divide function executing when bitrate is zero.\n\nChange-Id: I4439d92cee5faec95df2109e9186c33b3fff6c66\n" }, { "commit": "f59a4b393f4844c5bbc8d6212364bdddea33d232", "tree": "50a7dc8e5ac254ca4f6a40d84980713a8ac30599", "parents": [ "a691ff3c03e38e148bbefed35ebb15e552a12613" ], "author": { "name": "Eric Laurent", "email": "elaurent@google.com", "time": "Tue Jul 02 11:15:41 2013 -0700" }, "committer": { "name": "Eric Laurent", "email": "elaurent@google.com", "time": "Tue Jul 02 12:15:10 2013 -0700" }, "message": "fix scheduling policy service death detection\n\nCheck status of transactions to scheduling policy service\nand re-acquire a binder interface in case of DEAD_OBJECT.\n\nBug: 8875559.\nChange-Id: I1e00bd44e2d4723b3ec95d5c31d9652ba08e238a\n" }, { "commit": "f64bd473e4c500dc54923baac7261e6d2d72daa6", "tree": "39fe6bd6d01054e9923e1a167eb826b3f564e387", "parents": [ "0eefffd8fc8abfbe694814fcec397aeac3f545b8", "1b88b416440786a09519d0b94884149d46ca4438", "fc99165001048eac94aefbf29bcae5071493d484" ], "author": { "name": "The Android Open Source Project", "email": "initial-contribution@android.com", "time": "Mon Jul 01 07:42:56 2013 -0700" }, "committer": { "name": "The Android Open Source Project", "email": "initial-contribution@android.com", "time": "Mon Jul 01 07:42:56 2013 -0700" }, "message": "Reconcile with jb-mr2-release jb-mr2-zeroday-release - do not merge\n\nChange-Id: Idf0f0cdf02e6e94603ff003b6baf869b4414e1cf\n" }, { "commit": "0ad03bc59d090a0455f858d2f629834c105f6f37", "tree": "86eba1233c510ecc2217ae7d49c1780834d87c6e", "parents": [ "a9aa6baa5d86fc1a5bd37fc636d766d9e3ad2507" ], "author": { "name": "Fredrik Rosin", "email": "fredrik.rosin@sonymobile.com", "time": "Wed Mar 06 13:42:53 2013 +0100" }, "committer": { "name": "Henrik Baard", "email": "henrik.baard@sonymobile.com", "time": "Mon Jul 01 13:14:47 2013 +0200" }, "message": "Prevent double disconnects in RTSPSource\n\nPrevent a null pointer from occuring by checking that we are not\nalready disconnected before performing a disconnect, in case\nmultiple disconnects have been issued.\n\nChange-Id: Ib88800cd246086fd57f77d10748d41b1aefe2084\n" }, { "commit": "fc99165001048eac94aefbf29bcae5071493d484", "tree": "e40a419e636ccc48551c5810887e872b5ac9ee44", "parents": [ "a691ff3c03e38e148bbefed35ebb15e552a12613", "31484d8d90e4861a848ce4f2fbbc1ddeac8d0a87" ], "author": { "name": "The Android Automerger", "email": "android-build@google.com", "time": "Sun Jun 30 05:55:22 2013 -0700" }, "committer": { "name": "The Android Automerger", "email": "android-build@google.com", "time": "Sun Jun 30 05:55:22 2013 -0700" }, "message": "merge in jb-mr2-zeroday-release history after reset to jb-mr2-dev\n" }, { "commit": "0eefffd8fc8abfbe694814fcec397aeac3f545b8", "tree": "39fe6bd6d01054e9923e1a167eb826b3f564e387", "parents": [ "903871da7a7c71b8718133e60e2f0835837b5f3f", "47a1fe04637793f48d808261b1fac47acc3de1e1" ], "author": { "name": "Andreas Huber", "email": "andih@google.com", "time": "Fri Jun 28 15:31:37 2013 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Fri Jun 28 15:31:37 2013 -0700" }, "message": "am 47a1fe04: am a9aa6baa: Merge \"Set u.ext_data to null after it has been freed\"\n\n* commit \u002747a1fe04637793f48d808261b1fac47acc3de1e1\u0027:\n Set u.ext_data to null after it has been freed\n" }, { "commit": "47a1fe04637793f48d808261b1fac47acc3de1e1", "tree": "d29e650d5b2a1c0db68681362bb4faa86589a92f", "parents": [ "83790fcce4f5cda1e7c89f1cbed452426502f227", "a9aa6baa5d86fc1a5bd37fc636d766d9e3ad2507" ], "author": { "name": "Andreas Huber", "email": "andih@google.com", "time": "Fri Jun 28 15:29:01 2013 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Fri Jun 28 15:29:01 2013 -0700" }, "message": "am a9aa6baa: Merge \"Set u.ext_data to null after it has been freed\"\n\n* commit \u0027a9aa6baa5d86fc1a5bd37fc636d766d9e3ad2507\u0027:\n Set u.ext_data to null after it has been freed\n" }, { "commit": "a9aa6baa5d86fc1a5bd37fc636d766d9e3ad2507", "tree": "f8e1cec5cd70058e39131d5c9e4fc16d651eb6fa", "parents": [ "bdf33c98912090176183d3e9b9a9217dbbdca6da", "fca812565cebd229fba8be32bad14983c5252a7b" ], "author": { "name": "Andreas Huber", "email": "andih@google.com", "time": "Fri Jun 28 22:26:42 2013 +0000" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Fri Jun 28 22:26:44 2013 +0000" }, "message": "Merge \"Set u.ext_data to null after it has been freed\"" }, { "commit": "1b88b416440786a09519d0b94884149d46ca4438", "tree": "e0533cc346d68a6109dafa9e92dacbdd60de6a90", "parents": [ "45e306536ff236af59676e7fc213d5ad20be45e2" ], "author": { "name": "Andreas Huber", "email": "andih@google.com", "time": "Wed May 29 14:20:52 2013 -0700" }, "committer": { "name": "The Android Automerger", "email": "android-build@android.com", "time": "Fri Jun 28 14:38:25 2013 -0700" }, "message": "Update HTTP proxy configuration for all media playback inside stagefright.\n\nChange-Id: Ie0dd00045aba668d8b49da73224e7a7c9c04f69b\nrelated-to-bug: 8873723\n(cherry picked from commit 2704965b8a1ff3b7450ff58ccecf86d8ec688c40)\n" }, { "commit": "903871da7a7c71b8718133e60e2f0835837b5f3f", "tree": "cb092022b30108509b0a7a0103f938da9d262925", "parents": [ "364a2677c862af64f21b41dd3ab1b9e5c68b4ce0", "83790fcce4f5cda1e7c89f1cbed452426502f227" ], "author": { "name": "Glenn Kasten", "email": "gkasten@android.com", "time": "Fri Jun 28 09:33:15 2013 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Fri Jun 28 09:33:15 2013 -0700" }, "message": "am 83790fcc: am bdf33c98: Merge \"Fix compilation warning: incorrect format specifier for type \\\u0027ssize_t\\\u0027.\"\n\n* commit \u002783790fcce4f5cda1e7c89f1cbed452426502f227\u0027:\n Fix compilation warning: incorrect format specifier for type \u0027ssize_t\u0027.\n" }, { "commit": "83790fcce4f5cda1e7c89f1cbed452426502f227", "tree": "c7636bc7a6b9f7597ebe6dcf91a377448e8ec950", "parents": [ "3a4ff0b8bf464c9c286d63326bea42609527051e", "bdf33c98912090176183d3e9b9a9217dbbdca6da" ], "author": { "name": "Glenn Kasten", "email": "gkasten@android.com", "time": "Fri Jun 28 09:30:58 2013 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Fri Jun 28 09:30:58 2013 -0700" }, "message": "am bdf33c98: Merge \"Fix compilation warning: incorrect format specifier for type \\\u0027ssize_t\\\u0027.\"\n\n* commit \u0027bdf33c98912090176183d3e9b9a9217dbbdca6da\u0027:\n Fix compilation warning: incorrect format specifier for type \u0027ssize_t\u0027.\n" }, { "commit": "bdf33c98912090176183d3e9b9a9217dbbdca6da", "tree": "03efbb6dff1fbad998859225e3ae49901211d417", "parents": [ "d74a9ee83fd6e033fd2260ca3777390d7e5f817a", "7d409691ed61f96bac6672b59f368cd3cc8ea2d8" ], "author": { "name": "Glenn Kasten", "email": "gkasten@android.com", "time": "Fri Jun 28 16:28:48 2013 +0000" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Fri Jun 28 16:28:49 2013 +0000" }, "message": "Merge \"Fix compilation warning: incorrect format specifier for type \u0027ssize_t\u0027.\"" }, { "commit": "364a2677c862af64f21b41dd3ab1b9e5c68b4ce0", "tree": "1a53c2024ddfa6da614d2b33d6293bd4a490ee91", "parents": [ "bdebd4817cfe49fafedfe8f9c65930e03f9b508b", "a691ff3c03e38e148bbefed35ebb15e552a12613" ], "author": { "name": "Eino-Ville Talvala", "email": "etalvala@google.com", "time": "Fri Jun 28 07:07:29 2013 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Fri Jun 28 07:07:29 2013 -0700" }, "message": "am a691ff3c: Camera2/3: Don\\\u0027t allow recording and callbacks to coexist.\n\n* commit \u0027a691ff3c03e38e148bbefed35ebb15e552a12613\u0027:\n Camera2/3: Don\u0027t allow recording and callbacks to coexist.\n" }, { "commit": "fca812565cebd229fba8be32bad14983c5252a7b", "tree": "6d1663f287bf0d1ab9721f70c6271ed4cf0a0400", "parents": [ "d74a9ee83fd6e033fd2260ca3777390d7e5f817a" ], "author": { "name": "Christer Fletcher", "email": "christer.fletcher@sonymobile.com", "time": "Tue Jun 18 08:55:09 2013 +0200" }, "committer": { "name": "Takeshi Aimi", "email": "takeshi.aimi@sonymobile.com", "time": "Fri Jun 28 17:00:38 2013 +0900" }, "message": "Set u.ext_data to null after it has been freed\n\nSEGV_MAPPER crash could happen in MetaData::typed_data::freeStorage.\nThe faulty address could be both random pointers and deadbaad. It\nseems like free could be called more than once on u.ext_data. Set\nu.ext_data to null after it has been freed as there already is a\nnull check before trying to free it.\n\nChange-Id: I710c49f9c231bd8852159914c0b2add58a685f0e\n" }, { "commit": "a691ff3c03e38e148bbefed35ebb15e552a12613", "tree": "e40a419e636ccc48551c5810887e872b5ac9ee44", "parents": [ "209bbbcf4190231f9dede758cbe77d109919f9f1" ], "author": { "name": "Eino-Ville Talvala", "email": "etalvala@google.com", "time": "Wed Jun 26 18:23:23 2013 -0700" }, "committer": { "name": "Eino-Ville Talvala", "email": "etalvala@google.com", "time": "Thu Jun 27 15:00:26 2013 -0700" }, "message": "Camera2/3: Don\u0027t allow recording and callbacks to coexist.\n\n- Tear down conflicting streams when necessary.\n\n- Shut down callbacks if recording starts\n\n- Do not allow callbacks to start if recording is active\n\nPer the current camera API, recording and preview callbacks cannot be\nactive simultaneously. However, the framework did not explicitly\ndisallow this, and in fact left the streams configured once they were\ncreated, even if switching between the two operational modes.\n\nIn addition, no guards existed for trying to enable both recording and\ncallbacks at the same time.\n\nBug: 9423825\n\nChange-Id: I7d6e6114c2e14fcfb5299b4c72ad557895cbf4b8\n" }, { "commit": "7d409691ed61f96bac6672b59f368cd3cc8ea2d8", "tree": "03efbb6dff1fbad998859225e3ae49901211d417", "parents": [ "d74a9ee83fd6e033fd2260ca3777390d7e5f817a" ], "author": { "name": "Scott Fan", "email": "fancp2007@gmail.com", "time": "Sun Apr 28 10:13:54 2013 +0800" }, "committer": { "name": "Scott Fan", "email": "fancp2007@gmail.com", "time": "Thu Jun 27 07:06:15 2013 +0000" }, "message": "Fix compilation warning: incorrect format specifier for type \u0027ssize_t\u0027.\n\nwarning: format \u0027%ld\u0027 expects argument of type \u0027long int\u0027,\nbut argument 7 has type \u0027ssize_t {aka int}\u0027 [-Wformat]\n\nChange-Id: I823835a26320a3abb82f8dff9fbe82e5132e7556\nSigned-off-by: Scott Fan \u003cfancp2007@gmail.com\u003e\n" }, { "commit": "bdebd4817cfe49fafedfe8f9c65930e03f9b508b", "tree": "8d3e88e7f8638d62d7723daf349c504574a2c0c5", "parents": [ "1aee0be6cc9ecb4ff3d86228bb68c295c12bde9c", "31484d8d90e4861a848ce4f2fbbc1ddeac8d0a87" ], "author": { "name": "The Android Open Source Project", "email": "initial-contribution@android.com", "time": "Tue Jun 25 16:12:03 2013 -0700" }, "committer": { "name": "The Android Open Source Project", "email": "initial-contribution@android.com", "time": "Tue Jun 25 16:12:03 2013 -0700" }, "message": "Reconcile with jb-mr2-zeroday-release - do not merge\n\nChange-Id: I4de46f3bfcfb80867bbeb52a76d383f5870e74f4\n" }, { "commit": "1aee0be6cc9ecb4ff3d86228bb68c295c12bde9c", "tree": "8d3e88e7f8638d62d7723daf349c504574a2c0c5", "parents": [ "e6105c26a5b506f96e9fe1d3fec64a8b2ed1d6dd", "3a4ff0b8bf464c9c286d63326bea42609527051e" ], "author": { "name": "Jean-Baptiste Queru", "email": "jbq@google.com", "time": "Tue Jun 25 10:40:38 2013 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Tue Jun 25 10:40:38 2013 -0700" }, "message": "am 3a4ff0b8: am d74a9ee8: Merge \"libstagefright: fix the duration \"00:00\" for some httplive link\"\n\n* commit \u00273a4ff0b8bf464c9c286d63326bea42609527051e\u0027:\n libstagefright: fix the duration \"00:00\" for some httplive link\n" }, { "commit": "3a4ff0b8bf464c9c286d63326bea42609527051e", "tree": "105922023f2126487d20b9647188e23a441e8513", "parents": [ "f3e21c301b8fef49eecf9c716373fcbfbaa47670", "d74a9ee83fd6e033fd2260ca3777390d7e5f817a" ], "author": { "name": "Jean-Baptiste Queru", "email": "jbq@google.com", "time": "Tue Jun 25 10:38:44 2013 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Tue Jun 25 10:38:44 2013 -0700" }, "message": "am d74a9ee8: Merge \"libstagefright: fix the duration \"00:00\" for some httplive link\"\n\n* commit \u0027d74a9ee83fd6e033fd2260ca3777390d7e5f817a\u0027:\n libstagefright: fix the duration \"00:00\" for some httplive link\n" }, { "commit": "d74a9ee83fd6e033fd2260ca3777390d7e5f817a", "tree": "e9b54518ba61396d0445759f4fad2a7e5dbb114f", "parents": [ "60f3f102ba2973cc31e5c7ea00d95bbf19968e8b", "003050568829aa7b3c13c1fbcb24abcfd17cad80" ], "author": { "name": "Jean-Baptiste Queru", "email": "jbq@google.com", "time": "Tue Jun 25 17:37:28 2013 +0000" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Tue Jun 25 17:37:29 2013 +0000" }, "message": "Merge \"libstagefright: fix the duration \"00:00\" for some httplive link\"" }, { "commit": "31484d8d90e4861a848ce4f2fbbc1ddeac8d0a87", "tree": "08e8e07347f3b8dd770685bb34280a0d2c236b73", "parents": [ "209bbbcf4190231f9dede758cbe77d109919f9f1", "e3b37772248b71fc08b62d740e6004fdede609db" ], "author": { "name": "The Android Automerger", "email": "android-build@google.com", "time": "Mon Jun 24 14:55:06 2013 -0700" }, "committer": { "name": "The Android Automerger", "email": "android-build@google.com", "time": "Mon Jun 24 14:55:06 2013 -0700" }, "message": "merge in jb-mr2-zeroday-release history after reset to jb-mr2-dev\n" }, { "commit": "e3b37772248b71fc08b62d740e6004fdede609db", "tree": "ebbd8e95bd3d1bb5ac73d8dcb6fbcdd2d412d653", "parents": [ "e8b887c512feed7bcfc06660cf626f26b986f479", "285aa3a997fb614402355e0296da681327dcd1cd" ], "author": { "name": "The Android Automerger", "email": "android-build@android.com", "time": "Mon Jun 24 14:41:40 2013 -0700" }, "committer": { "name": "The Android Automerger", "email": "android-build@android.com", "time": "Mon Jun 24 14:41:40 2013 -0700" }, "message": "Merge remote-tracking branch \u0027origin/jb-mr2-zeroday-release\u0027 into HEAD\n" }, { "commit": "e6105c26a5b506f96e9fe1d3fec64a8b2ed1d6dd", "tree": "8d3e88e7f8638d62d7723daf349c504574a2c0c5", "parents": [ "455479bc2c6a88746d4801f3f5a0e8d9f8609528", "285aa3a997fb614402355e0296da681327dcd1cd" ], "author": { "name": "The Android Open Source Project", "email": "initial-contribution@android.com", "time": "Fri Jun 21 11:56:55 2013 -0700" }, "committer": { "name": "The Android Open Source Project", "email": "initial-contribution@android.com", "time": "Fri Jun 21 11:56:55 2013 -0700" }, "message": "Reconcile with jb-mr2-zeroday-release - do not merge\n\nChange-Id: Id1c9edbb5b7b398fb863cbbd79e673ab2c10df9a\n" }, { "commit": "285aa3a997fb614402355e0296da681327dcd1cd", "tree": "08e8e07347f3b8dd770685bb34280a0d2c236b73", "parents": [ "209bbbcf4190231f9dede758cbe77d109919f9f1", "e8b887c512feed7bcfc06660cf626f26b986f479" ], "author": { "name": "The Android Automerger", "email": "android-build@google.com", "time": "Fri Jun 21 11:35:26 2013 -0700" }, "committer": { "name": "The Android Automerger", "email": "android-build@google.com", "time": "Fri Jun 21 11:35:26 2013 -0700" }, "message": "merge in jb-mr2-zeroday-release history after reset to jb-mr2-dev\n" }, { "commit": "455479bc2c6a88746d4801f3f5a0e8d9f8609528", "tree": "8d3e88e7f8638d62d7723daf349c504574a2c0c5", "parents": [ "d3ac2fc0c5429003f69d161e42bba7e94434ec09", "209bbbcf4190231f9dede758cbe77d109919f9f1" ], "author": { "name": "Jean-Michel Trivi", "email": "jmtrivi@google.com", "time": "Thu Jun 20 22:23:58 2013 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Thu Jun 20 22:23:58 2013 -0700" }, "message": "am 209bbbcf: Apply EQ and bass boost first in effect chain\n\n* commit \u0027209bbbcf4190231f9dede758cbe77d109919f9f1\u0027:\n Apply EQ and bass boost first in effect chain\n" }, { "commit": "209bbbcf4190231f9dede758cbe77d109919f9f1", "tree": "08e8e07347f3b8dd770685bb34280a0d2c236b73", "parents": [ "e6478de72a8ae1d3abb3e8c20898977c45354a4f" ], "author": { "name": "Jean-Michel Trivi", "email": "jmtrivi@google.com", "time": "Thu Jun 20 16:49:25 2013 -0700" }, "committer": { "name": "Jean-Michel Trivi", "email": "jmtrivi@google.com", "time": "Thu Jun 20 16:49:25 2013 -0700" }, "message": "Apply EQ and bass boost first in effect chain\n\nEQ and bass boost can improperly interact with other effects\n (e.g. virtualizer) outside of the bundle. Apply them first\n in an effect chain, which is equivalent to using them to affect\n the content of a track, rather than how a track is presented,\n when additional effects are cascaded behind EQ and BB.\n\nBug 8589316\n\nChange-Id: Ifb34e46bc1969f613cdc90ee2a79af677e2fad92\n" }, { "commit": "d3ac2fc0c5429003f69d161e42bba7e94434ec09", "tree": "bdc0b4715050e2f6806d40a6b13774fb75310899", "parents": [ "9c8714daaf6a402abd85557e9b652c86f0df86e4", "f3e21c301b8fef49eecf9c716373fcbfbaa47670" ], "author": { "name": "Glenn Kasten", "email": "gkasten@android.com", "time": "Thu Jun 20 15:16:00 2013 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Thu Jun 20 15:16:00 2013 -0700" }, "message": "am f3e21c30: am 60f3f102: Merge \"Prevent AudioCommands being freed before read\"\n\n* commit \u0027f3e21c301b8fef49eecf9c716373fcbfbaa47670\u0027:\n Prevent AudioCommands being freed before read\n" }, { "commit": "f3e21c301b8fef49eecf9c716373fcbfbaa47670", "tree": "105922023f2126487d20b9647188e23a441e8513", "parents": [ "82fc2ca6905978b4f49f2c6bf948a6872575f2cc", "60f3f102ba2973cc31e5c7ea00d95bbf19968e8b" ], "author": { "name": "Glenn Kasten", "email": "gkasten@android.com", "time": "Thu Jun 20 15:13:19 2013 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Thu Jun 20 15:13:19 2013 -0700" }, "message": "am 60f3f102: Merge \"Prevent AudioCommands being freed before read\"\n\n* commit \u002760f3f102ba2973cc31e5c7ea00d95bbf19968e8b\u0027:\n Prevent AudioCommands being freed before read\n" }, { "commit": "60f3f102ba2973cc31e5c7ea00d95bbf19968e8b", "tree": "02c424b6ae75bf6524046503e36173897fb6c2bd", "parents": [ "d5018116252a3ecb491e2eaddad12180b85d1e78", "5fa8c4bf81275d5e1f5ef71bc66fc22e3152eeb0" ], "author": { "name": "Glenn Kasten", "email": "gkasten@android.com", "time": "Thu Jun 20 22:11:25 2013 +0000" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Thu Jun 20 22:11:26 2013 +0000" }, "message": "Merge \"Prevent AudioCommands being freed before read\"" }, { "commit": "5fa8c4bf81275d5e1f5ef71bc66fc22e3152eeb0", "tree": "e3ca90035d580a1cfe7d786b45a9d31a49da1f76", "parents": [ "132bc5bd1c68aa807a20e1655f009f74433be588" ], "author": { "name": "Christer Fletcher", "email": "christer.fletcher@sonymobile.com", "time": "Fri Jan 18 15:27:03 2013 +0100" }, "committer": { "name": "Henrik Baard", "email": "henrik.baard@sonymobile.com", "time": "Thu Jun 20 13:36:58 2013 +0200" }, "message": "Prevent AudioCommands being freed before read\n\nWhen AudioCommandThread::threadLoop process AudioCommands it was\npossible for it to delete a command where the posting thread still\nhadn\u0027t read that status from it.\n\nIf a second command signaled the thread loop to continue after it\nhad inserted a new command while the thread loop was actually waiting\nfor the first command to report that it had read the status the\nthread loop would continue and delete the first command.\n\nChanged the wait condition when waiting for the calling thread to\nread status to use command-\u003emCond instead of mWaitWorkCV. This way\nit\u0027s guaranteed that the signal to continue comes from the correct\nthread.\n\nChange-Id: Ia69b48cb4fdfaf8b4c83b56a197fb9f2058a92d1\n" }, { "commit": "9c8714daaf6a402abd85557e9b652c86f0df86e4", "tree": "8c4cbae229dba31d55e0454f0f83da6aa7ab1e6e", "parents": [ "bda5d1f2a34f9b7ded0bc0441be4856e78ec066c", "e6478de72a8ae1d3abb3e8c20898977c45354a4f" ], "author": { "name": "Eino-Ville Talvala", "email": "etalvala@google.com", "time": "Wed Jun 19 14:23:22 2013 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Wed Jun 19 14:23:22 2013 -0700" }, "message": "am e6478de7: Camera2/3: Avoid shutdown race in callback processor.\n\n* commit \u0027e6478de72a8ae1d3abb3e8c20898977c45354a4f\u0027:\n Camera2/3: Avoid shutdown race in callback processor.\n" }, { "commit": "e6478de72a8ae1d3abb3e8c20898977c45354a4f", "tree": "9a4d51e3ba03c3d4de9d43598f32e9961e6d0fe0", "parents": [ "241b52798809d8db3d369af05ace1f73f723f29b" ], "author": { "name": "Eino-Ville Talvala", "email": "etalvala@google.com", "time": "Wed Jun 19 08:42:17 2013 -0700" }, "committer": { "name": "Eino-Ville Talvala", "email": "etalvala@google.com", "time": "Wed Jun 19 08:42:17 2013 -0700" }, "message": "Camera2/3: Avoid shutdown race in callback processor.\n\nIt\u0027s possible, during shutdown, for callback processor\u0027s heap to be\ndestroyed when it\u0027s about to send the callback back to the user.\nProperly copy the heap reference to a local variable before unlocking\nthe mutex.\n\nBug: 9485959\nChange-Id: I301347b77145f19c7ac721b9127dc74f122acce2\n" }, { "commit": "bda5d1f2a34f9b7ded0bc0441be4856e78ec066c", "tree": "a09207acb0923c865532e7eca34f1f8914ccba10", "parents": [ "05e87d536ed2b7cf1d68135121b630031e5d56c2", "241b52798809d8db3d369af05ace1f73f723f29b" ], "author": { "name": "Eino-Ville Talvala", "email": "etalvala@google.com", "time": "Mon Jun 17 16:23:56 2013 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Mon Jun 17 16:23:56 2013 -0700" }, "message": "am 241b5279: Camera3: Power: Properly shut down unused thread.\n\n* commit \u0027241b52798809d8db3d369af05ace1f73f723f29b\u0027:\n Camera3: Power: Properly shut down unused thread.\n" }, { "commit": "241b52798809d8db3d369af05ace1f73f723f29b", "tree": "882168e7655983199dc6c31544965abf7628b6ce", "parents": [ "26bc908b3dafb5d80f092a22c5c71116526eae06" ], "author": { "name": "Eino-Ville Talvala", "email": "etalvala@google.com", "time": "Mon Jun 17 13:29:16 2013 -0700" }, "committer": { "name": "Eino-Ville Talvala", "email": "etalvala@google.com", "time": "Mon Jun 17 13:29:16 2013 -0700" }, "message": "Camera3: Power: Properly shut down unused thread.\n\nBug: 9466221\nChange-Id: I9ed0740561b2e04954eebc1b8aec89cfab40a3a0\n" }, { "commit": "05e87d536ed2b7cf1d68135121b630031e5d56c2", "tree": "17ae714410130417129ae3122f024bc2df2bc412", "parents": [ "0cc754918a3c1353164ccc5798f63b28f65db406", "e8b887c512feed7bcfc06660cf626f26b986f479" ], "author": { "name": "The Android Open Source Project", "email": "initial-contribution@android.com", "time": "Sun Jun 16 07:44:00 2013 -0700" }, "committer": { "name": "The Android Open Source Project", "email": "initial-contribution@android.com", "time": "Sun Jun 16 07:44:00 2013 -0700" }, "message": "Reconcile with jb-mr2-zeroday-release - do not merge\n\nChange-Id: I2ab98a5fccea49e0f4e6d22fddca485ad50b63b8\n" }, { "commit": "e8b887c512feed7bcfc06660cf626f26b986f479", "tree": "ebbd8e95bd3d1bb5ac73d8dcb6fbcdd2d412d653", "parents": [ "26bc908b3dafb5d80f092a22c5c71116526eae06", "9ad5d03e99e3b1b5297ff0cc8a8dfda5bc705e64" ], "author": { "name": "The Android Automerger", "email": "android-build@google.com", "time": "Sun Jun 16 05:55:26 2013 -0700" }, "committer": { "name": "The Android Automerger", "email": "android-build@google.com", "time": "Sun Jun 16 05:55:26 2013 -0700" }, "message": "merge in jb-mr2-zeroday-release history after reset to jb-mr2-dev\n" }, { "commit": "0cc754918a3c1353164ccc5798f63b28f65db406", "tree": "17ae714410130417129ae3122f024bc2df2bc412", "parents": [ "e4a453d4b7563d1dab674df6ce52c291e63c6ca7", "26bc908b3dafb5d80f092a22c5c71116526eae06" ], "author": { "name": "Eino-Ville Talvala", "email": "etalvala@google.com", "time": "Fri Jun 14 08:35:48 2013 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Fri Jun 14 08:35:48 2013 -0700" }, "message": "am 26bc908b: Camera2/3: Make sure to wait for idle after still capture.\n\n* commit \u002726bc908b3dafb5d80f092a22c5c71116526eae06\u0027:\n Camera2/3: Make sure to wait for idle after still capture.\n" }, { "commit": "e4a453d4b7563d1dab674df6ce52c291e63c6ca7", "tree": "b642943cde0238fae15eced34bb7447e6eb1f05e", "parents": [ "767227fcac7be843b338473954420d390e354bf7", "214a17fd37ef85fc841d3157b1e9096e1aa1b42f" ], "author": { "name": "Eino-Ville Talvala", "email": "etalvala@google.com", "time": "Fri Jun 14 08:35:48 2013 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Fri Jun 14 08:35:48 2013 -0700" }, "message": "am 214a17fd: Camera3: Always close HAL device even in face of errors.\n\n* commit \u0027214a17fd37ef85fc841d3157b1e9096e1aa1b42f\u0027:\n Camera3: Always close HAL device even in face of errors.\n" }, { "commit": "767227fcac7be843b338473954420d390e354bf7", "tree": "ee4f0420181d6eea21f8b6ac03e3c1cb251709aa", "parents": [ "ccc366a90fdd8d9df5de27820f04bc534d122c07", "82fc2ca6905978b4f49f2c6bf948a6872575f2cc" ], "author": { "name": "Glenn Kasten", "email": "gkasten@android.com", "time": "Fri Jun 14 05:48:38 2013 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Fri Jun 14 05:48:38 2013 -0700" }, "message": "am 82fc2ca6: am d5018116: Merge \"Fix typo.\"\n\n* commit \u002782fc2ca6905978b4f49f2c6bf948a6872575f2cc\u0027:\n Fix typo.\n" }, { "commit": "82fc2ca6905978b4f49f2c6bf948a6872575f2cc", "tree": "23d6717d546a02b7a7d46e8859b2d48c7e30e4d6", "parents": [ "911a184bb5f5177a00bb4a8c80453f22e67b449c", "d5018116252a3ecb491e2eaddad12180b85d1e78" ], "author": { "name": "Glenn Kasten", "email": "gkasten@android.com", "time": "Fri Jun 14 05:43:03 2013 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Fri Jun 14 05:43:03 2013 -0700" }, "message": "am d5018116: Merge \"Fix typo.\"\n\n* commit \u0027d5018116252a3ecb491e2eaddad12180b85d1e78\u0027:\n Fix typo.\n" }, { "commit": "d5018116252a3ecb491e2eaddad12180b85d1e78", "tree": "2015a220beb8159420192d114769892fe88465a6", "parents": [ "132bc5bd1c68aa807a20e1655f009f74433be588", "f65fa170b28f97503df3c309ecdaab377a042ba6" ], "author": { "name": "Glenn Kasten", "email": "gkasten@android.com", "time": "Fri Jun 14 12:39:16 2013 +0000" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Fri Jun 14 12:39:16 2013 +0000" }, "message": "Merge \"Fix typo.\"" }, { "commit": "26bc908b3dafb5d80f092a22c5c71116526eae06", "tree": "ebbd8e95bd3d1bb5ac73d8dcb6fbcdd2d412d653", "parents": [ "214a17fd37ef85fc841d3157b1e9096e1aa1b42f" ], "author": { "name": "Eino-Ville Talvala", "email": "etalvala@google.com", "time": "Thu Jun 13 18:04:28 2013 -0700" }, "committer": { "name": "Eino-Ville Talvala", "email": "etalvala@google.com", "time": "Thu Jun 13 18:04:28 2013 -0700" }, "message": "Camera2/3: Make sure to wait for idle after still capture.\n\nWhile this wait should be immediate, it\u0027s important to guarantee\nthat preview is stopped when takePicture completes, and that the\ndevice knows itself to be idle.\n\nBug: 9413025\nChange-Id: I1c151ba920e226107ee048918187364990f444c0\n" }, { "commit": "214a17fd37ef85fc841d3157b1e9096e1aa1b42f", "tree": "bb2b77358dd771303a15f320388e4d68104ebb58", "parents": [ "1191454a3a960a1972b0f36e625796c6c1b2c9ca" ], "author": { "name": "Eino-Ville Talvala", "email": "etalvala@google.com", "time": "Thu Jun 13 12:20:02 2013 -0700" }, "committer": { "name": "Eino-Ville Talvala", "email": "etalvala@google.com", "time": "Thu Jun 13 12:20:02 2013 -0700" }, "message": "Camera3: Always close HAL device even in face of errors.\n\nTo improve robustness, make sure the HAL device instance is always\nclosed, even if it cannot be put into the IDLE state.\n\nBug: 9414167\nChange-Id: I8e7035ff0afe7214951f9824e561b340cb37592e\n" }, { "commit": "ccc366a90fdd8d9df5de27820f04bc534d122c07", "tree": "db399628ac93166975fd8598e80ff84cd653300d", "parents": [ "4541531a6e64329764ad7359775689a8f5aca165", "1191454a3a960a1972b0f36e625796c6c1b2c9ca" ], "author": { "name": "Eino-Ville Talvala", "email": "etalvala@google.com", "time": "Thu Jun 13 10:34:07 2013 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Thu Jun 13 10:34:07 2013 -0700" }, "message": "am 1191454a: Merge \"Camera3: Skipping no-ops good, not updating state machine bad.\" into jb-mr2-dev\n\n* commit \u00271191454a3a960a1972b0f36e625796c6c1b2c9ca\u0027:\n Camera3: Skipping no-ops good, not updating state machine bad.\n" }, { "commit": "4541531a6e64329764ad7359775689a8f5aca165", "tree": "eb96930d7ef4bd23c91a56aeae73681b729fa375", "parents": [ "a45398078e4f798a34310a2d5213e07eefb14238", "c4a8d2ddfff6d91e493692251733f20ece3e713d" ], "author": { "name": "Eino-Ville Talvala", "email": "etalvala@google.com", "time": "Thu Jun 13 10:34:07 2013 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Thu Jun 13 10:34:07 2013 -0700" }, "message": "am c4a8d2dd: Merge \"Camera2/3: Create JPEG stream unconditionally.\" into jb-mr2-dev\n\n* commit \u0027c4a8d2ddfff6d91e493692251733f20ece3e713d\u0027:\n Camera2/3: Create JPEG stream unconditionally.\n" }, { "commit": "1191454a3a960a1972b0f36e625796c6c1b2c9ca", "tree": "b0a2c6fb33299aaa7b4e261ac1af2737cbb186a9", "parents": [ "c4a8d2ddfff6d91e493692251733f20ece3e713d", "31fdb29c9f5569fff20756ef1240120817993660" ], "author": { "name": "Eino-Ville Talvala", "email": "etalvala@google.com", "time": "Thu Jun 13 17:33:20 2013 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Thu Jun 13 17:33:20 2013 +0000" }, "message": "Merge \"Camera3: Skipping no-ops good, not updating state machine bad.\" into jb-mr2-dev" }, { "commit": "c4a8d2ddfff6d91e493692251733f20ece3e713d", "tree": "a3e4c8c370e1ff5ebe1e21ee4389c93a24a7de6f", "parents": [ "0662f7b6735df0a140f6512285d05f8f9a38bb98", "a9c64a9398ac2e6173f99e252f305808a34cab1c" ], "author": { "name": "Eino-Ville Talvala", "email": "etalvala@google.com", "time": "Thu Jun 13 17:33:07 2013 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Thu Jun 13 17:33:07 2013 +0000" }, "message": "Merge \"Camera2/3: Create JPEG stream unconditionally.\" into jb-mr2-dev" }, { "commit": "a45398078e4f798a34310a2d5213e07eefb14238", "tree": "c04a7333f15e86d260c4c207a9fd06cd23d2b195", "parents": [ "a1d73d9be0beafd10642d6db0136b16353a32096", "9ad5d03e99e3b1b5297ff0cc8a8dfda5bc705e64" ], "author": { "name": "The Android Open Source Project", "email": "initial-contribution@android.com", "time": "Thu Jun 13 08:22:42 2013 -0700" }, "committer": { "name": "The Android Open Source Project", "email": "initial-contribution@android.com", "time": "Thu Jun 13 08:22:42 2013 -0700" }, "message": "Reconcile with jb-mr2-zeroday-release - do not merge\n\nChange-Id: Id9419bf573d550f1ebebcc96fe615e1aaf8f36ef\n" }, { "commit": "9ad5d03e99e3b1b5297ff0cc8a8dfda5bc705e64", "tree": "6b3c887f61122cbec3bbd4ef5aa21064d6cbb369", "parents": [ "0662f7b6735df0a140f6512285d05f8f9a38bb98", "23126964b607dd7e65037fc8d9c6eda485be537f" ], "author": { "name": "The Android Automerger", "email": "android-build@google.com", "time": "Thu Jun 13 05:55:17 2013 -0700" }, "committer": { "name": "The Android Automerger", "email": "android-build@google.com", "time": "Thu Jun 13 05:55:17 2013 -0700" }, "message": "merge in jb-mr2-zeroday-release history after reset to jb-mr2-dev\n" }, { "commit": "a1d73d9be0beafd10642d6db0136b16353a32096", "tree": "c04a7333f15e86d260c4c207a9fd06cd23d2b195", "parents": [ "f8af99b7c10f1441d9a52676724b168f20752270", "45e306536ff236af59676e7fc213d5ad20be45e2" ], "author": { "name": "The Android Open Source Project", "email": "initial-contribution@android.com", "time": "Wed Jun 12 18:04:12 2013 -0700" }, "committer": { "name": "The Android Open Source Project", "email": "initial-contribution@android.com", "time": "Wed Jun 12 18:04:12 2013 -0700" }, "message": "Reconcile with jb-mr2-release - do not merge\n\nChange-Id: I024b04bf1e47cc7c10209e83f640cc6f12e03274\n" }, { "commit": "31fdb29c9f5569fff20756ef1240120817993660", "tree": "df780b93b503318a58823d1c19da0f1835dabadf", "parents": [ "0662f7b6735df0a140f6512285d05f8f9a38bb98" ], "author": { "name": "Eino-Ville Talvala", "email": "etalvala@google.com", "time": "Wed Jun 12 17:06:41 2013 -0700" }, "committer": { "name": "Eino-Ville Talvala", "email": "etalvala@google.com", "time": "Wed Jun 12 17:52:05 2013 -0700" }, "message": "Camera3: Skipping no-ops good, not updating state machine bad.\n\nIf a HAL-level stream reconfigure is not needed, still need to\ntransition camera device to ACTIVE state in configureStreams.\nOtherwise, shutdown functions will not wait for device to drain\nproperly.\n\nBug: 9413025\nChange-Id: I0b15792097c7e5771015f2a362735d5f88b8c6ea\n" }, { "commit": "45e306536ff236af59676e7fc213d5ad20be45e2", "tree": "238f082f81fe7336f34ef363f48c1b9b22b40087", "parents": [ "98be7e0f1da2d77c502dba5f135476bc6f04c29a" ], "author": { "name": "Eric Laurent", "email": "elaurent@google.com", "time": "Tue Jun 11 14:38:48 2013 -0700" }, "committer": { "name": "The Android Automerger", "email": "android-build@android.com", "time": "Wed Jun 12 14:28:59 2013 -0700" }, "message": "audioflinger: fix effects on direct output threads\n\nPlaybackThread::addTrack_l() uses the assumption that\neffects are attached to a track only if the track accumulation\nbuffer is different from the mixer thread output buffer.\nThis is not true for direct output threads where only one track is active\nan only one buffer is needed.\nThis assumption is an optimization to avoid checking for effect chains with\nthe same session ID each time a track is processed. The optimization\nis not key if only one track is attached to the thread which is the case for\ndirect outputs.\n\nCurrent code fails to increment the active track count in the effect chain\non direct output threads when a track is started thus making the effect\nframework clear the mix buffer and produce silence each time the mixer runs.\n\nThe fix consists in removing the optimization described above.\n\nBug: 9324989.\n\nChange-Id: Id7a6337450ed90d326299c2ce9fc02f4b9e2fa6f\n" }, { "commit": "f8af99b7c10f1441d9a52676724b168f20752270", "tree": "c04a7333f15e86d260c4c207a9fd06cd23d2b195", "parents": [ "bb35be24239f05f59715960a93cd491a4cd3b4d6", "0662f7b6735df0a140f6512285d05f8f9a38bb98" ], "author": { "name": "Lajos Molnar", "email": "lajos@google.com", "time": "Wed Jun 12 09:29:43 2013 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Wed Jun 12 09:29:43 2013 -0700" }, "message": "am 0662f7b6: Merge \"stagefright: synchronously change nativewindow crop\" into jb-mr2-dev\n\n* commit \u00270662f7b6735df0a140f6512285d05f8f9a38bb98\u0027:\n stagefright: synchronously change nativewindow crop\n" }, { "commit": "0662f7b6735df0a140f6512285d05f8f9a38bb98", "tree": "6b3c887f61122cbec3bbd4ef5aa21064d6cbb369", "parents": [ "7be48189c0aefb82825a7689d9e1005175570779", "577db6d42b8d83b3578c7e56b1391bdaca9cb705" ], "author": { "name": "Lajos Molnar", "email": "lajos@google.com", "time": "Wed Jun 12 16:27:40 2013 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Wed Jun 12 16:27:40 2013 +0000" }, "message": "Merge \"stagefright: synchronously change nativewindow crop\" into jb-mr2-dev" }, { "commit": "bb35be24239f05f59715960a93cd491a4cd3b4d6", "tree": "6ec3a7b0ac19c076d9f201dca1b404b4c1621a7b", "parents": [ "765f99f30fdc18396ce4edc9facbe6632c9b858e", "7be48189c0aefb82825a7689d9e1005175570779" ], "author": { "name": "Eric Laurent", "email": "elaurent@google.com", "time": "Wed Jun 12 08:46:03 2013 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Wed Jun 12 08:46:03 2013 -0700" }, "message": "am 7be48189: Merge \"audioflinger: fix effects on direct output threads\" into jb-mr2-dev\n\n* commit \u00277be48189c0aefb82825a7689d9e1005175570779\u0027:\n audioflinger: fix effects on direct output threads\n" }, { "commit": "7be48189c0aefb82825a7689d9e1005175570779", "tree": "eaf3295eb6863ec3f2f74fdf087cf24d4cdde647", "parents": [ "ea26c7772f4721657db409068d4bed194ae49c94", "d0107bcd44fe608b0c00a8843d19fb6356c4cb69" ], "author": { "name": "Eric Laurent", "email": "elaurent@google.com", "time": "Wed Jun 12 15:44:42 2013 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Wed Jun 12 15:44:42 2013 +0000" }, "message": "Merge \"audioflinger: fix effects on direct output threads\" into jb-mr2-dev" }, { "commit": "765f99f30fdc18396ce4edc9facbe6632c9b858e", "tree": "201f10ac3d980c16aadf01b6a16e383e78f4f846", "parents": [ "44ade05f8d030ae3af8d05359734b18eac433935", "23126964b607dd7e65037fc8d9c6eda485be537f" ], "author": { "name": "The Android Open Source Project", "email": "initial-contribution@android.com", "time": "Wed Jun 12 07:23:29 2013 -0700" }, "committer": { "name": "The Android Open Source Project", "email": "initial-contribution@android.com", "time": "Wed Jun 12 07:23:29 2013 -0700" }, "message": "Reconcile with jb-mr2-zeroday-release - do not merge\n\nChange-Id: I87a7986866714bfd922259cf961d6d5f5b752362\n" }, { "commit": "23126964b607dd7e65037fc8d9c6eda485be537f", "tree": "20600997090d036235aeda08a46ddcbd126efa21", "parents": [ "ea26c7772f4721657db409068d4bed194ae49c94", "6f02c174a6ffcf9acbb272bd7ba3bb6f83dc856d" ], "author": { "name": "The Android Automerger", "email": "android-build@google.com", "time": "Wed Jun 12 05:55:52 2013 -0700" }, "committer": { "name": "The Android Automerger", "email": "android-build@google.com", "time": "Wed Jun 12 05:55:52 2013 -0700" }, "message": "merge in jb-mr2-zeroday-release history after reset to jb-mr2-dev\n" }, { "commit": "577db6d42b8d83b3578c7e56b1391bdaca9cb705", "tree": "da9bdc4e1980dbecab0f4b43bb0ad777aa1e59cd", "parents": [ "ea26c7772f4721657db409068d4bed194ae49c94" ], "author": { "name": "Lajos Molnar", "email": "lajos@google.com", "time": "Tue Jun 11 17:56:24 2013 -0700" }, "committer": { "name": "Lajos Molnar", "email": "lajos@google.com", "time": "Tue Jun 11 18:50:48 2013 -0700" }, "message": "stagefright: synchronously change nativewindow crop\n\nOnly change the nativewindow crop before queuing frames\nwith the new crop.\n\nChange-Id: Icd8a84c82e66a8be3d6bc1675c777b1de8dc39b9\nSigned-off-by: Lajos Molnar \u003clajos@google.com\u003e\nBug: 9395753\n" }, { "commit": "44ade05f8d030ae3af8d05359734b18eac433935", "tree": "201f10ac3d980c16aadf01b6a16e383e78f4f846", "parents": [ "6c72c1877fadca5068fa94f7a0249c0609e85534", "ea26c7772f4721657db409068d4bed194ae49c94" ], "author": { "name": "Eino-Ville Talvala", "email": "etalvala@google.com", "time": "Tue Jun 11 18:21:05 2013 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Tue Jun 11 18:21:05 2013 -0700" }, "message": "am ea26c777: Camera3: Skip no-op stream configurations.\n\n* commit \u0027ea26c7772f4721657db409068d4bed194ae49c94\u0027:\n Camera3: Skip no-op stream configurations.\n" }, { "commit": "ea26c7772f4721657db409068d4bed194ae49c94", "tree": "20600997090d036235aeda08a46ddcbd126efa21", "parents": [ "ba696bbff88d5627beaa0be95be78ba30138983d" ], "author": { "name": "Eino-Ville Talvala", "email": "etalvala@google.com", "time": "Tue Jun 11 16:04:06 2013 -0700" }, "committer": { "name": "Eino-Ville Talvala", "email": "etalvala@google.com", "time": "Tue Jun 11 16:06:02 2013 -0700" }, "message": "Camera3: Skip no-op stream configurations.\n\nIf configuring the same set of streams more than once, don\u0027t actually\ncall into the HAL for the second and subsequent configure calls, since\nthey\u0027re no-ops.\n\nThis can speed up camera operation substantially if the\nHAL implementation does not detect no-ops on its own and does a full\nshutdown/restart on each configure call.\n\nBug: 9392513\nChange-Id: I23baf4acbae2304735899adcf8e17565fa94d31d\n" }, { "commit": "d0107bcd44fe608b0c00a8843d19fb6356c4cb69", "tree": "ed820c80ced11b73b1ed88899c182b83b186429f", "parents": [ "ba696bbff88d5627beaa0be95be78ba30138983d" ], "author": { "name": "Eric Laurent", "email": "elaurent@google.com", "time": "Tue Jun 11 14:38:48 2013 -0700" }, "committer": { "name": "Eric Laurent", "email": "elaurent@google.com", "time": "Tue Jun 11 14:57:08 2013 -0700" }, "message": "audioflinger: fix effects on direct output threads\n\nPlaybackThread::addTrack_l() uses the assumption that\neffects are attached to a track only if the track accumulation\nbuffer is different from the mixer thread output buffer.\nThis is not true for direct output threads where only one track is active\nan only one buffer is needed.\nThis assumption is an optimization to avoid checking for effect chains with\nthe same session ID each time a track is processed. The optimization\nis not key if only one track is attached to the thread which is the case for\ndirect outputs.\n\nCurrent code fails to increment the active track count in the effect chain\non direct output threads when a track is started thus making the effect\nframework clear the mix buffer and produce silence each time the mixer runs.\n\nThe fix consists in removing the optimization described above.\n\nBug: 9324989.\n\nChange-Id: Id7a6337450ed90d326299c2ce9fc02f4b9e2fa6f\n" }, { "commit": "a9c64a9398ac2e6173f99e252f305808a34cab1c", "tree": "324ccc6b93f727f08febe50abe63d102ede9e6fa", "parents": [ "ba696bbff88d5627beaa0be95be78ba30138983d" ], "author": { "name": "Eino-Ville Talvala", "email": "etalvala@google.com", "time": "Mon Jun 10 15:12:01 2013 -0700" }, "committer": { "name": "Eino-Ville Talvala", "email": "etalvala@google.com", "time": "Tue Jun 11 14:44:47 2013 -0700" }, "message": "Camera2/3: Create JPEG stream unconditionally.\n\nInstead of creating the JPEG output stream only at first use,\ncreate it at time of preview start. This is important for reducing\nthe first-capture latency on HAL3 devices, and for ZSL on them.\n\nBug: 9339858\nChange-Id: I4296f706cfd151c47ef315149e87d01fe554aaa4\n" }, { "commit": "6c72c1877fadca5068fa94f7a0249c0609e85534", "tree": "777d5acd68cfa82a0f55ebbd7844f0897e545b1a", "parents": [ "574ca4f4f15a42d6159150149f68bf3cb800d869", "98be7e0f1da2d77c502dba5f135476bc6f04c29a", "6f02c174a6ffcf9acbb272bd7ba3bb6f83dc856d" ], "author": { "name": "The Android Open Source Project", "email": "initial-contribution@android.com", "time": "Mon Jun 10 08:13:42 2013 -0700" }, "committer": { "name": "The Android Open Source Project", "email": "initial-contribution@android.com", "time": "Mon Jun 10 08:13:42 2013 -0700" }, "message": "Reconcile with jb-mr2-release jb-mr2-zeroday-release - do not merge\n\nChange-Id: I9864de7c2785357cea0c4b669607fee76e9f09e8\n" } ], "next": "6f02c174a6ffcf9acbb272bd7ba3bb6f83dc856d" }