)]}' { "log": [ { "commit": "c8c5ad6a323476b85adba337574b72d38649c8aa", "tree": "5ce68ec65af9f9bc1a92c150cb28d40a698b13dd", "parents": [ "8d1ee30b8c867ac3a5f6daef0bdf97d4ea777cfe", "1da71728a8d126d8e0697bb7c2efac60360eb4c9" ], "author": { "name": "The Android Open Source Project", "email": "initial-contribution@android.com", "time": "Thu Oct 11 05:57:06 2012 -0700" }, "committer": { "name": "The Android Open Source Project", "email": "initial-contribution@android.com", "time": "Thu Oct 11 05:57:06 2012 -0700" }, "message": "Reconcile with jb-mr1-release - do not merge\n\nChange-Id: Ie5b35b4154bf8cc096620a99382b5137ebb5ca81\n" }, { "commit": "8d1ee30b8c867ac3a5f6daef0bdf97d4ea777cfe", "tree": "5ce68ec65af9f9bc1a92c150cb28d40a698b13dd", "parents": [ "f84ae1292bc9a6a727ab5aeb08e097054b7d4b5a", "411ddcc42a17abf4173345a992e4cd6575751739" ], "author": { "name": "Eino-Ville Talvala", "email": "etalvala@google.com", "time": "Wed Oct 10 17:51:31 2012 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Wed Oct 10 17:51:31 2012 -0700" }, "message": "am a14be593: Camera2: Don\\\u0027t error out of startPreview when already recording.\n\n* commit \u0027a14be59340219c47639ec77a352d2af362551a6f\u0027:\n Camera2: Don\u0027t error out of startPreview when already recording.\n" }, { "commit": "411ddcc42a17abf4173345a992e4cd6575751739", "tree": "5ce68ec65af9f9bc1a92c150cb28d40a698b13dd", "parents": [ "32dd792aa1675e91c7a0cf7cee7aba215fe1be67" ], "author": { "name": "Eino-Ville Talvala", "email": "etalvala@google.com", "time": "Wed Oct 10 17:17:01 2012 -0700" }, "committer": { "name": "Eino-Ville Talvala", "email": "etalvala@google.com", "time": "Wed Oct 10 17:18:38 2012 -0700" }, "message": "Camera2: Don\u0027t error out of startPreview when already recording.\n\nBug: 7327474\nChange-Id: I603da5b8bd58e5a700d7ae0b3d34bd89bbcb1d53\n" }, { "commit": "f84ae1292bc9a6a727ab5aeb08e097054b7d4b5a", "tree": "66ba8e0ee3e477d82134792cdf9a91003ca6c2c1", "parents": [ "33ef5038d780b4cc441eec867224824655e19095", "32dd792aa1675e91c7a0cf7cee7aba215fe1be67" ], "author": { "name": "Jean-Michel Trivi", "email": "jmtrivi@google.com", "time": "Wed Oct 10 16:36:04 2012 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Wed Oct 10 16:36:04 2012 -0700" }, "message": "am 7e2c0a15: Merge \"Support querying active record sources\" into jb-mr1-dev\n\n* commit \u00277e2c0a15bb8086460070811a152029726479a297\u0027:\n Support querying active record sources\n" }, { "commit": "32dd792aa1675e91c7a0cf7cee7aba215fe1be67", "tree": "66ba8e0ee3e477d82134792cdf9a91003ca6c2c1", "parents": [ "cfee40e0d30aa2d93df2c4633e7573165f0d7337", "e3f641fd9348bf7f4c07f6cc707347fccea1439c" ], "author": { "name": "Jean-Michel Trivi", "email": "jmtrivi@google.com", "time": "Wed Oct 10 16:30:19 2012 -0700" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Wed Oct 10 16:30:20 2012 -0700" }, "message": "Merge \"Support querying active record sources\" into jb-mr1-dev" }, { "commit": "33ef5038d780b4cc441eec867224824655e19095", "tree": "fa1e029d2d204f7d2950cae700a7365f288c47b2", "parents": [ "67dcf032a722dab62a15b919bcf717060a2cf166", "cfee40e0d30aa2d93df2c4633e7573165f0d7337" ], "author": { "name": "Eino-Ville Talvala", "email": "etalvala@google.com", "time": "Wed Oct 10 16:17:11 2012 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Wed Oct 10 16:17:11 2012 -0700" }, "message": "am 907e5651: Camera2: Don\\\u0027t let unlocks happen during recording.\n\n* commit \u0027907e5651c18d0e25073743a49a685fe1a385939a\u0027:\n Camera2: Don\u0027t let unlocks happen during recording.\n" }, { "commit": "cfee40e0d30aa2d93df2c4633e7573165f0d7337", "tree": "fa1e029d2d204f7d2950cae700a7365f288c47b2", "parents": [ "1bf2809d3fd3890a782869a041b70b8e595ecdb6" ], "author": { "name": "Eino-Ville Talvala", "email": "etalvala@google.com", "time": "Wed Oct 10 15:28:53 2012 -0700" }, "committer": { "name": "Eino-Ville Talvala", "email": "etalvala@google.com", "time": "Wed Oct 10 15:28:53 2012 -0700" }, "message": "Camera2: Don\u0027t let unlocks happen during recording.\n\nBug: 7309020\nChange-Id: I6e66809b868d2e8f47f71e6f8752b44ec06dfb17\n" }, { "commit": "1da71728a8d126d8e0697bb7c2efac60360eb4c9", "tree": "f205a31cb04513e9c1b443bfc53fa3ddb1778957", "parents": [ "1bf2809d3fd3890a782869a041b70b8e595ecdb6", "739c59aaa2f002c01e52bfe8d42e7068d75c81d7" ], "author": { "name": "The Android Automerger", "email": "android-build@android.com", "time": "Wed Oct 10 14:06:30 2012 -0700" }, "committer": { "name": "The Android Automerger", "email": "android-build@android.com", "time": "Wed Oct 10 14:06:30 2012 -0700" }, "message": "merge in jb-mr1-release history after reset to jb-mr1-dev\n" }, { "commit": "67dcf032a722dab62a15b919bcf717060a2cf166", "tree": "f205a31cb04513e9c1b443bfc53fa3ddb1778957", "parents": [ "50016d7e0f61bfbcf7eb490725d954db802a034e", "1bf2809d3fd3890a782869a041b70b8e595ecdb6" ], "author": { "name": "Eino-Ville Talvala", "email": "etalvala@google.com", "time": "Wed Oct 10 13:17:01 2012 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Wed Oct 10 13:17:01 2012 -0700" }, "message": "am 55f6c9df: Camera2: Do not set auto-white-balance regions from metering regions.\n\n* commit \u002755f6c9dfd713776e251655b3ddd496b17df0926e\u0027:\n Camera2: Do not set auto-white-balance regions from metering regions.\n" }, { "commit": "50016d7e0f61bfbcf7eb490725d954db802a034e", "tree": "f9575d6ed80df4388fe43ee2e721b50643c52865", "parents": [ "3ac9bd7eb423a46e9d5cc58f09b5f7dbe91a2f1b", "617048834dc5b2cb87ab208bdd526262a7c4e90c" ], "author": { "name": "Eino-Ville Talvala", "email": "etalvala@google.com", "time": "Wed Oct 10 13:05:48 2012 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Wed Oct 10 13:05:48 2012 -0700" }, "message": "am c0379204: Camera: Limit valid caller PIDs for camera clients.\n\n* commit \u0027c03792041b9dd6f7f54abd6c82bd6c755a336cd8\u0027:\n Camera: Limit valid caller PIDs for camera clients.\n" }, { "commit": "1bf2809d3fd3890a782869a041b70b8e595ecdb6", "tree": "f205a31cb04513e9c1b443bfc53fa3ddb1778957", "parents": [ "617048834dc5b2cb87ab208bdd526262a7c4e90c" ], "author": { "name": "Eino-Ville Talvala", "email": "etalvala@google.com", "time": "Mon Oct 08 23:58:02 2012 -0700" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Wed Oct 10 13:03:04 2012 -0700" }, "message": "Camera2: Do not set auto-white-balance regions from metering regions.\n\nPer API documentation, metering regions are only for AE, not also for AWB.\n\nBug: 7312720\nChange-Id: I39bcf33e4c81e80022f45e8fca77ea6cf9ba115e\n" }, { "commit": "e3f641fd9348bf7f4c07f6cc707347fccea1439c", "tree": "0b9e59cf60f2ee5edd7e6fe1fb3d6ea6aed8577f", "parents": [ "a70995f9dec3c2915792113c9c228b5b6474a915" ], "author": { "name": "Jean-Michel Trivi", "email": "jmtrivi@google.com", "time": "Wed Oct 10 12:11:16 2012 -0700" }, "committer": { "name": "Jean-Michel Trivi", "email": "jmtrivi@google.com", "time": "Wed Oct 10 12:11:16 2012 -0700" }, "message": "Support querying active record sources\n\nAdd support for querying whether there is currently a recording\n underway from the specified audio source.\n\nBug 7314859\n\nChange-Id: I986b231a10ffd368b08ec2f9c7f348d28eaeb892\n" }, { "commit": "3ac9bd7eb423a46e9d5cc58f09b5f7dbe91a2f1b", "tree": "0219c3bce8984d3dc2ad402c5e7a48e10cefdf74", "parents": [ "0d19b574cc9f12c4c042cb7070757e3c85c7301f", "a1970f4a9a902b63104d65c9f95ba062a3391200", "739c59aaa2f002c01e52bfe8d42e7068d75c81d7" ], "author": { "name": "The Android Open Source Project", "email": "initial-contribution@android.com", "time": "Wed Oct 10 09:44:29 2012 -0700" }, "committer": { "name": "The Android Open Source Project", "email": "initial-contribution@android.com", "time": "Wed Oct 10 09:44:29 2012 -0700" }, "message": "Reconcile with jb-mr1-factory-release jb-mr1-release - do not merge\n\nChange-Id: I0a56a7cd77b8d52e699455b6bd01b884bcc32bc4\n" }, { "commit": "617048834dc5b2cb87ab208bdd526262a7c4e90c", "tree": "f9575d6ed80df4388fe43ee2e721b50643c52865", "parents": [ "af5041cca803f4e7f0d2dfeca596abb8bda313b6" ], "author": { "name": "Eino-Ville Talvala", "email": "etalvala@google.com", "time": "Tue Oct 09 22:16:58 2012 -0700" }, "committer": { "name": "Eino-Ville Talvala", "email": "etalvala@google.com", "time": "Wed Oct 10 09:39:37 2012 -0700" }, "message": "Camera: Limit valid caller PIDs for camera clients.\n\nNarrow down on PID checks to avoid cases where service can access the\ncamera even though it shouldn\u0027t be able to, per API semantics.\n\nBug: 6970469\n\nChange-Id: Ic468a31949c28ef978b6ed48a70e4601c7ced684\n" }, { "commit": "a1970f4a9a902b63104d65c9f95ba062a3391200", "tree": "0219c3bce8984d3dc2ad402c5e7a48e10cefdf74", "parents": [ "af5041cca803f4e7f0d2dfeca596abb8bda313b6", "ff0ea51ba6bc76704c1e3d00f09807ee711859e5" ], "author": { "name": "The Android Automerger", "email": "android-build@android.com", "time": "Wed Oct 10 08:50:21 2012 -0700" }, "committer": { "name": "The Android Automerger", "email": "android-build@android.com", "time": "Wed Oct 10 08:50:21 2012 -0700" }, "message": "merge in jb-mr1-factory-release history after reset to jb-mr1-dev\n" }, { "commit": "0d19b574cc9f12c4c042cb7070757e3c85c7301f", "tree": "0219c3bce8984d3dc2ad402c5e7a48e10cefdf74", "parents": [ "9e5292706488aa816cbb9ee5615cf6126505489d", "af5041cca803f4e7f0d2dfeca596abb8bda313b6" ], "author": { "name": "Eino-Ville Talvala", "email": "etalvala@google.com", "time": "Wed Oct 10 08:37:33 2012 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Wed Oct 10 08:37:33 2012 -0700" }, "message": "am 2b0db6ae: Merge \"Camera: Clear Hardware device pointer when initialization fails\" into jb-mr1-dev\n\n* commit \u00272b0db6aea3be519334f340ca97581db902196690\u0027:\n Camera: Clear Hardware device pointer when initialization fails\n" }, { "commit": "739c59aaa2f002c01e52bfe8d42e7068d75c81d7", "tree": "0219c3bce8984d3dc2ad402c5e7a48e10cefdf74", "parents": [ "af5041cca803f4e7f0d2dfeca596abb8bda313b6", "ff0ea51ba6bc76704c1e3d00f09807ee711859e5" ], "author": { "name": "The Android Automerger", "email": "android-build@android.com", "time": "Wed Oct 10 06:59:19 2012 -0700" }, "committer": { "name": "The Android Automerger", "email": "android-build@android.com", "time": "Wed Oct 10 06:59:19 2012 -0700" }, "message": "merge in jb-mr1-release history after reset to jb-mr1-dev\n" }, { "commit": "af5041cca803f4e7f0d2dfeca596abb8bda313b6", "tree": "0219c3bce8984d3dc2ad402c5e7a48e10cefdf74", "parents": [ "c6fbe60e4232911bb80a27e1badc670b2b80efbd", "d230cc783aa13de5c563adec54641bec6a355054" ], "author": { "name": "Eino-Ville Talvala", "email": "etalvala@google.com", "time": "Tue Oct 09 21:57:37 2012 -0700" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Tue Oct 09 21:57:38 2012 -0700" }, "message": "Merge \"Camera: Clear Hardware device pointer when initialization fails\" into jb-mr1-dev" }, { "commit": "9e5292706488aa816cbb9ee5615cf6126505489d", "tree": "c97f86e364ad69deb163eaf29c4409aebecc58dd", "parents": [ "1f1bbbedd0a67417ba30e64c87d946f1952419a6", "c6fbe60e4232911bb80a27e1badc670b2b80efbd" ], "author": { "name": "Andreas Huber", "email": "andih@google.com", "time": "Tue Oct 09 16:16:15 2012 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Tue Oct 09 16:16:15 2012 -0700" }, "message": "am 73125afc: Merge \"Switch audio mode based on dongle\\\u0027s capabilities\" into jb-mr1-dev\n\n* commit \u002773125afc0333c9aba37749e605537342caca11cd\u0027:\n Switch audio mode based on dongle\u0027s capabilities\n" }, { "commit": "c6fbe60e4232911bb80a27e1badc670b2b80efbd", "tree": "c97f86e364ad69deb163eaf29c4409aebecc58dd", "parents": [ "a70995f9dec3c2915792113c9c228b5b6474a915", "1fdfd0186f1cf959fb8bec03b4d426b8879ed4fd" ], "author": { "name": "Andreas Huber", "email": "andih@google.com", "time": "Tue Oct 09 16:11:27 2012 -0700" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Tue Oct 09 16:11:27 2012 -0700" }, "message": "Merge \"Switch audio mode based on dongle\u0027s capabilities\" into jb-mr1-dev" }, { "commit": "ff0ea51ba6bc76704c1e3d00f09807ee711859e5", "tree": "d5cd51a2f62db49a644f3c62f2d58861593435dd", "parents": [ "a00dfa71b74ccf6dd3b44c90d7cac88e07475acb", "7b9aced22ff0b4db6d995896c84f702dcf9c52dd" ], "author": { "name": "The Android Automerger", "email": "android-build@android.com", "time": "Tue Oct 09 16:07:19 2012 -0700" }, "committer": { "name": "The Android Automerger", "email": "android-build@android.com", "time": "Tue Oct 09 16:07:19 2012 -0700" }, "message": "merge in jb-mr1-release history after reset to jb-mr1-dev\n" }, { "commit": "1fdfd0186f1cf959fb8bec03b4d426b8879ed4fd", "tree": "e66a5beff9195b664fba81a0cbdb5102959a29a5", "parents": [ "19caf26b1ab1619020aa417d7913c11fd1d5590d" ], "author": { "name": "Andreas Huber", "email": "andih@google.com", "time": "Tue Oct 09 15:53:34 2012 -0700" }, "committer": { "name": "Andreas Huber", "email": "andih@google.com", "time": "Tue Oct 09 15:53:34 2012 -0700" }, "message": "Switch audio mode based on dongle\u0027s capabilities\n\nproperly parse rtp port and use it to setup session.\n\nChange-Id: Ic7521cb867143278196c3ce4b19a74ecc2703d8e\nrelated-to-bug: 7318719\n" }, { "commit": "7b9aced22ff0b4db6d995896c84f702dcf9c52dd", "tree": "503ae75fdb3c97ceadefbbadb896eaed5890dc01", "parents": [ "9436ff8d852306fb1160170b1cb8613d840df637", "a00dfa71b74ccf6dd3b44c90d7cac88e07475acb" ], "author": { "name": "The Android Automerger", "email": "android-build@android.com", "time": "Tue Oct 09 15:38:51 2012 -0700" }, "committer": { "name": "The Android Automerger", "email": "android-build@android.com", "time": "Tue Oct 09 15:38:51 2012 -0700" }, "message": "merge in jb-mr1-release history after reset to jb-mr1-dev\n" }, { "commit": "1f1bbbedd0a67417ba30e64c87d946f1952419a6", "tree": "93e3388f2b427702e7b9a3cb6bece874ddb9caf5", "parents": [ "975d3a789d5a403cac66b6d9a213fb4b66a6a3a8", "a70995f9dec3c2915792113c9c228b5b6474a915" ], "author": { "name": "Eino-Ville Talvala", "email": "etalvala@google.com", "time": "Tue Oct 09 15:28:00 2012 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Tue Oct 09 15:28:00 2012 -0700" }, "message": "am dca0ac21: Merge \"Camera2: Fix uninitialized parameters.\" into jb-mr1-dev\n\n* commit \u0027dca0ac2193e87c57d871dd208073107408c13c0a\u0027:\n Camera2: Fix uninitialized parameters.\n" }, { "commit": "a70995f9dec3c2915792113c9c228b5b6474a915", "tree": "93e3388f2b427702e7b9a3cb6bece874ddb9caf5", "parents": [ "9436ff8d852306fb1160170b1cb8613d840df637", "4cc45fa65659ff8771a185e4f4584a9b0da10247" ], "author": { "name": "Eino-Ville Talvala", "email": "etalvala@google.com", "time": "Tue Oct 09 15:22:46 2012 -0700" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Tue Oct 09 15:22:47 2012 -0700" }, "message": "Merge \"Camera2: Fix uninitialized parameters.\" into jb-mr1-dev" }, { "commit": "d230cc783aa13de5c563adec54641bec6a355054", "tree": "b303e828a6ad3dd161629477e94335106fe2d34e", "parents": [ "9436ff8d852306fb1160170b1cb8613d840df637" ], "author": { "name": "Igor Murashkin", "email": "iam@google.com", "time": "Tue Oct 09 14:45:37 2012 -0700" }, "committer": { "name": "Igor Murashkin", "email": "iam@google.com", "time": "Tue Oct 09 14:45:37 2012 -0700" }, "message": "Camera: Clear Hardware device pointer when initialization fails\n\nWhen disconnecting, don\u0027t try to call device functions if the initialization\nfails since this can lead to internal HAL segfaults.\n\nBug: 7317107\nChange-Id: Ib65db7eb6556ee10d844959934b1bfd7bb08d0ff\n" }, { "commit": "975d3a789d5a403cac66b6d9a213fb4b66a6a3a8", "tree": "503ae75fdb3c97ceadefbbadb896eaed5890dc01", "parents": [ "52c903c1e05a7dfbfa3b942f0345ce8093619e44", "9436ff8d852306fb1160170b1cb8613d840df637" ], "author": { "name": "Igor Murashkin", "email": "iam@google.com", "time": "Tue Oct 09 13:53:17 2012 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Tue Oct 09 13:53:17 2012 -0700" }, "message": "am 3d84d38e: Merge \"Camera2: Call onAutoFocus immediately for fixed-focus cameras\" into jb-mr1-dev\n\n* commit \u00273d84d38e7ac02b47d17f4bb272f18f8b0e873104\u0027:\n Camera2: Call onAutoFocus immediately for fixed-focus cameras\n" }, { "commit": "9436ff8d852306fb1160170b1cb8613d840df637", "tree": "503ae75fdb3c97ceadefbbadb896eaed5890dc01", "parents": [ "c8d9bc29aaede1f104c6faed095a4c636bbe5748", "5b44beef5a4ff04889bcdd874dc4e8d140f3edac" ], "author": { "name": "Igor Murashkin", "email": "iam@google.com", "time": "Tue Oct 09 13:49:28 2012 -0700" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Tue Oct 09 13:49:28 2012 -0700" }, "message": "Merge \"Camera2: Call onAutoFocus immediately for fixed-focus cameras\" into jb-mr1-dev" }, { "commit": "4cc45fa65659ff8771a185e4f4584a9b0da10247", "tree": "e2ce7e922de36c380f607e3ce3075e93623f4e53", "parents": [ "19caf26b1ab1619020aa417d7913c11fd1d5590d" ], "author": { "name": "Eino-Ville Talvala", "email": "etalvala@google.com", "time": "Tue Oct 09 12:52:16 2012 -0700" }, "committer": { "name": "Eino-Ville Talvala", "email": "etalvala@google.com", "time": "Tue Oct 09 12:59:16 2012 -0700" }, "message": "Camera2: Fix uninitialized parameters.\n\nSome parameters were not being set to default values, causing strange\nflakiness in any app that wasn\u0027t calling setParameters. This includes\nmany CTS tests.\n\nBug: 6970468\nChange-Id: If91635afc000e23862e7b039292a55349274c5ee\n" }, { "commit": "52c903c1e05a7dfbfa3b942f0345ce8093619e44", "tree": "14633b61cdf261b8d87a2968dc8fa0610e7a8dd8", "parents": [ "3db8b1f24d8266e24797a5095521521f177f4809", "c8d9bc29aaede1f104c6faed095a4c636bbe5748" ], "author": { "name": "Eino-Ville Talvala", "email": "etalvala@google.com", "time": "Tue Oct 09 12:15:58 2012 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Tue Oct 09 12:15:58 2012 -0700" }, "message": "am d016cf5b: Merge \"Camera2: Move non-ZSL shutter sound firing to be later.\" into jb-mr1-dev\n\n* commit \u0027d016cf5b12cb73bd49bcecb0d5a4958df23620c3\u0027:\n Camera2: Move non-ZSL shutter sound firing to be later.\n" }, { "commit": "c8d9bc29aaede1f104c6faed095a4c636bbe5748", "tree": "14633b61cdf261b8d87a2968dc8fa0610e7a8dd8", "parents": [ "e069ec80e964c39229314fa05bd2bc91d4e9e77b", "ad21da9c2b575eddc0d11b789bb577985a0bf50b" ], "author": { "name": "Eino-Ville Talvala", "email": "etalvala@google.com", "time": "Tue Oct 09 12:12:07 2012 -0700" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Tue Oct 09 12:12:08 2012 -0700" }, "message": "Merge \"Camera2: Move non-ZSL shutter sound firing to be later.\" into jb-mr1-dev" }, { "commit": "3db8b1f24d8266e24797a5095521521f177f4809", "tree": "eece7a7be88d529fd8d251aa09fc2fda8df9ae17", "parents": [ "049828caa9dd9733983e1b7bea075f2cea4f7d34", "e069ec80e964c39229314fa05bd2bc91d4e9e77b" ], "author": { "name": "Eric Laurent", "email": "elaurent@google.com", "time": "Tue Oct 09 11:32:31 2012 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Tue Oct 09 11:32:31 2012 -0700" }, "message": "am 350d3b68: Merge \"audio policy: deprecate ro.camera.sound.forced\" into jb-mr1-dev\n\n* commit \u0027350d3b686357a159fb1a962bbd41e01924d27cad\u0027:\n audio policy: deprecate ro.camera.sound.forced\n" }, { "commit": "e069ec80e964c39229314fa05bd2bc91d4e9e77b", "tree": "eece7a7be88d529fd8d251aa09fc2fda8df9ae17", "parents": [ "19caf26b1ab1619020aa417d7913c11fd1d5590d", "116bc97164e0fa836744f31e54779b5a7a8c9db4" ], "author": { "name": "Eric Laurent", "email": "elaurent@google.com", "time": "Tue Oct 09 11:28:53 2012 -0700" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Tue Oct 09 11:28:53 2012 -0700" }, "message": "Merge \"audio policy: deprecate ro.camera.sound.forced\" into jb-mr1-dev" }, { "commit": "5b44beef5a4ff04889bcdd874dc4e8d140f3edac", "tree": "415e5a121bb63782983a7ed125d288d140b0756d", "parents": [ "19caf26b1ab1619020aa417d7913c11fd1d5590d" ], "author": { "name": "Igor Murashkin", "email": "iam@google.com", "time": "Mon Oct 08 18:05:12 2012 -0700" }, "committer": { "name": "Igor Murashkin", "email": "iam@google.com", "time": "Tue Oct 09 11:04:10 2012 -0700" }, "message": "Camera2: Call onAutoFocus immediately for fixed-focus cameras\n\nBug: 7311578\nChange-Id: Ib8a8ea1f5fc269abdd24ed1e0370dc9b87b284ee\n" }, { "commit": "049828caa9dd9733983e1b7bea075f2cea4f7d34", "tree": "d5cd51a2f62db49a644f3c62f2d58861593435dd", "parents": [ "cbf2b86d223d5b7a9b6a05db2b6d446251586870", "a00dfa71b74ccf6dd3b44c90d7cac88e07475acb" ], "author": { "name": "The Android Open Source Project", "email": "initial-contribution@android.com", "time": "Tue Oct 09 07:29:10 2012 -0700" }, "committer": { "name": "The Android Open Source Project", "email": "initial-contribution@android.com", "time": "Tue Oct 09 07:29:10 2012 -0700" }, "message": "Reconcile with jb-mr1-release - do not merge\n\nChange-Id: I2d81c143dd737e9faf93df9a104d79f7f36fd429\n" }, { "commit": "a00dfa71b74ccf6dd3b44c90d7cac88e07475acb", "tree": "d5cd51a2f62db49a644f3c62f2d58861593435dd", "parents": [ "19caf26b1ab1619020aa417d7913c11fd1d5590d", "f4653ecc41fc7bea42a32406c10bf779089c1fc2" ], "author": { "name": "The Android Automerger", "email": "android-build@android.com", "time": "Tue Oct 09 06:59:19 2012 -0700" }, "committer": { "name": "The Android Automerger", "email": "android-build@android.com", "time": "Tue Oct 09 06:59:19 2012 -0700" }, "message": "merge in jb-mr1-release history after reset to jb-mr1-dev\n" }, { "commit": "cbf2b86d223d5b7a9b6a05db2b6d446251586870", "tree": "d5cd51a2f62db49a644f3c62f2d58861593435dd", "parents": [ "78fe60c94b6efc755dcd4e228b55d277f66d615f", "19caf26b1ab1619020aa417d7913c11fd1d5590d" ], "author": { "name": "Eino-Ville Talvala", "email": "etalvala@google.com", "time": "Mon Oct 08 22:23:37 2012 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Mon Oct 08 22:23:37 2012 -0700" }, "message": "am 2458d482: Merge \"Camera2: Always disconnect in the client destructor\" into jb-mr1-dev\n\n* commit \u00272458d482c4822c6f9e6274f5bd12b6aea095a9cd\u0027:\n Camera2: Always disconnect in the client destructor\n" }, { "commit": "19caf26b1ab1619020aa417d7913c11fd1d5590d", "tree": "d5cd51a2f62db49a644f3c62f2d58861593435dd", "parents": [ "0ad293aac9af377606fb4aa752b95547a8462791", "be8d28a12e8d08531c6053bcf8ad1183c2f6e6d3" ], "author": { "name": "Eino-Ville Talvala", "email": "etalvala@google.com", "time": "Mon Oct 08 22:20:47 2012 -0700" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Mon Oct 08 22:20:47 2012 -0700" }, "message": "Merge \"Camera2: Always disconnect in the client destructor\" into jb-mr1-dev" }, { "commit": "ad21da9c2b575eddc0d11b789bb577985a0bf50b", "tree": "fba8e750664dc7fa8b9cae8009b2048df7559ffa", "parents": [ "0ad293aac9af377606fb4aa752b95547a8462791" ], "author": { "name": "Eino-Ville Talvala", "email": "etalvala@google.com", "time": "Sun Oct 07 22:43:48 2012 -0700" }, "committer": { "name": "Eino-Ville Talvala", "email": "etalvala@google.com", "time": "Mon Oct 08 16:47:14 2012 -0700" }, "message": "Camera2: Move non-ZSL shutter sound firing to be later.\n\nInstead of firing shutter sound when capture request is submitted for\nnon-ZSL captures, fire it when the metadata frame is received. This\nguarantees that the shutter sound fires after picture capture is\ncompleted by the sensor.\n\nBug: 7259900\nChange-Id: I4a1eeed89ed0400bf80b0f0cc2d5799c3d9bb9e3\n" }, { "commit": "116bc97164e0fa836744f31e54779b5a7a8c9db4", "tree": "d5c6b169afe3ef577e1b76113b65220ea54cda8e", "parents": [ "2b5232dd49d006a08c35ba865a6801acdb15483c" ], "author": { "name": "Eric Laurent", "email": "elaurent@google.com", "time": "Mon Oct 08 16:00:36 2012 -0700" }, "committer": { "name": "Eric Laurent", "email": "elaurent@google.com", "time": "Mon Oct 08 16:00:36 2012 -0700" }, "message": "audio policy: deprecate ro.camera.sound.forced\n\nThe volume and routing policy of AUDIO_STREAM_ENFORCED_AUDIBLE is\nnow controlled by AudioService.\n\nDo not read ro.camera.sound.forced is not needed anymore.\n\nBug 7032634.\n\nChange-Id: Ic0a6396fc4b6efb91cdb4dffe0c8eb035d0440bd\n" }, { "commit": "78fe60c94b6efc755dcd4e228b55d277f66d615f", "tree": "ad80189add1c31f9f859584541f3196ae673cc9f", "parents": [ "0a1832bfa4f179e5a48b17344c0773584c1bb994", "0ad293aac9af377606fb4aa752b95547a8462791" ], "author": { "name": "Igor Murashkin", "email": "iam@google.com", "time": "Mon Oct 08 15:32:09 2012 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Mon Oct 08 15:32:09 2012 -0700" }, "message": "am 82edd543: Camera2: isSmoothZoomSupported should return FALSE\n\n* commit \u002782edd5431951f461058c07b73c0dbc093aa45c99\u0027:\n Camera2: isSmoothZoomSupported should return FALSE\n" }, { "commit": "be8d28a12e8d08531c6053bcf8ad1183c2f6e6d3", "tree": "4ddcbe12b50b6c8782f3d8cecd815f9129ada468", "parents": [ "2814a4dc0dd45007ce62871af08b98214cd1692c" ], "author": { "name": "Igor Murashkin", "email": "iam@google.com", "time": "Mon Oct 08 15:09:46 2012 -0700" }, "committer": { "name": "Igor Murashkin", "email": "iam@google.com", "time": "Mon Oct 08 15:09:46 2012 -0700" }, "message": "Camera2: Always disconnect in the client destructor\n\nIf Camera2Client failed to initialize, it would skip disconnect step,\nand thus the camera would be forever marked as busy. By always calling\ndisconnect it will always call free.\n\nIt also adds a new guarantee that Client::disconnect is idempotent\n\nBug: 7298182\nChange-Id: Ic9876f1665b7d9b3c0da692880f63f165e3f4fa5\n" }, { "commit": "0ad293aac9af377606fb4aa752b95547a8462791", "tree": "ad80189add1c31f9f859584541f3196ae673cc9f", "parents": [ "2814a4dc0dd45007ce62871af08b98214cd1692c" ], "author": { "name": "Igor Murashkin", "email": "iam@google.com", "time": "Mon Oct 08 14:08:32 2012 -0700" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Mon Oct 08 14:19:06 2012 -0700" }, "message": "Camera2: isSmoothZoomSupported should return FALSE\n\nBug: 7308024\nChange-Id: Ib757bef8f6dc203f8dfa6ea6d11191e3c7cfcc6d\n" }, { "commit": "0a1832bfa4f179e5a48b17344c0773584c1bb994", "tree": "31454ee4ba8e96f1fee1bed35d91b1125d35903b", "parents": [ "a290191b7b9846ae5648e74bf8df8f496484cea3", "2814a4dc0dd45007ce62871af08b98214cd1692c" ], "author": { "name": "Alex Ray", "email": "aray@google.com", "time": "Mon Oct 08 14:13:04 2012 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Mon Oct 08 14:13:04 2012 -0700" }, "message": "am 6f854608: Camera2: Set default flash mode to FLASH_OFF\n\n* commit \u00276f854608d26d7abcce5e46396c7260ed7b250653\u0027:\n Camera2: Set default flash mode to FLASH_OFF\n" }, { "commit": "2814a4dc0dd45007ce62871af08b98214cd1692c", "tree": "31454ee4ba8e96f1fee1bed35d91b1125d35903b", "parents": [ "07cc78fe7dee9a96cd33865de890d0890fe752d7" ], "author": { "name": "Alex Ray", "email": "aray@google.com", "time": "Mon Oct 08 12:04:15 2012 -0700" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Mon Oct 08 14:05:56 2012 -0700" }, "message": "Camera2: Set default flash mode to FLASH_OFF\n\nBug: 6970090\nChange-Id: I904b1be2ee0710e82e8e647753a705184c10b46c\n" }, { "commit": "a290191b7b9846ae5648e74bf8df8f496484cea3", "tree": "46509c08c174610e98893ffa5a35e71b3fdf9354", "parents": [ "8aad5495823d489401df8b8b6f4d32aad683f16f", "07cc78fe7dee9a96cd33865de890d0890fe752d7" ], "author": { "name": "Igor Murashkin", "email": "iam@google.com", "time": "Mon Oct 08 13:14:25 2012 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Mon Oct 08 13:14:25 2012 -0700" }, "message": "am 4c9aeb21: Merge \"Camera2: Fix Parameters#setZoom off by 1 validation error\" into jb-mr1-dev\n\n* commit \u00274c9aeb21051e908b0a0a0864a04a96a4109717a1\u0027:\n Camera2: Fix Parameters#setZoom off by 1 validation error\n" }, { "commit": "07cc78fe7dee9a96cd33865de890d0890fe752d7", "tree": "46509c08c174610e98893ffa5a35e71b3fdf9354", "parents": [ "8ada0bf772354a1d31361d3b4f49efd36d8a6e6e", "cfdd84284394cecdb33cf121fe6d4205da84c761" ], "author": { "name": "Igor Murashkin", "email": "iam@google.com", "time": "Mon Oct 08 13:10:48 2012 -0700" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Mon Oct 08 13:10:49 2012 -0700" }, "message": "Merge \"Camera2: Fix Parameters#setZoom off by 1 validation error\" into jb-mr1-dev" }, { "commit": "8aad5495823d489401df8b8b6f4d32aad683f16f", "tree": "8a22116a9416e1f38aa779ce0f6fc0132b8ed1d2", "parents": [ "ceea0c8dd91e889b5e4b7d852ce0330e435c9981", "8ada0bf772354a1d31361d3b4f49efd36d8a6e6e" ], "author": { "name": "Eino-Ville Talvala", "email": "etalvala@google.com", "time": "Mon Oct 08 12:22:05 2012 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Mon Oct 08 12:22:05 2012 -0700" }, "message": "am b8f0090a: Merge \"Camera2: On stopping preview, wait until captures are completed.\" into jb-mr1-dev\n\n* commit \u0027b8f0090af19b95027d2e08667c662d058832f94b\u0027:\n Camera2: On stopping preview, wait until captures are completed.\n" }, { "commit": "8ada0bf772354a1d31361d3b4f49efd36d8a6e6e", "tree": "8a22116a9416e1f38aa779ce0f6fc0132b8ed1d2", "parents": [ "193c13fa1615ad5130b6d75dc05e50468e1c585c", "e049384cdd0f728c45955d65cae754c46aac18cf" ], "author": { "name": "Eino-Ville Talvala", "email": "etalvala@google.com", "time": "Mon Oct 08 12:17:36 2012 -0700" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Mon Oct 08 12:17:37 2012 -0700" }, "message": "Merge \"Camera2: On stopping preview, wait until captures are completed.\" into jb-mr1-dev" }, { "commit": "cfdd84284394cecdb33cf121fe6d4205da84c761", "tree": "38eae54ffb921348fd9ee68cadef1fd1ccf52165", "parents": [ "193c13fa1615ad5130b6d75dc05e50468e1c585c" ], "author": { "name": "Igor Murashkin", "email": "iam@google.com", "time": "Mon Oct 08 11:16:03 2012 -0700" }, "committer": { "name": "Igor Murashkin", "email": "iam@google.com", "time": "Mon Oct 08 11:22:37 2012 -0700" }, "message": "Camera2: Fix Parameters#setZoom off by 1 validation error\n\nBug: 7298683\nChange-Id: If79ac6396379593eb852f041ca7d5a20ad2f9e6d\n" }, { "commit": "ceea0c8dd91e889b5e4b7d852ce0330e435c9981", "tree": "2ad4f1423aef8c1f145e2ff8066237186d3a5cd1", "parents": [ "577e9cbdc02ae2daa84a608ea2d92a55754dfd99", "193c13fa1615ad5130b6d75dc05e50468e1c585c" ], "author": { "name": "Igor Murashkin", "email": "iam@google.com", "time": "Mon Oct 08 10:26:36 2012 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Mon Oct 08 10:26:36 2012 -0700" }, "message": "am e18c1cce: Merge \"Camera2: Report getMaxNumFocusAreas 0 for fixed focus cameras\" into jb-mr1-dev\n\n* commit \u0027e18c1cce29dde2054ce52b9135b152901883ca91\u0027:\n Camera2: Report getMaxNumFocusAreas 0 for fixed focus cameras\n" }, { "commit": "193c13fa1615ad5130b6d75dc05e50468e1c585c", "tree": "2ad4f1423aef8c1f145e2ff8066237186d3a5cd1", "parents": [ "2b5232dd49d006a08c35ba865a6801acdb15483c", "572bf9a00204ac91de8c5347d793891c6a4bf1d7" ], "author": { "name": "Igor Murashkin", "email": "iam@google.com", "time": "Mon Oct 08 10:23:06 2012 -0700" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Mon Oct 08 10:23:07 2012 -0700" }, "message": "Merge \"Camera2: Report getMaxNumFocusAreas 0 for fixed focus cameras\" into jb-mr1-dev" }, { "commit": "577e9cbdc02ae2daa84a608ea2d92a55754dfd99", "tree": "24ad1d26999191a5502627a2b9737c013a39a85d", "parents": [ "196438b3ad32da3607517f7dc1650ff8c017cc81", "2b5232dd49d006a08c35ba865a6801acdb15483c" ], "author": { "name": "ty.lee", "email": "ty.lee@lge.com", "time": "Sun Oct 07 23:40:28 2012 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Sun Oct 07 23:40:28 2012 -0700" }, "message": "am c8823995: audioflinger/resampler: add build source for libaudio-resampler\n\n* commit \u0027c8823995d16b909fae30ff4f94217e875d3e8c8a\u0027:\n audioflinger/resampler: add build source for libaudio-resampler\n" }, { "commit": "e049384cdd0f728c45955d65cae754c46aac18cf", "tree": "f88834b61cb119a10285a5324e772ccf6fca7f58", "parents": [ "2b5232dd49d006a08c35ba865a6801acdb15483c" ], "author": { "name": "Eino-Ville Talvala", "email": "etalvala@google.com", "time": "Fri Oct 05 12:03:10 2012 -0700" }, "committer": { "name": "Eino-Ville Talvala", "email": "etalvala@google.com", "time": "Sun Oct 07 22:06:15 2012 -0700" }, "message": "Camera2: On stopping preview, wait until captures are completed.\n\nIf preview is stopped while a still capture or a video snapshot is\nunderway, wait until the capture completes before stopping preview.\n\nAlso use the same behavior for disconnect - do not shut down the\ncamera device until captures are complete.\n\nThis works around HAL implementations which report to be done\n(get_in_progress_count returns 0) even when a capture is still\noutstanding.\n\nBug: 7276954\n\nChange-Id: I66290acf1740cc330eadecbcded0c59fa9c5d2fd\n" }, { "commit": "f4653ecc41fc7bea42a32406c10bf779089c1fc2", "tree": "24ad1d26999191a5502627a2b9737c013a39a85d", "parents": [ "2b5232dd49d006a08c35ba865a6801acdb15483c", "f82fba4fdd705f2ce040a67a0504c1d114bb3750" ], "author": { "name": "The Android Automerger", "email": "android-build@android.com", "time": "Sun Oct 07 18:57:53 2012 -0700" }, "committer": { "name": "The Android Automerger", "email": "android-build@android.com", "time": "Sun Oct 07 18:57:53 2012 -0700" }, "message": "merge in jb-mr1-release history after reset to jb-mr1-dev\n" }, { "commit": "2b5232dd49d006a08c35ba865a6801acdb15483c", "tree": "24ad1d26999191a5502627a2b9737c013a39a85d", "parents": [ "3d33019b95439ba8cc062633168ec8fe51ef6ad4" ], "author": { "name": "ty.lee", "email": "ty.lee@lge.com", "time": "Mon Oct 01 13:54:14 2012 +0900" }, "committer": { "name": "Iliyan Malchev", "email": "malchev@google.com", "time": "Sun Oct 07 12:05:27 2012 -0700" }, "message": "audioflinger/resampler: add build source for libaudio-resampler\n\nBug: 7229644\nChange-Id: I93bde36be1c3ec84174a4c98423e28f8b3d8782f\nSigned-off-by: ty.lee \u003cty.lee@lge.com\u003e\nSigned-off-by: Iliyan Malchev \u003cmalchev@google.com\u003e\n" }, { "commit": "196438b3ad32da3607517f7dc1650ff8c017cc81", "tree": "a1d40db6aa60ba5adbf280e23f655f0b39d50536", "parents": [ "6c8d48e913812f61125094e4bc71c26e5e833779", "3d33019b95439ba8cc062633168ec8fe51ef6ad4" ], "author": { "name": "Eino-Ville Talvala", "email": "etalvala@google.com", "time": "Sun Oct 07 09:07:13 2012 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Sun Oct 07 09:07:13 2012 -0700" }, "message": "am 4d410ede: Camera2: Fix off-by-one error in ZSL selection.\n\n* commit \u00274d410ede659448557398c84552eb0bf50ef09cbc\u0027:\n Camera2: Fix off-by-one error in ZSL selection.\n" }, { "commit": "f82fba4fdd705f2ce040a67a0504c1d114bb3750", "tree": "a1d40db6aa60ba5adbf280e23f655f0b39d50536", "parents": [ "3d33019b95439ba8cc062633168ec8fe51ef6ad4", "e8c46bc0be6452d4969f6639af036611789c1b07" ], "author": { "name": "The Android Automerger", "email": "android-build@android.com", "time": "Sun Oct 07 06:59:17 2012 -0700" }, "committer": { "name": "The Android Automerger", "email": "android-build@android.com", "time": "Sun Oct 07 06:59:17 2012 -0700" }, "message": "merge in jb-mr1-release history after reset to jb-mr1-dev\n" }, { "commit": "3d33019b95439ba8cc062633168ec8fe51ef6ad4", "tree": "a1d40db6aa60ba5adbf280e23f655f0b39d50536", "parents": [ "3dcdc3d056c8756d690a6fa719d50aae2e4299d4" ], "author": { "name": "Eino-Ville Talvala", "email": "etalvala@google.com", "time": "Sat Oct 06 13:50:31 2012 -0700" }, "committer": { "name": "Eino-Ville Talvala", "email": "etalvala@google.com", "time": "Sat Oct 06 13:50:31 2012 -0700" }, "message": "Camera2: Fix off-by-one error in ZSL selection.\n\nBug: 7258126\nChange-Id: Ie6da4645c46a7bb0dbd11d7c6183e904f41f74fd\n" }, { "commit": "6c8d48e913812f61125094e4bc71c26e5e833779", "tree": "c124bb15eb655f8e4479bd68c4b3d5e4e0dd457e", "parents": [ "b589f3489c195aabab3a9fbf7eccafc1c6db74c3", "3dcdc3d056c8756d690a6fa719d50aae2e4299d4" ], "author": { "name": "Eino-Ville Talvala", "email": "etalvala@google.com", "time": "Fri Oct 05 21:48:30 2012 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Fri Oct 05 21:48:30 2012 -0700" }, "message": "am f6e09d20: Camera2: Unconditionally shut down streams on disconnect.\n\n* commit \u0027f6e09d200c3e043737adcdadd52310ebbd1b19da\u0027:\n Camera2: Unconditionally shut down streams on disconnect.\n" }, { "commit": "572bf9a00204ac91de8c5347d793891c6a4bf1d7", "tree": "0b7c23325fb97da27961cdad3ece9c0b0362688f", "parents": [ "3a6e45320685b36bb266bbf8fa548f4474d90d6c" ], "author": { "name": "Igor Murashkin", "email": "iam@google.com", "time": "Fri Oct 05 17:09:09 2012 -0700" }, "committer": { "name": "Igor Murashkin", "email": "iam@google.com", "time": "Fri Oct 05 17:09:09 2012 -0700" }, "message": "Camera2: Report getMaxNumFocusAreas 0 for fixed focus cameras\n\nBug: 7298805\nChange-Id: I7499b80a9416bf454c8ea80c31ea4fdd3c4ee2d7\n" }, { "commit": "3dcdc3d056c8756d690a6fa719d50aae2e4299d4", "tree": "c124bb15eb655f8e4479bd68c4b3d5e4e0dd457e", "parents": [ "3a6e45320685b36bb266bbf8fa548f4474d90d6c" ], "author": { "name": "Eino-Ville Talvala", "email": "etalvala@google.com", "time": "Thu Oct 04 17:01:25 2012 -0700" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Fri Oct 05 16:14:48 2012 -0700" }, "message": "Camera2: Unconditionally shut down streams on disconnect.\n\nstopPreviewL may do nothing in certain states. Stop streams directly\nto avoid those failures, so that we always maintain the HAL interface\ninvariant that streams referenced by in-flight requests are never\ndeleted.\n\nBug: 7276954\nChange-Id: Ic4cffc43036f4944684d941981a43d6dd1dce7af\n" }, { "commit": "b589f3489c195aabab3a9fbf7eccafc1c6db74c3", "tree": "cb47eafd11367f2b71c12c841ad715b7c4333e37", "parents": [ "4db789cf989719eacf46b13f38cf5fb0524e16f8", "3a6e45320685b36bb266bbf8fa548f4474d90d6c" ], "author": { "name": "Igor Murashkin", "email": "iam@google.com", "time": "Fri Oct 05 13:54:51 2012 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Fri Oct 05 13:54:51 2012 -0700" }, "message": "am 7373cbe8: Camera2: Fix metering regions to take into account the current zoom/crop region\n\n* commit \u00277373cbe85e617345f7002256a4be389fe62af913\u0027:\n Camera2: Fix metering regions to take into account the current zoom/crop region\n" }, { "commit": "3a6e45320685b36bb266bbf8fa548f4474d90d6c", "tree": "cb47eafd11367f2b71c12c841ad715b7c4333e37", "parents": [ "63dc19921f2770f07bf976bb7573a1133d6548f9" ], "author": { "name": "Igor Murashkin", "email": "iam@google.com", "time": "Fri Sep 28 15:30:03 2012 -0700" }, "committer": { "name": "Igor Murashkin", "email": "iam@google.com", "time": "Fri Oct 05 13:32:07 2012 -0700" }, "message": "Camera2: Fix metering regions to take into account the current zoom/crop region\n\nAlso adds a quirk to disable this fix to work around for incompliant HALs\n\nBug: 7246065\nChange-Id: I80bad25e56ba59149270238e5639bb33cae495ae\n" }, { "commit": "e8c46bc0be6452d4969f6639af036611789c1b07", "tree": "4edcc4b9233439a909714e077763c3e5b6866731", "parents": [ "4dca94e4697c42216ec32c11f9f1dabb2f443703" ], "author": { "name": "Igor Murashkin", "email": "iam@google.com", "time": "Fri Oct 05 10:44:57 2012 -0700" }, "committer": { "name": "The Android Automerger", "email": "android-build@android.com", "time": "Fri Oct 05 12:33:07 2012 -0700" }, "message": "Camera2: Don\u0027t promote weak IBinder ptrs to strong ones\n\nThe Binder driver does not support promoting weak pointers into strong\npointers. Occassionally the system would lock up when trying to do this\n(when closing the camera app).\n\nBug: 7289040\nChange-Id: I8bc0b5c48616bf0b7f4eed1878ad4994ee635871\n" }, { "commit": "4db789cf989719eacf46b13f38cf5fb0524e16f8", "tree": "741bd2c00e3eabbe058bcddfa4c6f5ee0d5ddbb5", "parents": [ "2c6f6509e18426290b9476a0d85f673ceeab8c1a", "63dc19921f2770f07bf976bb7573a1133d6548f9" ], "author": { "name": "Igor Murashkin", "email": "iam@google.com", "time": "Fri Oct 05 12:14:12 2012 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Fri Oct 05 12:14:12 2012 -0700" }, "message": "am af3d2887: Camera2: Change policy for calculating previewFpsRange from previewFps\n\n* commit \u0027af3d28870f7890370d6acb21d20cf1ccab4b9e08\u0027:\n Camera2: Change policy for calculating previewFpsRange from previewFps\n" }, { "commit": "63dc19921f2770f07bf976bb7573a1133d6548f9", "tree": "741bd2c00e3eabbe058bcddfa4c6f5ee0d5ddbb5", "parents": [ "0feea710e236ad90eea73110414ea5d3555fcdfd" ], "author": { "name": "Igor Murashkin", "email": "iam@google.com", "time": "Thu Oct 04 14:22:18 2012 -0700" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Fri Oct 05 12:05:07 2012 -0700" }, "message": "Camera2: Change policy for calculating previewFpsRange from previewFps\n\nBug: 7259959\nChange-Id: I759a559d7115201264f88db1f23edc2d6aef6c43\n" }, { "commit": "2c6f6509e18426290b9476a0d85f673ceeab8c1a", "tree": "f1397774f933b76d22e937497c9bdf09b42d515e", "parents": [ "ee5293f8dc1d438873fdefa19d3842e2889f1029", "0feea710e236ad90eea73110414ea5d3555fcdfd" ], "author": { "name": "Igor Murashkin", "email": "iam@google.com", "time": "Fri Oct 05 11:41:07 2012 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Fri Oct 05 11:41:07 2012 -0700" }, "message": "am becb0bc4: Merge \"Camera2: Don\\\u0027t promote weak IBinder ptrs to strong ones\" into jb-mr1-dev\n\n* commit \u0027becb0bc4b620dcd88b559d821e40a9ca7ced5604\u0027:\n Camera2: Don\u0027t promote weak IBinder ptrs to strong ones\n" }, { "commit": "0feea710e236ad90eea73110414ea5d3555fcdfd", "tree": "f1397774f933b76d22e937497c9bdf09b42d515e", "parents": [ "4c843702c7c2d2ca951e25bc54787c68c2071a8b", "507994d0312f89127562a1401f118439f810e751" ], "author": { "name": "Igor Murashkin", "email": "iam@google.com", "time": "Fri Oct 05 11:35:53 2012 -0700" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Fri Oct 05 11:35:54 2012 -0700" }, "message": "Merge \"Camera2: Don\u0027t promote weak IBinder ptrs to strong ones\" into jb-mr1-dev" }, { "commit": "ee5293f8dc1d438873fdefa19d3842e2889f1029", "tree": "1aa06e8b460e2cba635e5da7760101dc64d5338d", "parents": [ "7bdb77b2d886630f606a373fa6e1f1b10b4a6169", "4c843702c7c2d2ca951e25bc54787c68c2071a8b" ], "author": { "name": "Eino-Ville Talvala", "email": "etalvala@google.com", "time": "Fri Oct 05 11:22:13 2012 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Fri Oct 05 11:22:13 2012 -0700" }, "message": "am 95069fef: Camera2: Use the triggerAfWithAuto quirk\n\n* commit \u002795069fefbdf54d87a624c2ac73727fce1c38545e\u0027:\n Camera2: Use the triggerAfWithAuto quirk\n" }, { "commit": "7bdb77b2d886630f606a373fa6e1f1b10b4a6169", "tree": "fdc28a651a64b53e4cc14e3543347a2e64a80f38", "parents": [ "bc77d3a1e0c19c1221c547d7e39311d74591c2d7", "4c9eb718352697cd75269752344c0bcc6b05e708" ], "author": { "name": "Eino-Ville Talvala", "email": "etalvala@google.com", "time": "Fri Oct 05 11:22:12 2012 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Fri Oct 05 11:22:12 2012 -0700" }, "message": "am 4865c526: Camera2: Synchronize mode changes and triggers\n\n* commit \u00274865c526e681366481b0ab242ffa1ead57bb02cc\u0027:\n Camera2: Synchronize mode changes and triggers\n" }, { "commit": "507994d0312f89127562a1401f118439f810e751", "tree": "4edcc4b9233439a909714e077763c3e5b6866731", "parents": [ "1daada32f8eefd8951541ba243969b341deaaba5" ], "author": { "name": "Igor Murashkin", "email": "iam@google.com", "time": "Fri Oct 05 10:44:57 2012 -0700" }, "committer": { "name": "Igor Murashkin", "email": "iam@google.com", "time": "Fri Oct 05 10:44:57 2012 -0700" }, "message": "Camera2: Don\u0027t promote weak IBinder ptrs to strong ones\n\nThe Binder driver does not support promoting weak pointers into strong\npointers. Occassionally the system would lock up when trying to do this\n(when closing the camera app).\n\nBug: 7289040\nChange-Id: I8bc0b5c48616bf0b7f4eed1878ad4994ee635871\n" }, { "commit": "bc77d3a1e0c19c1221c547d7e39311d74591c2d7", "tree": "38aabd506f2c732e9d863c8bebc98b6bab51c6f6", "parents": [ "61ebd5e3e28372e497a5bcf7cc8212007d38e5a6", "4dca94e4697c42216ec32c11f9f1dabb2f443703" ], "author": { "name": "The Android Open Source Project", "email": "initial-contribution@android.com", "time": "Fri Oct 05 08:16:37 2012 -0700" }, "committer": { "name": "The Android Open Source Project", "email": "initial-contribution@android.com", "time": "Fri Oct 05 08:16:37 2012 -0700" }, "message": "Reconcile with jb-mr1-release - do not merge\n\nChange-Id: I9545f52b76d36bfbdf29cd270d0af200cb2d51fe\n" }, { "commit": "4dca94e4697c42216ec32c11f9f1dabb2f443703", "tree": "38aabd506f2c732e9d863c8bebc98b6bab51c6f6", "parents": [ "1daada32f8eefd8951541ba243969b341deaaba5", "ccf954014a7bc057db8bad0e01416c584bee2f67" ], "author": { "name": "The Android Automerger", "email": "android-build@android.com", "time": "Fri Oct 05 06:59:26 2012 -0700" }, "committer": { "name": "The Android Automerger", "email": "android-build@android.com", "time": "Fri Oct 05 06:59:26 2012 -0700" }, "message": "merge in jb-mr1-release history after reset to jb-mr1-dev\n" }, { "commit": "ccf954014a7bc057db8bad0e01416c584bee2f67", "tree": "2981393cca96745a0028c5cb519820333d9885c6", "parents": [ "dee2bcd787fb79091967e7894437f6a412c95023" ], "author": { "name": "Igor Murashkin", "email": "iam@google.com", "time": "Wed Oct 03 16:02:09 2012 -0700" }, "committer": { "name": "The Android Automerger", "email": "android-build@android.com", "time": "Thu Oct 04 18:13:29 2012 -0700" }, "message": "Camera2: Fix deadlock while zooming during record\n\nAcquired SharedParameters before mMutex in StreamingProcessor,\nthis avoids any potential deadlocks since Camera2Client code would\nalways acquire SharedParameters first before invoking StreamingProcessor.\n\nBug: 7275259\nChange-Id: Ia741162c455300378bee049f063590ece5328b95\n" }, { "commit": "61ebd5e3e28372e497a5bcf7cc8212007d38e5a6", "tree": "38aabd506f2c732e9d863c8bebc98b6bab51c6f6", "parents": [ "b75268d478c45820b0076774407c02b30c02824f", "1daada32f8eefd8951541ba243969b341deaaba5" ], "author": { "name": "Eino-Ville Talvala", "email": "etalvala@google.com", "time": "Thu Oct 04 16:34:16 2012 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Thu Oct 04 16:34:16 2012 -0700" }, "message": "am 9942f62d: Merge \"Camera2: Include JPEG settings in ZSL requests.\" into jb-mr1-dev\n\n* commit \u00279942f62d6a5ee0a65da751b681217d3c4243cd89\u0027:\n Camera2: Include JPEG settings in ZSL requests.\n" }, { "commit": "4c843702c7c2d2ca951e25bc54787c68c2071a8b", "tree": "1aa06e8b460e2cba635e5da7760101dc64d5338d", "parents": [ "4c9eb718352697cd75269752344c0bcc6b05e708" ], "author": { "name": "Eino-Ville Talvala", "email": "etalvala@google.com", "time": "Thu Oct 04 00:56:40 2012 -0700" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Thu Oct 04 16:34:11 2012 -0700" }, "message": "Camera2: Use the triggerAfWithAuto quirk\n\nWhen this quirk is set, and a scene mode is enabled, do AF calls with\nAF mode AUTO instead of whatever the scene more override AF mode is.\n\nBug: 7159577\nChange-Id: I3ea6b8386abc0968047fc9bba3a35c5db5bdcfd3\n" }, { "commit": "4c9eb718352697cd75269752344c0bcc6b05e708", "tree": "fdc28a651a64b53e4cc14e3543347a2e64a80f38", "parents": [ "1daada32f8eefd8951541ba243969b341deaaba5" ], "author": { "name": "Eino-Ville Talvala", "email": "etalvala@google.com", "time": "Tue Oct 02 13:30:28 2012 -0700" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Thu Oct 04 16:31:05 2012 -0700" }, "message": "Camera2: Synchronize mode changes and triggers\n\nMake sure that changes to various parameters have reached the HAL\nbefore triggering asynchronous events like autofocus or precapture\nmetering.\n\nBug: 7107220\nChange-Id: I3c50038de1671968eb32004ce538435121934e7e\n" }, { "commit": "1daada32f8eefd8951541ba243969b341deaaba5", "tree": "38aabd506f2c732e9d863c8bebc98b6bab51c6f6", "parents": [ "6ec0f94d606d57db57c8866b0e38ec96f1979413", "db30e68be637ca85da238c1e8e3534ec07919985" ], "author": { "name": "Eino-Ville Talvala", "email": "etalvala@google.com", "time": "Thu Oct 04 16:30:46 2012 -0700" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Thu Oct 04 16:30:47 2012 -0700" }, "message": "Merge \"Camera2: Include JPEG settings in ZSL requests.\" into jb-mr1-dev" }, { "commit": "b75268d478c45820b0076774407c02b30c02824f", "tree": "579dc653bcefc5362dc9fc0ec360e42a08c06736", "parents": [ "3dde1669eaa212c4da725e9d2fe899452d022760", "6ec0f94d606d57db57c8866b0e38ec96f1979413" ], "author": { "name": "Andreas Huber", "email": "andih@google.com", "time": "Thu Oct 04 14:50:45 2012 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Thu Oct 04 14:50:45 2012 -0700" }, "message": "am 1f915a85: Merge \"Optionally emit LPCM audio instead of using AAC in wifi display code\" into jb-mr1-dev\n\n* commit \u00271f915a85fedc14757c91e59a62ea6d612ce548bf\u0027:\n Optionally emit LPCM audio instead of using AAC in wifi display code\n" }, { "commit": "6ec0f94d606d57db57c8866b0e38ec96f1979413", "tree": "579dc653bcefc5362dc9fc0ec360e42a08c06736", "parents": [ "ef7fdc2224eb2e8a2b220ef51b5dc3ce25b807ba", "20a5a98667df7ed83e5d9f37e88b1bbdb876d718" ], "author": { "name": "Andreas Huber", "email": "andih@google.com", "time": "Thu Oct 04 14:45:55 2012 -0700" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Thu Oct 04 14:45:56 2012 -0700" }, "message": "Merge \"Optionally emit LPCM audio instead of using AAC in wifi display code\" into jb-mr1-dev" }, { "commit": "db30e68be637ca85da238c1e8e3534ec07919985", "tree": "3f617891c1325d20ed708aff9fad7aac892c64c7", "parents": [ "5e8e66f369fd2f1918495380ed1886e50818e95e" ], "author": { "name": "Eino-Ville Talvala", "email": "etalvala@google.com", "time": "Thu Oct 04 13:21:08 2012 -0700" }, "committer": { "name": "Eino-Ville Talvala", "email": "etalvala@google.com", "time": "Thu Oct 04 14:06:41 2012 -0700" }, "message": "Camera2: Include JPEG settings in ZSL requests.\n\nBug: 7287743\nChange-Id: I1aba81b228451c3df712ce1f42b7aab79cac575f\n" }, { "commit": "20a5a98667df7ed83e5d9f37e88b1bbdb876d718", "tree": "32c82fb97201e62321f1dbbbd8ca577a7f657c48", "parents": [ "95f24dacbde69295fd21bbf683281b277e097bb1" ], "author": { "name": "Andreas Huber", "email": "andih@google.com", "time": "Thu Oct 04 11:46:29 2012 -0700" }, "committer": { "name": "Andreas Huber", "email": "andih@google.com", "time": "Thu Oct 04 13:31:04 2012 -0700" }, "message": "Optionally emit LPCM audio instead of using AAC in wifi display code\n\nrelated-to-bug: 7248248\n\nMay decrease power usage at the cost of significantly increasing audio bitrate.\n\nUse \"adb shell setprop media.wfd.use-pcm-audio true\"\n\nto turn it on (must be done before connecting).\n\nChange-Id: I7ebeadf3209e01522a2644948287b23d7c383c7e\n" }, { "commit": "3dde1669eaa212c4da725e9d2fe899452d022760", "tree": "b2df11565c73aea22de56096f199f996b56a333e", "parents": [ "557f7dc7c73f187e1ba4b2bee605b8c368cc4a64", "ef7fdc2224eb2e8a2b220ef51b5dc3ce25b807ba" ], "author": { "name": "Glenn Kasten", "email": "gkasten@google.com", "time": "Thu Oct 04 11:20:14 2012 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Thu Oct 04 11:20:14 2012 -0700" }, "message": "am 7ffab293: Merge \"Integrate improved coefficient sinc resampler: VHQ\" into jb-mr1-dev\n\n* commit \u00277ffab2933bfc50ee0b64ea586b663dcb9275d593\u0027:\n Integrate improved coefficient sinc resampler: VHQ\n" }, { "commit": "ef7fdc2224eb2e8a2b220ef51b5dc3ce25b807ba", "tree": "b2df11565c73aea22de56096f199f996b56a333e", "parents": [ "5e8e66f369fd2f1918495380ed1886e50818e95e", "a6d41334d25ffde12484eb28301352560a063ef6" ], "author": { "name": "Glenn Kasten", "email": "gkasten@google.com", "time": "Thu Oct 04 11:16:36 2012 -0700" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Thu Oct 04 11:16:36 2012 -0700" }, "message": "Merge \"Integrate improved coefficient sinc resampler: VHQ\" into jb-mr1-dev" }, { "commit": "557f7dc7c73f187e1ba4b2bee605b8c368cc4a64", "tree": "2981393cca96745a0028c5cb519820333d9885c6", "parents": [ "377d8303be83b2d9977182babc38b7939ecb7e29", "5e8e66f369fd2f1918495380ed1886e50818e95e" ], "author": { "name": "Igor Murashkin", "email": "iam@google.com", "time": "Thu Oct 04 10:00:47 2012 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Thu Oct 04 10:00:47 2012 -0700" }, "message": "am f66cc52c: Merge \"Camera2: Fix deadlock while zooming during record\" into jb-mr1-dev\n\n* commit \u0027f66cc52cc5a075b86b585cf72c4a41f6907b2142\u0027:\n Camera2: Fix deadlock while zooming during record\n" }, { "commit": "5e8e66f369fd2f1918495380ed1886e50818e95e", "tree": "2981393cca96745a0028c5cb519820333d9885c6", "parents": [ "95f24dacbde69295fd21bbf683281b277e097bb1", "05dd06eb54a4e15352405a3a5cedce6a7940b96b" ], "author": { "name": "Igor Murashkin", "email": "iam@google.com", "time": "Thu Oct 04 09:56:44 2012 -0700" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Thu Oct 04 09:56:44 2012 -0700" }, "message": "Merge \"Camera2: Fix deadlock while zooming during record\" into jb-mr1-dev" }, { "commit": "a6d41334d25ffde12484eb28301352560a063ef6", "tree": "4d8df3822f93824ada324d5038ab0b4cd27ce77b", "parents": [ "95f24dacbde69295fd21bbf683281b277e097bb1" ], "author": { "name": "Glenn Kasten", "email": "gkasten@google.com", "time": "Mon Oct 01 14:04:31 2012 -0700" }, "committer": { "name": "Glenn Kasten", "email": "gkasten@google.com", "time": "Thu Oct 04 09:44:04 2012 -0700" }, "message": "Integrate improved coefficient sinc resampler: VHQ\n\nSummary:\nVery high quality is enabled only for 44.1 -\u003e 48 or 48 -\u003e 44.1,\n and uses low quality for all other use cases.\nTrack estimated CPU load and throttles the quality based on load;\n as currently configured it should allow up to 2 instances of very high quality.\nMedium quality and high quality are currently disabled unless explicitly requested.\n\nDetails:\nOnly load .so the first time it is needed.\nCleanup code style: formatting, indentation, whitespace.\nRestore medium quality resampler, but it is not used (see next line).\nFix memory leak for sinc resampler.\nCheck sample rate in resampler constructor.\nAdd logs for debugging.\nRename DEFAULT to DEFAULT_QUALITY for consistency with other quality levels.\nRenumber VERY_HIGH_QUALITY from 255 to 4.\nUse enum src_quality consistently.\nImprove parsing of property af.resampler.quality.\nFix reentrancy bug - allow an instance of high quality and an instance\n of very high quality to both be active concurrently.\n\nBug: 7229644\nChange-Id: I0ce6b913b05038889f50462a38830b61a602a9f7\n" }, { "commit": "377d8303be83b2d9977182babc38b7939ecb7e29", "tree": "65e78f59f21bf8c7e935624237bdc8199474ddea", "parents": [ "4df3123b6b3ef93ddb67ff0dbc8d94f5a4cebfe3", "dee2bcd787fb79091967e7894437f6a412c95023" ], "author": { "name": "The Android Open Source Project", "email": "initial-contribution@android.com", "time": "Thu Oct 04 07:48:05 2012 -0700" }, "committer": { "name": "The Android Open Source Project", "email": "initial-contribution@android.com", "time": "Thu Oct 04 07:48:06 2012 -0700" }, "message": "Reconcile with jb-mr1-release - do not merge\n\nChange-Id: If88cdd28e163c84b5d6e64eb82b1c322d665a382\n" }, { "commit": "dee2bcd787fb79091967e7894437f6a412c95023", "tree": "65e78f59f21bf8c7e935624237bdc8199474ddea", "parents": [ "95f24dacbde69295fd21bbf683281b277e097bb1", "680f06a5cbe6b70772810062b85f89218fef8c96" ], "author": { "name": "The Android Automerger", "email": "android-build@android.com", "time": "Thu Oct 04 06:59:31 2012 -0700" }, "committer": { "name": "The Android Automerger", "email": "android-build@android.com", "time": "Thu Oct 04 06:59:31 2012 -0700" }, "message": "merge in jb-mr1-release history after reset to jb-mr1-dev\n" }, { "commit": "4df3123b6b3ef93ddb67ff0dbc8d94f5a4cebfe3", "tree": "65e78f59f21bf8c7e935624237bdc8199474ddea", "parents": [ "d83c791239fba8780d4593528f50d21cb50eba7e", "95f24dacbde69295fd21bbf683281b277e097bb1" ], "author": { "name": "James Dong", "email": "jdong@google.com", "time": "Wed Oct 03 17:02:28 2012 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Wed Oct 03 17:02:28 2012 -0700" }, "message": "am d69fd4d2: Merge \"Enable hdcp for WiFi display\" into jb-mr1-dev\n\n* commit \u0027d69fd4d2567f9fce02252ce10d7ae3a28fc79e04\u0027:\n Enable hdcp for WiFi display\n" }, { "commit": "95f24dacbde69295fd21bbf683281b277e097bb1", "tree": "65e78f59f21bf8c7e935624237bdc8199474ddea", "parents": [ "b2e7a84664f3dcca774c754092ed8f390295ab15", "b30d9daef40ac803cfaa4d0a94fa8dc84928c738" ], "author": { "name": "James Dong", "email": "jdong@google.com", "time": "Wed Oct 03 16:57:35 2012 -0700" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Wed Oct 03 16:57:35 2012 -0700" }, "message": "Merge \"Enable hdcp for WiFi display\" into jb-mr1-dev" }, { "commit": "05dd06eb54a4e15352405a3a5cedce6a7940b96b", "tree": "0dd9ab6857e0084f875cee411e06b40f956c96a1", "parents": [ "311f69f18c41909e3087e4205548095762a2ecb7" ], "author": { "name": "Igor Murashkin", "email": "iam@google.com", "time": "Wed Oct 03 16:02:09 2012 -0700" }, "committer": { "name": "Igor Murashkin", "email": "iam@google.com", "time": "Wed Oct 03 16:48:48 2012 -0700" }, "message": "Camera2: Fix deadlock while zooming during record\n\nAcquired SharedParameters before mMutex in StreamingProcessor,\nthis avoids any potential deadlocks since Camera2Client code would\nalways acquire SharedParameters first before invoking StreamingProcessor.\n\nBug: 7275259\nChange-Id: Ia741162c455300378bee049f063590ece5328b95\n" }, { "commit": "680f06a5cbe6b70772810062b85f89218fef8c96", "tree": "d3b1cc97f1db3f47f67dc024aacd63582826cf6a", "parents": [ "e310a4c2424d556398450487338c000dec49732e" ], "author": { "name": "Eino-Ville Talvala", "email": "etalvala@google.com", "time": "Wed Oct 03 14:59:29 2012 -0700" }, "committer": { "name": "The Android Automerger", "email": "android-build@android.com", "time": "Wed Oct 03 16:14:39 2012 -0700" }, "message": "Camera2: Properly update FPS range when FPS is set.\n\nOtherwise a getParameters followed by setParameters will trigger an\nincorrect reversion in FPS parameters.\n\nBug: 7279267\nChange-Id: I7426860f05497dbdf4245c34cef1b38f2f5a1832\n" }, { "commit": "e310a4c2424d556398450487338c000dec49732e", "tree": "51f732307d01a6212568baf934715ba7d7a3026a", "parents": [ "f8a780a06269a05702648e7bf0e4f9e4c2949f8c" ], "author": { "name": "Dave Burke", "email": "daveburke@google.com", "time": "Tue Oct 02 18:39:39 2012 -0700" }, "committer": { "name": "The Android Automerger", "email": "android-build@android.com", "time": "Wed Oct 03 16:14:28 2012 -0700" }, "message": "Drop video bitrate to 2.5mbps.\n\nWe have too much corruption/loss at higher bitrates. Reviewed quality\ntrade-off with jdong@. We can increase in the future if we have a\nbetter packet loss concealment solution.\n\nBug: 7241844\nChange-Id: I3b500a9c3a4429e834fb4c5ca04164d4e106fa9e\n" }, { "commit": "f8a780a06269a05702648e7bf0e4f9e4c2949f8c", "tree": "f18e43e490a17d31df3c92116709406a1586ec36", "parents": [ "bd574478a4699ab593eedda681505d41e185778d" ], "author": { "name": "Andreas Huber", "email": "andih@google.com", "time": "Wed Oct 03 10:16:58 2012 -0700" }, "committer": { "name": "The Android Automerger", "email": "android-build@android.com", "time": "Wed Oct 03 16:14:17 2012 -0700" }, "message": "Better power savings with wifi display code.\n\nNo more polling the encoder for work to do, the encoder instead notifies\nif there\u0027s activity.\n\nChange-Id: Ia707211b4f5c5a6e6b70d750233d204a2d6bb778\nrelated-to-bug: 7248248\n" }, { "commit": "bd574478a4699ab593eedda681505d41e185778d", "tree": "e4e269f852653dffc5a92504f87aacc5da122c44", "parents": [ "1af3aeb9d7c17f59586acd6cf6d73004216c4a71" ], "author": { "name": "Andreas Huber", "email": "andih@google.com", "time": "Wed Oct 03 09:01:11 2012 -0700" }, "committer": { "name": "The Android Automerger", "email": "android-build@android.com", "time": "Wed Oct 03 16:14:07 2012 -0700" }, "message": "Increase polling frequency again temporarily to fix A/V issues\n\nFixes a bug in the silence detection and increases the timeout after which\nwe enter \"silent mode\" to 10 secs.\n\nChange-Id: I802b058f054becd5c377186664437f7b3970193f\nrelated-to-bug: 7248248\n" }, { "commit": "d83c791239fba8780d4593528f50d21cb50eba7e", "tree": "690f5a07f4cc4150a541d7f33907a8b41f473aab", "parents": [ "f20b1f3d7a056c590da8e8bf43a18ab589bb8d4b", "b2e7a84664f3dcca774c754092ed8f390295ab15" ], "author": { "name": "Eino-Ville Talvala", "email": "etalvala@google.com", "time": "Wed Oct 03 15:24:19 2012 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Wed Oct 03 15:24:19 2012 -0700" }, "message": "am ce953ce4: Merge \"Camera2: Properly update FPS range when FPS is set.\" into jb-mr1-dev\n\n* commit \u0027ce953ce4d698155c50356df093712df1dea76051\u0027:\n Camera2: Properly update FPS range when FPS is set.\n" }, { "commit": "b2e7a84664f3dcca774c754092ed8f390295ab15", "tree": "690f5a07f4cc4150a541d7f33907a8b41f473aab", "parents": [ "311f69f18c41909e3087e4205548095762a2ecb7", "02b62d3672ebb0761752ba6c841b2cc469c59ed3" ], "author": { "name": "Eino-Ville Talvala", "email": "etalvala@google.com", "time": "Wed Oct 03 15:20:38 2012 -0700" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Wed Oct 03 15:20:38 2012 -0700" }, "message": "Merge \"Camera2: Properly update FPS range when FPS is set.\" into jb-mr1-dev" }, { "commit": "02b62d3672ebb0761752ba6c841b2cc469c59ed3", "tree": "a87f8ed2ba3b62e1ebef2f28b641febfaf933622", "parents": [ "a1e5dccf73c0b734204b0094241e4a6a0752a67e" ], "author": { "name": "Eino-Ville Talvala", "email": "etalvala@google.com", "time": "Wed Oct 03 14:59:29 2012 -0700" }, "committer": { "name": "Eino-Ville Talvala", "email": "etalvala@google.com", "time": "Wed Oct 03 14:59:29 2012 -0700" }, "message": "Camera2: Properly update FPS range when FPS is set.\n\nOtherwise a getParameters followed by setParameters will trigger an\nincorrect reversion in FPS parameters.\n\nBug: 7279267\nChange-Id: I7426860f05497dbdf4245c34cef1b38f2f5a1832\n" } ], "next": "f20b1f3d7a056c590da8e8bf43a18ab589bb8d4b" }