)]}' { "log": [ { "commit": "49a6d9c78aaa07ab83494d628cc6b7a2386a2b55", "tree": "70acc7a3307c66d6ac1b7ee5cc59d88ebfacad34", "parents": [ "9fa7856094a8705be2061e532c36e74d103719b8", "55f730f7c1a0b5f963f47fdd65c43609a143f18c" ], "author": { "name": "Xin Li", "email": "delphij@google.com", "time": "Wed Dec 02 00:41:55 2020 -0800" }, "committer": { "name": "Xin Li", "email": "delphij@google.com", "time": "Wed Dec 02 00:41:55 2020 -0800" }, "message": "Merge rvc-qpr-dev-plus-aosp-without-vendor@6881855\n\nBug: 172690556\nMerged-In: I72658443fde61aa5f10463fcc42772daf4143ed0\nChange-Id: Ifb9605a1f9407357ddc755551e2d1d51c7f09bfc\n" }, { "commit": "f286326c39b576c2a1a81cc12dc3074bcbe53e7c", "tree": "03e3e954944c8418c356b0fa508b77e359de39f8", "parents": [ "44c331ff9fab7598ee7084fe782d5560ebda9cda" ], "author": { "name": "Branden Archer", "email": "brarcher@google.com", "time": "Thu Nov 12 20:08:49 2020 -0800" }, "committer": { "name": "Branden Archer", "email": "brarcher@google.com", "time": "Fri Nov 13 16:49:22 2020 +0000" }, "message": "Add componentid for fuzzers\n\nBug: 170243740\nTest: Builds\nChange-Id: If12bea31f1c876ced1d582174449ab9ceb687b77\n" }, { "commit": "44c331ff9fab7598ee7084fe782d5560ebda9cda", "tree": "bc553f00f1301e257efad4eb365fd591484e3653", "parents": [ "532b560657fc895b0b453e9f8b1f16357245da8c" ], "author": { "name": "Branden Archer", "email": "brarcher@google.com", "time": "Fri Oct 30 13:49:17 2020 -0700" }, "committer": { "name": "Branden Archer", "email": "brarcher@google.com", "time": "Thu Nov 12 13:09:40 2020 -0800" }, "message": "Add fuzzer for DepthPhotoProcessor\n\nThis fuzzer is a distilled version of the DepthProcessorTest\nunit test. The corpus comes from the corpus for libexif in\ntools/security/fuzzing/orphans/libexif/corpus\n\nBug: 170243740\nTest: Builds and runs on emulator\nChange-Id: I5b5113333242052192958d57bec73cbc47eb195c\n" }, { "commit": "532b560657fc895b0b453e9f8b1f16357245da8c", "tree": "476b887b7eb5ef7d544b3525afe5a0d573218977", "parents": [ "ebd91fc559603446173ccce322b51d140884fb5c" ], "author": { "name": "Branden Archer", "email": "brarcher@google.com", "time": "Fri Oct 30 13:50:01 2020 -0700" }, "committer": { "name": "Branden Archer", "email": "brarcher@google.com", "time": "Thu Nov 12 13:09:40 2020 -0800" }, "message": "Add fuzzer for DistortionMapperFuzzer\n\nThis fuzzer is a distilled version of the DistortionMapperTest\nunit test.\n\nBug: 170243740\nTest: Builds and runs on emulator\nChange-Id: I254a3bef5fc6bcf300fdb64833817645fba8e920\n" }, { "commit": "1e9ef4cc360f7aa70d3d9b681c565b7a0c2d970d", "tree": "30dcc4bcb89b6c0186f1efd3832b8bbddcb8e008", "parents": [ "cd2b79a8d7962fa754c0387990c9ff67fa201350" ], "author": { "name": "Jayant Chowdhary", "email": "jchowdhary@google.com", "time": "Fri Aug 14 02:48:34 2020 +0000" }, "committer": { "name": "Jayant Chowdhary", "email": "jchowdhary@google.com", "time": "Thu Sep 24 21:49:27 2020 +0000" }, "message": "Camera: Fix deadlock caused by ordering of mStatusLock and mCameraStatesLock.\n\nThe following lock order exists in addListenerHelper:\nmCameraStatesLock -\u003e mStatusLock. In CameraDeviceClient::disconnect()\nthe previous lock ordering was mStatusLock-\u003emCameraStates lock. Move the\ncollection of logical camera ids out to avoid holding mCameraStatesLock\nand mStatus lock in CameraService::updateStatus.\n\nBug: 162192331\n\nTest: Camera cts\nTest: GCA (basic validity)\n\nChange-Id: Ie5f9f924a77f7073264e9b7fce739c74c98fb57a\nSigned-off-by: Jayant Chowdhary \u003cjchowdhary@google.com\u003e\n(cherry picked from commit 5e2cd30c8942d6ee32c8f1a34997bb106b4ac971)\n" }, { "commit": "acb4d9ca255eb027141f623d221d87fb30c9fc40", "tree": "0ee39a3661a169087cab9c7f0265bd4573f313d1", "parents": [ "499713d39f11b7e01c53b1f16f325451d280e5b9", "5fc17f2fae4fd72e7695bc828200eb3b8202a754" ], "author": { "name": "Jayant Chowdhary", "email": "jchowdhary@google.com", "time": "Wed Sep 09 16:58:34 2020 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Wed Sep 09 16:58:34 2020 +0000" }, "message": "Merge \"Camera: Fix deadlock caused by ordering of mStatusLock and mCameraStatesLock.\" into rvc-qpr-dev am: 5fc17f2fae\n\nOriginal change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/av/+/12393352\n\nChange-Id: I10315aec4a263581eee7734cae2745544cfc2577\n" }, { "commit": "5fc17f2fae4fd72e7695bc828200eb3b8202a754", "tree": "b9aa8c34f45e693af40cc6f655982d144d4b24ca", "parents": [ "e1f1cb5827a6c99d41e05e090b3b382f3598a58e", "5e2cd30c8942d6ee32c8f1a34997bb106b4ac971" ], "author": { "name": "Jayant Chowdhary", "email": "jchowdhary@google.com", "time": "Wed Sep 09 16:22:58 2020 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Wed Sep 09 16:22:58 2020 +0000" }, "message": "Merge \"Camera: Fix deadlock caused by ordering of mStatusLock and mCameraStatesLock.\" into rvc-qpr-dev" }, { "commit": "2e40c302d6117ec6eb65f25832a71488367b4dfb", "tree": "ce2cff004a09076114faabf595b1a116bcb461ff", "parents": [ "054de8d6440fd30238fa9330bcc038cda745b244", "924eccfd6f6d3aaed5db627a0bdcfcaaf9b09a18" ], "author": { "name": "Xin Li", "email": "delphij@google.com", "time": "Fri Aug 28 08:38:54 2020 -0700" }, "committer": { "name": "Xin Li", "email": "delphij@google.com", "time": "Fri Aug 28 21:23:54 2020 -0700" }, "message": "Merge Android R (rvc-dev-plus-aosp-without-vendor@6692709)\n\nBug: 166295507\nMerged-In: Ie94127c1e981cb18671d5137ba0d39355d1353da\nChange-Id: Ib22ad33bda8d561af537499b6d31ab6134eeae02\n" }, { "commit": "6cdb4103d124bf8a6fc301bf4968130d3b49a707", "tree": "a83cde48426283e10c84e3945337b9a541600c2f", "parents": [ "f2095d7ff30d3f2475ec695ae6455a638500046e", "3390336393da860e2fbdcddaf9af1724c6877ec9" ], "author": { "name": "Shuzhen Wang", "email": "shuzhenwang@google.com", "time": "Sat Aug 22 08:16:37 2020 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Sat Aug 22 08:16:37 2020 +0000" }, "message": "Camera: Fix request metadata override for repeating request am: d1d051a002 am: 3390336393\n\nOriginal change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/av/+/12419439\n\nChange-Id: Ice8a9751497405c909d4545df349f5aa9f4cc060\n" }, { "commit": "3e2bdbcf897baca27f3798b25f62873035f41ed1", "tree": "004ec1bb52ce912a47ccfb249d14dc9aa50c16d7", "parents": [ "a34bbf8b6f2f1a7379dec4fdb0c5a0061bb18af2", "d1d051a0029fb998c5ced7dabfde1c963b330784" ], "author": { "name": "Shuzhen Wang", "email": "shuzhenwang@google.com", "time": "Sat Aug 22 08:01:47 2020 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Sat Aug 22 08:01:47 2020 +0000" }, "message": "Camera: Fix request metadata override for repeating request am: d1d051a002\n\nOriginal change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/av/+/12419439\n\nChange-Id: I7cb3e6248213415fada6b388982c3f6c60164bcb\n" }, { "commit": "3390336393da860e2fbdcddaf9af1724c6877ec9", "tree": "3360232b0ee1e866f0317d64ba878f1c5519278b", "parents": [ "402cd4d02103ac2a3b05acded851aaee3e2bc40b", "d1d051a0029fb998c5ced7dabfde1c963b330784" ], "author": { "name": "Shuzhen Wang", "email": "shuzhenwang@google.com", "time": "Sat Aug 22 08:01:21 2020 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Sat Aug 22 08:01:21 2020 +0000" }, "message": "Camera: Fix request metadata override for repeating request am: d1d051a002\n\nOriginal change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/av/+/12419439\n\nChange-Id: I56bd628ee9bf93d700e07f53ae1052e74095c936\n" }, { "commit": "d1d051a0029fb998c5ced7dabfde1c963b330784", "tree": "a3626476114ededd11260982d4723460ca2a3ef0", "parents": [ "44f9ee26f6cd904c96492c58cbef616eeecb6cb0" ], "author": { "name": "Shuzhen Wang", "email": "shuzhenwang@google.com", "time": "Thu Aug 20 15:42:23 2020 -0700" }, "committer": { "name": "Shuzhen Wang", "email": "shuzhenwang@google.com", "time": "Thu Aug 20 16:44:13 2020 -0700" }, "message": "Camera: Fix request metadata override for repeating request\n\n- For repeating request, same metadata structure is used for multiple\nrequests sent to camera HAL. And now that the camera framework overrides\nZOOM_RATIO value, we cannot reliably derive whether the application sets\nZOOM_RATIO or not by repeatedly querying its value.\n\n- For DistortionCorrection, zoomRatio, and rotateAndCrop, avoid\nduplicating capture request update for repeating request.\n\nTest: GoogleCamera zoomed still capture, Camera CTS\nBug: 164960160\nChange-Id: Ib4fdf5056c286a5bd02cd334eb1ca8644598d676\n" }, { "commit": "5e2cd30c8942d6ee32c8f1a34997bb106b4ac971", "tree": "5334062d0036f417433b7b95e65485a76fe848c7", "parents": [ "e52b8fa8fabd74555dd1ebb2e9405460a545a919" ], "author": { "name": "Jayant Chowdhary", "email": "jchowdhary@google.com", "time": "Fri Aug 14 02:48:34 2020 +0000" }, "committer": { "name": "Jayant Chowdhary", "email": "jchowdhary@google.com", "time": "Mon Aug 17 21:18:17 2020 +0000" }, "message": "Camera: Fix deadlock caused by ordering of mStatusLock and mCameraStatesLock.\n\nThe following lock order exists in addListenerHelper:\nmCameraStatesLock -\u003e mStatusLock. In CameraDeviceClient::disconnect()\nthe previous lock ordering was mStatusLock-\u003emCameraStates lock. Move the\ncollection of logical camera ids out to avoid holding mCameraStatesLock\nand mStatus lock in CameraService::updateStatus.\n\nBug: 162192331\n\nTest: Camera cts\nTest: GCA (basic validity)\n\nChange-Id: Ie5f9f924a77f7073264e9b7fce739c74c98fb57a\nSigned-off-by: Jayant Chowdhary \u003cjchowdhary@google.com\u003e\n" }, { "commit": "fe70f2d1d3a94bda55d36609f06a410b1b295092", "tree": "187aff14a6808b8b89e5cb31a84928244c92d78c", "parents": [ "853e7579b42d5b878d8c5d559fc45f223f4b9813" ], "author": { "name": "Yin-Chia Yeh", "email": "yinchiayeh@google.com", "time": "Tue Jul 28 00:17:58 2020 -0700" }, "committer": { "name": "Yin-Chia Yeh", "email": "yinchiayeh@google.com", "time": "Mon Aug 10 17:13:04 2020 +0000" }, "message": "RESTRICT AUTOMERGE: Camera: fix wrong signalStreamFlush call\n\nSometimes the waitUntilIdle call will finish without RequestThread\nsending the signalStreamFlush call down to HAL.\nReset the flag when the wait finishes to avoid a wrong call fired\nlater when the request thread goes to paused.\n\nTest: CTS on Pixel 3, partner testing\nBug: 162062652\nChange-Id: I7c6674860a688f0bc42d4083793514b546cbd65d\n" }, { "commit": "28839d61260a4178937079652dde78fc7fc7b88b", "tree": "234aef6bfa0e5809f2166a5845ec5c9a1575aa1c", "parents": [ "1d0e337ac054ca464b04fe5941d68633492cca0e", "e52b8fa8fabd74555dd1ebb2e9405460a545a919" ], "author": { "name": "Yin-Chia Yeh", "email": "yinchiayeh@google.com", "time": "Sat Aug 08 04:27:29 2020 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Sat Aug 08 04:27:29 2020 +0000" }, "message": "Camera: fix wrong signalStreamFlush call am: e52b8fa8fa\n\nOriginal change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/av/+/12336358\n\nChange-Id: Ifdd9d3282b10f5135c7c4a9fad789dbc7530cac0\n" }, { "commit": "e52b8fa8fabd74555dd1ebb2e9405460a545a919", "tree": "4f1840080170b0d3fda0dde28b5dcf8d7a08aaf7", "parents": [ "e03276439f2933e2d7f2d717f28b2d8469eaeb93" ], "author": { "name": "Yin-Chia Yeh", "email": "yinchiayeh@google.com", "time": "Tue Jul 28 00:17:58 2020 -0700" }, "committer": { "name": "Yin-Chia Yeh", "email": "yinchiayeh@google.com", "time": "Fri Aug 07 15:51:06 2020 -0700" }, "message": "Camera: fix wrong signalStreamFlush call\n\nSometimes the waitUntilIdle call will finish without RequestThread\nsending the signalStreamFlush call down to HAL.\nReset the flag when the wait finishes to avoid a wrong call fired\nlater when the request thread goes to paused.\n\nTest: CTS on Pixel 3, partner testing\nBug: 162062652\nChange-Id: I7c6674860a688f0bc42d4083793514b546cbd65d\n" }, { "commit": "7e157b60c0b66c380c3bc26b0a045faf113b282c", "tree": "b28c9a3bc6d6d6744cd3f2830e8d83bc6cbda669", "parents": [ "f47673163da004b673144916121db0363862782e", "394ad70e9e234d3c5b0cf2c808210c5ed0e463d3" ], "author": { "name": "Shuzhen Wang", "email": "shuzhenwang@google.com", "time": "Tue Jul 28 20:34:18 2020 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Tue Jul 28 20:34:18 2020 +0000" }, "message": "Camera: Fix race between initialize() and statusCallback (take 2) am: 394ad70e9e\n\nOriginal change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/av/+/12222616\n\nChange-Id: Id50fcf46b8935040d40d3bada62af2ffbce1639b\n" }, { "commit": "394ad70e9e234d3c5b0cf2c808210c5ed0e463d3", "tree": "16dcda2db2fbc4b172d8b9a460dc3a2cd74784f8", "parents": [ "c4ba40d49f0862487dea32b3efffbd291802130d" ], "author": { "name": "Shuzhen Wang", "email": "shuzhenwang@google.com", "time": "Thu Jul 23 13:01:54 2020 -0700" }, "committer": { "name": "Shuzhen Wang", "email": "shuzhenwang@google.com", "time": "Mon Jul 27 14:38:37 2020 -0700" }, "message": "Camera: Fix race between initialize() and statusCallback (take 2)\n\nCache the HAL status callback before provider initialization is\ncomplete, and once initialization is complete, send all cached\ncallbacks.\n\nTest: Camera CTS\nBug: 159201665\nChange-Id: Ida86fe908f456832b9cba314d299bab056bc52a2\n" }, { "commit": "f47673163da004b673144916121db0363862782e", "tree": "ef9704ff87da8d360e5a2efa8247367df72a4dc3", "parents": [ "8be6f9bc64d644a143352a780b69715679ebe3a5", "c4ba40d49f0862487dea32b3efffbd291802130d" ], "author": { "name": "TreeHugger Robot", "email": "treehugger-gerrit@google.com", "time": "Thu Jul 23 20:12:53 2020 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Thu Jul 23 20:12:53 2020 +0000" }, "message": "Merge \"Revert \"Camera: Fix race condition between initialize and statusCallback\"\" into rvc-qpr-dev am: c4ba40d49f\n\nOriginal change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/av/+/12215422\n\nChange-Id: I95a0110e144f277b32c1936ac00b9970a75d0863\n" }, { "commit": "c4ba40d49f0862487dea32b3efffbd291802130d", "tree": "9457ff48fab8aec0a084eda36c21127ab13a42bf", "parents": [ "480b74d285c11a0bf08222d2f2dd2d1d6c674f62", "66cddecf70d44068fb61d0a14920ad3cbe8231fb" ], "author": { "name": "TreeHugger Robot", "email": "treehugger-gerrit@google.com", "time": "Thu Jul 23 17:19:32 2020 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Thu Jul 23 17:19:32 2020 +0000" }, "message": "Merge \"Revert \"Camera: Fix race condition between initialize and statusCallback\"\" into rvc-qpr-dev" }, { "commit": "66cddecf70d44068fb61d0a14920ad3cbe8231fb", "tree": "4c39f75ee54b45f4d26fe65facfad438aad0f20d", "parents": [ "4208ea0d5fb7297f9cec44238e388ce536f36334" ], "author": { "name": "Shuzhen Wang", "email": "shuzhenwang@google.com", "time": "Thu Jul 23 00:41:46 2020 +0000" }, "committer": { "name": "Shuzhen Wang", "email": "shuzhenwang@google.com", "time": "Thu Jul 23 00:41:46 2020 +0000" }, "message": "Revert \"Camera: Fix race condition between initialize and statusCallback\"\n\nThis reverts commit 4208ea0d5fb7297f9cec44238e388ce536f36334.\n\nReason for revert: Result in single-thread deadlock\n\nBug: 161765178\nChange-Id: I8fa508be68746cfe2bbfee70463192e0c478bc33\n" }, { "commit": "ea11edb9d89bfce8025516cb0e5919d3a97c4269", "tree": "2d3bc81ba18dbf198d15b263c07f270a94b453b3", "parents": [ "2391aabddb9d6fae1791170c9c4a154d38e8e225", "e9c17a7ed965da0cc4076d17effa6fa22d77bc46" ], "author": { "name": "Shuzhen Wang", "email": "shuzhenwang@google.com", "time": "Fri Jul 17 21:46:33 2020 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Fri Jul 17 21:46:33 2020 +0000" }, "message": "Merge \"Camera: Fix HAL call order for setCallback\" into rvc-qpr-dev am: e9c17a7ed9\n\nOriginal change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/av/+/12175004\n\nChange-Id: Idcd5256db465a8e5ae288f47b2c2e44beb3fb2e5\n" }, { "commit": "2391aabddb9d6fae1791170c9c4a154d38e8e225", "tree": "e8d00410cc7eb4a7a961f474f9a9fd8d559ae853", "parents": [ "2bb61aaf65f798e3237b81e41dcdf1394bfc2e8b", "4208ea0d5fb7297f9cec44238e388ce536f36334" ], "author": { "name": "Shuzhen Wang", "email": "shuzhenwang@google.com", "time": "Fri Jul 17 21:46:24 2020 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Fri Jul 17 21:46:24 2020 +0000" }, "message": "Camera: Fix race condition between initialize and statusCallback am: 4208ea0d5f\n\nOriginal change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/av/+/12178282\n\nChange-Id: I1c1b7e8c93d319de068d9a00328ff53ef9f66a6d\n" }, { "commit": "e9c17a7ed965da0cc4076d17effa6fa22d77bc46", "tree": "b90127d7b7573feeab7a1271dcba32121c3e9b46", "parents": [ "4208ea0d5fb7297f9cec44238e388ce536f36334", "bdf75f9bce4217a0adaf36ec450c3429e700a952" ], "author": { "name": "Shuzhen Wang", "email": "shuzhenwang@google.com", "time": "Fri Jul 17 21:33:58 2020 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Fri Jul 17 21:33:58 2020 +0000" }, "message": "Merge \"Camera: Fix HAL call order for setCallback\" into rvc-qpr-dev" }, { "commit": "bdf75f9bce4217a0adaf36ec450c3429e700a952", "tree": "75d42839cf075965a569c08598999b2021992c85", "parents": [ "e5dd4048d262f49f3231d1a6b7cd7c128210b0b7" ], "author": { "name": "Shuzhen Wang", "email": "shuzhenwang@google.com", "time": "Fri Jul 10 14:13:33 2020 -0700" }, "committer": { "name": "Shuzhen Wang", "email": "shuzhenwang@google.com", "time": "Fri Jul 17 21:28:59 2020 +0000" }, "message": "Camera: Fix HAL call order for setCallback\n\nsetCallback() must be the first call made to the camera HAL per spec.\nRevert the callflow reordering in ProviderInfo::initialize().\n\nIf the physical camera status change is triggered during\nProverInfo::initialize(), the listener-\u003eonDeviceStatusChanged call is\nskipped anyway.\n\nBug: 160984331\nTest: Camera CTS on emulator\nChange-Id: Iaf69bedf03616bef55400a9d7a361f722341478b\n" }, { "commit": "4208ea0d5fb7297f9cec44238e388ce536f36334", "tree": "08a2308465e9be27479694476d1dbda8b1e6eb8d", "parents": [ "e5dd4048d262f49f3231d1a6b7cd7c128210b0b7" ], "author": { "name": "Shuzhen Wang", "email": "shuzhenwang@google.com", "time": "Fri Jul 17 09:48:46 2020 -0700" }, "committer": { "name": "Shuzhen Wang", "email": "shuzhenwang@google.com", "time": "Fri Jul 17 21:26:24 2020 +0000" }, "message": "Camera: Fix race condition between initialize and statusCallback\n\nCamera status callback may be triggered during\nProviderInfo::initialize(). Acquire mLock for the duration of\ninitialize() to avoid the race.\n\nBug: 159201665\nTest: vendor testing, Camera CTS\nChange-Id: I0be55c6b72b63e86ce100dd8d46947d86c8c6c34\n" }, { "commit": "f096eca2412d1655c72d6e047025f791cd436797", "tree": "9f126ab44da73ea11e056744da7421147139c667", "parents": [ "ef2f7cfe4d1d45ada29e6ef844961738715ccee0", "127b0dba8aa56e27160d2a579f58993b995acd62" ], "author": { "name": "TreeHugger Robot", "email": "treehugger-gerrit@google.com", "time": "Wed Jul 15 20:55:50 2020 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Wed Jul 15 20:55:50 2020 +0000" }, "message": "Merge \"Camera: fix stream ID for failed buffer request\" into rvc-qpr-dev am: 127b0dba8a\n\nOriginal change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/av/+/12150186\n\nChange-Id: I011895fbb83506f0049f142c8214073c248d07a5\n" }, { "commit": "457b39409eb86c4a572dd7fe4bec2844eaa3ee7c", "tree": "4e7dd48c458fcdb2e66c7277498b8bc14886bb74", "parents": [ "df0d876e6649f0452b84a19c407c7dec7538ec0c" ], "author": { "name": "Yin-Chia Yeh", "email": "yinchiayeh@google.com", "time": "Tue Jul 14 11:35:48 2020 -0700" }, "committer": { "name": "Yin-Chia Yeh", "email": "yinchiayeh@google.com", "time": "Tue Jul 14 21:52:04 2020 +0000" }, "message": "Camera: fix stream ID for failed buffer request\n\nThe ID was not filled for disconnected streams.\n\nTest: Camera CTS tests on flame\nBug: 160255243\nMerged-In: I70d3c3d8c77b7a4568d893bc19f4b3acecdd2684\nChange-Id: I70d3c3d8c77b7a4568d893bc19f4b3acecdd2684\n" }, { "commit": "ee2d104677edb8b20f9d366c39ff4163c75b7f0f", "tree": "625726bc1e6aa28857f70357980d0089f49c6e3d", "parents": [ "7c44826eaba2e3ff4483b127c6bc091e46d0604c" ], "author": { "name": "Yin-Chia Yeh", "email": "yinchiayeh@google.com", "time": "Mon Jul 13 15:51:17 2020 -0700" }, "committer": { "name": "Yin-Chia Yeh", "email": "yinchiayeh@google.com", "time": "Tue Jul 14 16:33:58 2020 +0000" }, "message": "RESTRICT AUTOMERGE: Camera: fix stream ID for failed buffer request\n\nThe ID was not filled for disconnected streams.\n\nTest: partner testing\nBug: 160255243\nChange-Id: I654907a669b2df7a51a958338ac54483417d56d5\n" }, { "commit": "4f11dba8278f39f7efd49ceb83fe94e95d398992", "tree": "8cd4d338cad8e10dc33e55a77c22ebee128baef1", "parents": [ "d1bd7d50a4b677f005a61cd025fe7757f67b587f", "e044a969c3fdbf73aa6e2efa5d238389ed7e8b6f" ], "author": { "name": "TreeHugger Robot", "email": "treehugger-gerrit@google.com", "time": "Tue Jun 30 18:46:17 2020 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Tue Jun 30 18:46:17 2020 +0000" }, "message": "Merge \"cameraserver: Make trace points in HFR code paths optional.\" into rvc-dev am: 9cc5cecf18 am: 3e88bb8edd am: e044a969c3\n\nOriginal change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/av/+/11982638\n\nChange-Id: Idde03e7e63a774a0bc80387baa850445ddcad42e\n" }, { "commit": "d1bd7d50a4b677f005a61cd025fe7757f67b587f", "tree": "34942c3781addc278f3cb5840a13de25717c0ce6", "parents": [ "2be6596eda830cb54834278518e413974104519d", "e6a45a7d93614f78d5cb54180b6253170cbea8d5" ], "author": { "name": "TreeHugger Robot", "email": "treehugger-gerrit@google.com", "time": "Tue Jun 30 18:45:20 2020 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Tue Jun 30 18:45:20 2020 +0000" }, "message": "Merge \"Camera: Check for failing request ids when syncing with device\" into rvc-dev am: c166ca1e91 am: f53da41cfd am: e6a45a7d93\n\nOriginal change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/av/+/12003730\n\nChange-Id: I37b09195ff447f03c5151df835389cc43f8fd42c\n" }, { "commit": "f520d8edee55e85f7c9d2b7c72ff66fedf699147", "tree": "8cd4d338cad8e10dc33e55a77c22ebee128baef1", "parents": [ "9b1cb18d17885e80f3db20e6fcf8ea603743329c", "3e88bb8edd3681f065826889ca457f413b0d0d1d" ], "author": { "name": "TreeHugger Robot", "email": "treehugger-gerrit@google.com", "time": "Tue Jun 30 18:32:58 2020 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Tue Jun 30 18:32:58 2020 +0000" }, "message": "Merge \"cameraserver: Make trace points in HFR code paths optional.\" into rvc-dev am: 9cc5cecf18 am: 3e88bb8edd\n\nOriginal change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/av/+/11982638\n\nChange-Id: I826525f2e7a4072ff4cbe44b64ef51f41aa6b83e\n" }, { "commit": "81187cf1680d33a3780b92a2a4cbdcaf806698fd", "tree": "34942c3781addc278f3cb5840a13de25717c0ce6", "parents": [ "89398e920191302bdabaec316772dff9e9f4de4d", "f53da41cfd7cd2abdc14ffc3e4109a2cdb0b1847" ], "author": { "name": "TreeHugger Robot", "email": "treehugger-gerrit@google.com", "time": "Tue Jun 30 18:32:29 2020 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Tue Jun 30 18:32:29 2020 +0000" }, "message": "Merge \"Camera: Check for failing request ids when syncing with device\" into rvc-dev am: c166ca1e91 am: f53da41cfd\n\nOriginal change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/av/+/12003730\n\nChange-Id: I0010342e41a2dcb2998b9e39ad1f7d2a14e8d232\n" }, { "commit": "9527b4c9626f226b7b744000c1cd73499322e4c6", "tree": "8cd4d338cad8e10dc33e55a77c22ebee128baef1", "parents": [ "495c48ef34ce401c2aacb428538b5f16ea6725a5", "9cc5cecf1896a03a0b549c210242219c383de3c4" ], "author": { "name": "TreeHugger Robot", "email": "treehugger-gerrit@google.com", "time": "Tue Jun 30 18:20:33 2020 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Tue Jun 30 18:20:33 2020 +0000" }, "message": "Merge \"cameraserver: Make trace points in HFR code paths optional.\" into rvc-dev am: 9cc5cecf18\n\nOriginal change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/av/+/11982638\n\nChange-Id: I1a7fa2c428ea1b9196a8f0797fcfa8427538f71e\n" }, { "commit": "9cc5cecf1896a03a0b549c210242219c383de3c4", "tree": "d6d6ad3e10af51a2ec4919a7cec58b1b81ccd140", "parents": [ "c166ca1e919565fa775a10d0b9f069f36390e657", "d477626b2eed4bb6812b772248caf5ba07cf96b7" ], "author": { "name": "TreeHugger Robot", "email": "treehugger-gerrit@google.com", "time": "Tue Jun 30 18:17:04 2020 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Tue Jun 30 18:17:04 2020 +0000" }, "message": "Merge \"cameraserver: Make trace points in HFR code paths optional.\" into rvc-dev" }, { "commit": "495c48ef34ce401c2aacb428538b5f16ea6725a5", "tree": "34942c3781addc278f3cb5840a13de25717c0ce6", "parents": [ "a5b28542ecd203137ff55106b451771536cef911", "c166ca1e919565fa775a10d0b9f069f36390e657" ], "author": { "name": "TreeHugger Robot", "email": "treehugger-gerrit@google.com", "time": "Tue Jun 30 18:14:14 2020 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Tue Jun 30 18:14:14 2020 +0000" }, "message": "Merge \"Camera: Check for failing request ids when syncing with device\" into rvc-dev am: c166ca1e91\n\nOriginal change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/av/+/12003730\n\nChange-Id: I74aecf34ade2798571991e5a14f31e8e464663a8\n" }, { "commit": "d477626b2eed4bb6812b772248caf5ba07cf96b7", "tree": "e7ba31331c7bb26186fddcc01ebe1754b3729f9b", "parents": [ "54cc1e3c434ab84d623d558db19679f37bb60142" ], "author": { "name": "Jayant Chowdhary", "email": "jchowdhary@google.com", "time": "Tue Jun 23 23:45:57 2020 -0700" }, "committer": { "name": "Jayant Chowdhary", "email": "jchowdhary@google.com", "time": "Mon Jun 29 17:46:36 2020 -0700" }, "message": "cameraserver: Make trace points in HFR code paths optional.\n\nPer processCaptureResult save 4 trace point costs -\u003e approximately 2%of 4ms budget.\nSave 2 trace points per processCaptureRequest call.\n\n[assuming each trace point costs around 10us]\n\nBug: 155910869\n\nTest: Try HFR; record perfetto trace, make sure trace points opted out\n don\u0027t appear\n\nChange-Id: Ifcfec6e0d5a40958cd4f84734b6be094afaa4f17\nSigned-off-by: Jayant Chowdhary \u003cjchowdhary@google.com\u003e\n" }, { "commit": "4746fff673bae80cb618437652d97343ecb3a54b", "tree": "2550104476742bc7953439c3efbb0c87483497bb", "parents": [ "ae87d21ce7b5a6b76a88fdefbe80ba0e3120b16a" ], "author": { "name": "Emilian Peev", "email": "epeev@google.com", "time": "Thu Jun 25 14:37:31 2020 -0700" }, "committer": { "name": "Emilian Peev", "email": "epeev@google.com", "time": "Thu Jun 25 14:37:31 2020 -0700" }, "message": "Camera: Check for failing request ids when syncing with device\n\nCapture requests especially those near the end of a capture session\ncan fail due to various reasons like Hal errors, invalid output\nsurfaces etc. Avoid possible timeouts when waiting for a request id\nto return by checking the respective error notifications.\n\nBug: 159476108\nTest: Legacy API Camera CTS\nChange-Id: I84dedfbee1eeb0ff8cddf67fdb36c5dfafbb70ef\n" }, { "commit": "6e8c1629c00210167d601c4163037039d52e2904", "tree": "de00c2916f191fc42b0ba8a3d01c874f31ffd4e0", "parents": [ "476559527dd6a9e89e85b4bade85819bb8ca9cea", "f27976c2a79abba62f40d6dfbae98f40ba15ad07" ], "author": { "name": "TreeHugger Robot", "email": "treehugger-gerrit@google.com", "time": "Sun Jun 21 23:39:08 2020 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Sun Jun 21 23:39:08 2020 +0000" }, "message": "Merge \"Camera: Adjust documentation and comments for insensitive language.\" into rvc-dev am: 4a29ff5062 am: f27976c2a7\n\nOriginal change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/av/+/11936451\n\nChange-Id: Ie6168865c599394ab810c6b841fadb9b0c95a22a\n" }, { "commit": "d4e465536df45633c7262c2ea16a15e6707f94dd", "tree": "de00c2916f191fc42b0ba8a3d01c874f31ffd4e0", "parents": [ "8d0488ea9be36e46e5964313e82687ddfe248a3c", "4a29ff5062afb1fb93161fe787dd284140b4bef0" ], "author": { "name": "TreeHugger Robot", "email": "treehugger-gerrit@google.com", "time": "Sun Jun 21 23:14:07 2020 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Sun Jun 21 23:14:07 2020 +0000" }, "message": "Merge \"Camera: Adjust documentation and comments for insensitive language.\" into rvc-dev am: 4a29ff5062\n\nOriginal change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/av/+/11936451\n\nChange-Id: Ie4f7a14933c2baa4d99f4362a6756445a31f98f0\n" }, { "commit": "4a29ff5062afb1fb93161fe787dd284140b4bef0", "tree": "988e8198d2fbe530225fd2d900e9b0c2faaf3b7b", "parents": [ "f00b91b986fca9d87b900ed0e34c963bb85519f1", "0bdfa28ffa45b9bc45d78040ebbd96692ebdfdab" ], "author": { "name": "TreeHugger Robot", "email": "treehugger-gerrit@google.com", "time": "Sun Jun 21 22:53:20 2020 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Sun Jun 21 22:53:20 2020 +0000" }, "message": "Merge \"Camera: Adjust documentation and comments for insensitive language.\" into rvc-dev" }, { "commit": "1dc8f62a2fd79cc05abc2ab152e4176b98daa001", "tree": "29e3507389a6a9e3abf293a0b497b25ac1865d65", "parents": [ "03aceec7f21d72dd5b066a7ee78fce000654ef29", "297df756630e70b5136124a6bc5b2fb4f7f7254a" ], "author": { "name": "Treehugger Robot", "email": "treehugger-gerrit@google.com", "time": "Sat Jun 20 01:38:45 2020 +0000" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Sat Jun 20 01:38:45 2020 +0000" }, "message": "Merge \"cameraserver: remove assumption that status change callbacks must be called from cameraserver process.\"" }, { "commit": "297df756630e70b5136124a6bc5b2fb4f7f7254a", "tree": "7176f9712e56fba058567568cad0a61eefe7e0b3", "parents": [ "064a1c38e708f562545d2aaa8c5d86bbb2c1da57" ], "author": { "name": "Jayant Chowdhary", "email": "jchowdhary@google.com", "time": "Fri Jun 19 22:54:44 2020 +0000" }, "committer": { "name": "Jayant Chowdhary", "email": "jchowdhary@google.com", "time": "Fri Jun 19 23:01:11 2020 +0000" }, "message": "cameraserver: remove assumption that status change callbacks must be called from cameraserver process.\n\nSome code in onDeviceStatusChanged, which is probably a remnant from\npre-treble days assumes\nonDeviceStatusChanged callbacks can be made from only the cameraserver\nprocess.\nPost treble, this is not true since the cameraserver could receive a\ncameraDeviceStatusChanged\ncallback from the camera HAL process (which could call\nonDeviceStatusChanged).\n\nBug: 158252149\n\nTest: Camera Application (validity)\n\nMerged-In: Ic76ecf45b0c06dcb69d1b0758b7cd9047a0364ac\nChange-Id: I76587e972940f78b6a84755d343d4cb60f4b474d\n\nSigned-off-by: Jayant Chowdhary \u003cjchowdhary@google.com\u003e\nChange-Id: I29cea1efb44a73058eadaf653bf65addbbba6c4c\nSigned-off-by: Jayant Chowdhary \u003cjchowdhary@google.com\u003e\n" }, { "commit": "ac720e315793c81e5e42dce337ce754e473dc4cc", "tree": "5891cf6b21f357337627ee8f1c274bf553e13966", "parents": [ "180a56f789e5f4e7f50f00d0822ad586c4941244", "0ab3f6cf1612793e1bf750a52f4adc59fc98ed1e" ], "author": { "name": "Jayant Chowdhary", "email": "jchowdhary@google.com", "time": "Fri Jun 19 22:55:11 2020 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Fri Jun 19 22:55:11 2020 +0000" }, "message": "Merge \"cameraserver: remove assumption that status change callbacks must be called from cameraserver process.\" into rvc-dev am: f00b91b986 am: 0ab3f6cf16\n\nOriginal change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/av/+/11816228\n\nChange-Id: I4f409d0e023d01525c30aae1c8aaf94be3f189a3\n" }, { "commit": "89ac84b4a995da4f7ca190d18d54c80ef6ad07fe", "tree": "5891cf6b21f357337627ee8f1c274bf553e13966", "parents": [ "f42a519be4de7ef5f8100569378aa0fa974e2ab4", "f00b91b986fca9d87b900ed0e34c963bb85519f1" ], "author": { "name": "Jayant Chowdhary", "email": "jchowdhary@google.com", "time": "Fri Jun 19 22:43:59 2020 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Fri Jun 19 22:43:59 2020 +0000" }, "message": "Merge \"cameraserver: remove assumption that status change callbacks must be called from cameraserver process.\" into rvc-dev am: f00b91b986\n\nOriginal change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/av/+/11816228\n\nChange-Id: If6c59c6ce61ae77c8428906db4d80dfb18bd3972\n" }, { "commit": "f00b91b986fca9d87b900ed0e34c963bb85519f1", "tree": "64e9642f4b7be8efce891e2361cdc2cd0a693b76", "parents": [ "f3f98cc259b9ab73a1069e0a9bb63b3de8288dab", "3dce9c8d928c57508762ab7e8fef5bdb320cf156" ], "author": { "name": "Jayant Chowdhary", "email": "jchowdhary@google.com", "time": "Fri Jun 19 22:37:32 2020 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Fri Jun 19 22:37:32 2020 +0000" }, "message": "Merge \"cameraserver: remove assumption that status change callbacks must be called from cameraserver process.\" into rvc-dev" }, { "commit": "0bdfa28ffa45b9bc45d78040ebbd96692ebdfdab", "tree": "946d517e494fae27fee45aa97bd91436cd4f50c8", "parents": [ "7a0d96e9223a6a2b68f98b27e86d75a443080189" ], "author": { "name": "Eino-Ville Talvala", "email": "etalvala@google.com", "time": "Fri Jun 19 13:54:35 2020 -0700" }, "committer": { "name": "Eino-Ville Talvala", "email": "etalvala@google.com", "time": "Fri Jun 19 15:26:15 2020 -0700" }, "message": "Camera: Adjust documentation and comments for insensitive language.\n\nTest: Builds\nBug: 159480149\nChange-Id: I598b5638a7166d2b93bf90915e4d845773c4e215\n" }, { "commit": "4f53fa6c51e3c7702e97a40d1a767cf8de552f16", "tree": "7d6379dbfc9beb33c6b27a2e5fad38e674d42dab", "parents": [ "d89c8ce803a1a9ca40a068294a324341c0307d69", "26a6bc660c16e017620ffcfd91149882452177f6" ], "author": { "name": "TreeHugger Robot", "email": "treehugger-gerrit@google.com", "time": "Thu Jun 18 22:35:31 2020 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Thu Jun 18 22:35:31 2020 +0000" }, "message": "Merge \"Camera: Add lastCompletedFrameNumber in CaptureResultExtras (take 2)\" into rvc-dev am: 2e2461eab5 am: 26a6bc660c\n\nOriginal change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/av/+/11835321\n\nChange-Id: Id7c170eeaf4389b4022bc85c2899d0cc5eef6649\n" }, { "commit": "80844b8c6efa510d337590d6f5903acb54d02184", "tree": "7d6379dbfc9beb33c6b27a2e5fad38e674d42dab", "parents": [ "ab6412a6872a746f03c0ba54bdfddd3ee12dbf68", "2e2461eab59b9c93a6eb197aa0e30eedbc98a6e2" ], "author": { "name": "TreeHugger Robot", "email": "treehugger-gerrit@google.com", "time": "Thu Jun 18 22:16:16 2020 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Thu Jun 18 22:16:16 2020 +0000" }, "message": "Merge \"Camera: Add lastCompletedFrameNumber in CaptureResultExtras (take 2)\" into rvc-dev am: 2e2461eab5\n\nOriginal change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/av/+/11835321\n\nChange-Id: Iee359125dbf8b14877faa21b46cb81e58006148e\n" }, { "commit": "2e2461eab59b9c93a6eb197aa0e30eedbc98a6e2", "tree": "6be7e5c9ffe58ed99eeff5a0fcca8284a77e0d76", "parents": [ "453044a3a0b190548ef15b27201444617bfec5d9", "b7b426553c366e19327000605c58fe9d2206206b" ], "author": { "name": "TreeHugger Robot", "email": "treehugger-gerrit@google.com", "time": "Thu Jun 18 22:00:11 2020 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Thu Jun 18 22:00:11 2020 +0000" }, "message": "Merge \"Camera: Add lastCompletedFrameNumber in CaptureResultExtras (take 2)\" into rvc-dev" }, { "commit": "e3299fb67da45e966e0c17d680b3b92f233497a3", "tree": "6215e8855828b8f4569ff0a4e6ac84a660528d6d", "parents": [ "dac1d1dc3fd542c5b1555253a51eb08ea25eaa10", "f3975879f82e83779777e98fe0f8d0a696a93fc3" ], "author": { "name": "TreeHugger Robot", "email": "treehugger-gerrit@google.com", "time": "Thu Jun 18 18:38:20 2020 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Thu Jun 18 18:38:20 2020 +0000" }, "message": "Merge \"Camera: Fix a wrong erase call for app segment buffer\" into rvc-dev am: 453044a3a0 am: f3975879f8\n\nOriginal change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/av/+/11913452\n\nChange-Id: If3e2080b9ce411ffa41478576a03c046f116aa64\n" }, { "commit": "ab6412a6872a746f03c0ba54bdfddd3ee12dbf68", "tree": "6215e8855828b8f4569ff0a4e6ac84a660528d6d", "parents": [ "0afcf70a62c6e4547abf41d861e7764a0300911b", "453044a3a0b190548ef15b27201444617bfec5d9" ], "author": { "name": "TreeHugger Robot", "email": "treehugger-gerrit@google.com", "time": "Thu Jun 18 18:24:29 2020 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Thu Jun 18 18:24:29 2020 +0000" }, "message": "Merge \"Camera: Fix a wrong erase call for app segment buffer\" into rvc-dev am: 453044a3a0\n\nOriginal change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/av/+/11913452\n\nChange-Id: Idec427b7861b397706608e850122537abf297534\n" }, { "commit": "b7b426553c366e19327000605c58fe9d2206206b", "tree": "cd2fbdeb52dcd6e58c5e5370a22bbd97e4266865", "parents": [ "a0a5ad220b5fe5ef6bf880ea41b7476f0fcc703b" ], "author": { "name": "Shuzhen Wang", "email": "shuzhenwang@google.com", "time": "Thu May 07 11:59:02 2020 -0700" }, "committer": { "name": "Shuzhen Wang", "email": "shuzhenwang@google.com", "time": "Thu Jun 18 11:09:48 2020 -0700" }, "message": "Camera: Add lastCompletedFrameNumber in CaptureResultExtras (take 2)\n\nThe new fields in CaptureResultExtras notify the application the last\ncompleted frame numbers. A frame number is completed if:\n- All buffers are returned, and\n- Final capture result is returned, or RESULT_ERROR/REQUEST_ERROR is called,\n\nIgnore the HAL\u0027s notify(ERROR_BUFFER), and depends on the buffers\u0027\nSTATUS_ERROR bit, capture result metadata, and ERROR_RESULT/ERROR_REQUEST\nfor sending ERROR_BUFFER to the application.\n\nThis makes sure client doesn\u0027t ignore BUFFER_ERROR after capture\nresult metadata callback.\n\nPublic API and NDK logic are fixed. VNDK is yet to be done.\n\nTest: Camera CTS\nBug: 155353799\nChange-Id: I54d198080b251239aeb88a8f93456bba6b3630d8\n" }, { "commit": "991b7b672203d79b66ba7fcb672cb885d7947ae1", "tree": "0cc5547b9ee22303c27a285d239648a8ff6b1d11", "parents": [ "752adf7f1a340cbb6599fcff1842cf3659c75612" ], "author": { "name": "Shuzhen Wang", "email": "shuzhenwang@google.com", "time": "Wed Jun 17 11:39:11 2020 -0700" }, "committer": { "name": "Shuzhen Wang", "email": "shuzhenwang@google.com", "time": "Thu Jun 18 16:10:11 2020 +0000" }, "message": "Camera: Fix a wrong erase call for app segment buffer\n\nAlso make sure the pending frame number is also removed in the error\ncase.\n\nTest: vendor testing\nBug: 159197773\nChange-Id: I3f9ba90d0b9335e99283bbafbd635d3eaebf2275\n" }, { "commit": "3dce9c8d928c57508762ab7e8fef5bdb320cf156", "tree": "4f1ae12cfd70f78cb325c27e07e42ce908d10e95", "parents": [ "6d5a5c10a5b9389cd84b5a10d5814e65eeb004aa" ], "author": { "name": "Jayant Chowdhary", "email": "jchowdhary@google.com", "time": "Tue Jun 09 17:22:36 2020 -0700" }, "committer": { "name": "Jayant Chowdhary", "email": "jchowdhary@google.com", "time": "Wed Jun 10 15:06:20 2020 -0700" }, "message": "cameraserver: remove assumption that status change callbacks must be called from cameraserver process.\n\nSome code in disconnectClient, which is probably a remnant from pre-treble days assumes\nonDeviceStatusChanged callbacks can be made from only the cameraserver process.\nPost treble, this is not true since the cameraserver could receive a cameraDeviceStatusChanged\ncallback from the camera HAL process (which could call onDeviceStatusChanged).\n\nBug: 158252149\n\nTest: GCA (sanity)\n\nChange-Id: Ic76ecf45b0c06dcb69d1b0758b7cd9047a0364ac\nSigned-off-by: Jayant Chowdhary \u003cjchowdhary@google.com\u003e\n" }, { "commit": "8f4e32f97e1a2f92845e702f94142d7142fbe714", "tree": "690d49f11fcc3a1033a8fcfc594e162710bf2765", "parents": [ "9643a5aecc36ce2b0966a1a9eae9b56e539bb9c7", "6c8d71e9582c690c7463177570f68188e67d7e90" ], "author": { "name": "TreeHugger Robot", "email": "treehugger-gerrit@google.com", "time": "Wed Jun 10 18:25:49 2020 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Wed Jun 10 18:25:49 2020 +0000" }, "message": "Merge \"Camera: update eviction logic for same owner case\" into rvc-dev am: 6c8d71e958\n\nOriginal change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/av/+/11686192\n\nChange-Id: I41f052ee446387000baaa953f0a94c9e3a75dfaf\n" }, { "commit": "6c8d71e9582c690c7463177570f68188e67d7e90", "tree": "8d72ae64ae1f8d4ff4356613be325c8f0ee14efb", "parents": [ "49509200dca7c4a2137f7a0034b6880fad97804e", "8dfe4648925922aeff80bcdb3ebee6b89e434e1e" ], "author": { "name": "TreeHugger Robot", "email": "treehugger-gerrit@google.com", "time": "Wed Jun 10 18:17:45 2020 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Wed Jun 10 18:17:45 2020 +0000" }, "message": "Merge \"Camera: update eviction logic for same owner case\" into rvc-dev" }, { "commit": "9643a5aecc36ce2b0966a1a9eae9b56e539bb9c7", "tree": "616a9029ecf7cfcb7d4eda9d7d7ad7080210c61d", "parents": [ "256a0befb7d95a031b90d4b7f8a027a227109041", "49509200dca7c4a2137f7a0034b6880fad97804e" ], "author": { "name": "TreeHugger Robot", "email": "treehugger-gerrit@google.com", "time": "Wed Jun 10 16:49:04 2020 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Wed Jun 10 16:49:04 2020 +0000" }, "message": "Merge \"Revert \"Camera: Add lastCompletedFrameNumber in CaptureResultExtras\"\" into rvc-dev am: 49509200dc\n\nOriginal change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/av/+/11818441\n\nChange-Id: I899008319d1943e9832a084c1a0992cb4809b666\n" }, { "commit": "49509200dca7c4a2137f7a0034b6880fad97804e", "tree": "ae7ab858f24839494ba15a47a545a33dcc641aca", "parents": [ "3244d0db9d52223d417df71b6343064adbcad957", "51b882c2a996be51f4fd2108348949e7435dcbbb" ], "author": { "name": "TreeHugger Robot", "email": "treehugger-gerrit@google.com", "time": "Wed Jun 10 16:33:40 2020 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Wed Jun 10 16:33:40 2020 +0000" }, "message": "Merge \"Revert \"Camera: Add lastCompletedFrameNumber in CaptureResultExtras\"\" into rvc-dev" }, { "commit": "51b882c2a996be51f4fd2108348949e7435dcbbb", "tree": "14f2b63319b45ba43108b1b318dceafa419543b8", "parents": [ "730a7916262d23d406296f21aa2ac89a0a47c94c" ], "author": { "name": "Greg Kaiser", "email": "gkaiser@google.com", "time": "Wed Jun 10 05:41:44 2020 +0000" }, "committer": { "name": "Greg Kaiser", "email": "gkaiser@google.com", "time": "Wed Jun 10 05:41:44 2020 +0000" }, "message": "Revert \"Camera: Add lastCompletedFrameNumber in CaptureResultExtras\"\n\nRevert \"Camera: Fix race for onCaptureBufferLost callback\"\n\nRevert submission 11415576-bufferErrorLossFix\n\nReason for revert: Breaks Camera on at least the wembley device\nReverted Changes:\nI12b716acc:Camera: Fix race for onCaptureBufferLost callback\nI43f0f5ea1:Camera: Add lastCompletedFrameNumber in CaptureRes...\n\nBug: 158622719\nChange-Id: I98440c52f61d571e1cb6692667fb067020746795\nTest: Locally tried this revert on rvc-dev on a wembley, and now the Camera works\n" }, { "commit": "8dfe4648925922aeff80bcdb3ebee6b89e434e1e", "tree": "bdecd6a5fbd3caeec784704636e5f7709351c6c5", "parents": [ "6d5a5c10a5b9389cd84b5a10d5814e65eeb004aa" ], "author": { "name": "Yin-Chia Yeh", "email": "yinchiayeh@google.com", "time": "Mon Jun 01 11:57:45 2020 -0700" }, "committer": { "name": "Yin-Chia Yeh", "email": "yinchiayeh@google.com", "time": "Tue Jun 09 13:57:53 2020 -0700" }, "message": "Camera: update eviction logic for same owner case\n\nUpdate the eviction logic when the same owner is trying\nto open a new camera. The new expected behavior:\n 1. If the same camera is opened twice, the second\n open will succeed and the first one would be\n evicted.\n 2. If the owner is trying to open a camera that is\n conflicting with any camera that\u0027s opened by\n the same owner, the open call will fail.\n\nBefore this change, the behavior of #2 above\ncould vary (either old or new camera being evicted) on\ndifferent devices depending on how conflicting device\nis listed by camera HAL, which is not exposed to\napplication developers.\n\nAlso added new unit test to verify the eviction logic.\n\nBug: 153699385\nTest: B1 camera CTS test\nChange-Id: Id935e30f441d172ba774fc99a2714ade974668a8\n" }, { "commit": "7735b0970e7fbcd23abe424803656e13c7c6a095", "tree": "e13295a569f258370db1505ba21151e8aaaa7f67", "parents": [ "d4de218e28e2eaa66f6d98624e5a0b942121e5a9", "79f08b942dfbcb2e9f88763fcbc168d981b787f5" ], "author": { "name": "TreeHugger Robot", "email": "treehugger-gerrit@google.com", "time": "Mon Jun 08 19:41:23 2020 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Mon Jun 08 19:41:23 2020 +0000" }, "message": "Merge \"Camera: Add lastCompletedFrameNumber in CaptureResultExtras\" into rvc-dev am: 79f08b942d\n\nOriginal change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/av/+/11415576\n\nChange-Id: Iff577ba64a4ae518453658da28aaf0039559e681\n" }, { "commit": "79f08b942dfbcb2e9f88763fcbc168d981b787f5", "tree": "979ddcebb95874e0d626c01d39911852f377a1c2", "parents": [ "ea5f4133c7c029ffb988f4aa454c45c86294531c", "730a7916262d23d406296f21aa2ac89a0a47c94c" ], "author": { "name": "TreeHugger Robot", "email": "treehugger-gerrit@google.com", "time": "Mon Jun 08 19:28:31 2020 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Mon Jun 08 19:28:31 2020 +0000" }, "message": "Merge \"Camera: Add lastCompletedFrameNumber in CaptureResultExtras\" into rvc-dev" }, { "commit": "9a32ebf6849a6f5ff7b9299838769f530d038366", "tree": "879ff6333272eb831873d04bee012824ff2293cb", "parents": [ "949a6b6f3ec8ee1a8dd49894328c0243b43164ff", "ccfd5262b788718046a4d90713832199fffe1549" ], "author": { "name": "TreeHugger Robot", "email": "treehugger-gerrit@google.com", "time": "Fri Jun 05 20:04:37 2020 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Fri Jun 05 20:04:37 2020 +0000" }, "message": "Merge \"Camera: Don\u0027t mark request thread as IDLE in configured state\" into rvc-dev am: ccfd5262b7\n\nOriginal change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/av/+/11692381\n\nChange-Id: If10b55c943069cb3da89738eae52f2199c351204\n" }, { "commit": "730a7916262d23d406296f21aa2ac89a0a47c94c", "tree": "63998bad70f9e02896b03b6dab2d79f3301fafb3", "parents": [ "4e48c2477d084919f13ee191a6c36713d83063f3" ], "author": { "name": "Shuzhen Wang", "email": "shuzhenwang@google.com", "time": "Thu May 07 11:59:02 2020 -0700" }, "committer": { "name": "Shuzhen Wang", "email": "shuzhenwang@google.com", "time": "Wed Jun 03 14:32:02 2020 -0700" }, "message": "Camera: Add lastCompletedFrameNumber in CaptureResultExtras\n\nThe new fields in CaptureResultExtras notify the application the last\ncompleted frame numbers. A frame number is completed if:\n- All buffers are returned\n- Final capture result is returned, or CAPTURE_ERROR is called,\n- For buffers that are cancelled, all notifyError() is called.\n\nThis makes sure client doesn\u0027t ignore BUFFER_ERROR after capture\nresult metadata callback.\n\nPublic API and NDK logic are fixed. VNDK is yet to be done.\n\nTest: Camera CTS\nBug: 155353799\nChange-Id: I43f0f5ea18a670dfa00872ebc581567e2df76ad4\n" }, { "commit": "3bead5f9b87a5c5adad2b687f60a172d0475502a", "tree": "c7d29cac2a6febb65537c36eb0f2e5aa72e740fe", "parents": [ "b4a3b65d297a8436ba48138ce7ce2ba6b7a652b8" ], "author": { "name": "Emilian Peev", "email": "epeev@google.com", "time": "Thu May 28 17:29:08 2020 -0700" }, "committer": { "name": "Emilian Peev", "email": "epeev@google.com", "time": "Mon Jun 01 15:39:26 2020 -0700" }, "message": "Camera: Don\u0027t mark request thread as IDLE in configured state\n\nMarking the request thread as IDLE in any state different from\nACTIVE is not necessary. In configured state the device can\nimmediately reconfigure the streams and will not wait\nfor the status tracker notification.\n\nBug: 157451818\nTest: Camera CTS\n\nChange-Id: I22e357ab13d016404cfc939ca595d48fb08cf686\n" }, { "commit": "b0ed325f8a689e1bca09d86095fa3cb9f0cad64b", "tree": "20c2c1a7eba11ab6ebfbccafff2df12929b2b15e", "parents": [ "28ca11af8acbe777d2479ca6fc70c1a88f8bdb19", "eca178fbbf489c06f1dd275658dc8a438328565e" ], "author": { "name": "TreeHugger Robot", "email": "treehugger-gerrit@google.com", "time": "Tue May 19 05:22:08 2020 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Tue May 19 05:22:08 2020 +0000" }, "message": "Merge \"cameraserver: system camera rules should be checked before making onPhysicalCameraStatusChanged callbacks.\" into rvc-dev am: eca178fbbf\n\nChange-Id: I8c2744433eeec11ddea17a6ab7ce1a392feffe58\n" }, { "commit": "eca178fbbf489c06f1dd275658dc8a438328565e", "tree": "17dce5b20fb79abf74ebbe776e94a9003d819a78", "parents": [ "3bd241dcd726b2c4119a0b6bb1246bcdc513a912", "d1478ceafe5acf538e96f5d0e42dda92bbfb118e" ], "author": { "name": "TreeHugger Robot", "email": "treehugger-gerrit@google.com", "time": "Tue May 19 05:07:26 2020 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Tue May 19 05:07:26 2020 +0000" }, "message": "Merge \"cameraserver: system camera rules should be checked before making onPhysicalCameraStatusChanged callbacks.\" into rvc-dev" }, { "commit": "fc2a78ee9796a7ecb8436e7cbe884a1d90314a45", "tree": "b0b243ba43bee3ee2a28414cba8ef035371a0bd8", "parents": [ "9e922c151d2d431066928c2c30935db6c886af73", "22e58223044a6910a1d92f2c6cef3c7b418c4d4f" ], "author": { "name": "TreeHugger Robot", "email": "treehugger-gerrit@google.com", "time": "Wed May 13 05:08:44 2020 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Wed May 13 05:08:44 2020 +0000" }, "message": "Merge \"Camera3: Add flush support to HEIC composite streams\" into rvc-dev am: 22e5822304\n\nChange-Id: Ieec1aa49e88cc6dfe879b8cae257851c926fc34b\n" }, { "commit": "22e58223044a6910a1d92f2c6cef3c7b418c4d4f", "tree": "f29e3133eb02ab9b3e8415d18dfd630e4f81bc11", "parents": [ "3e58083f214629ebc87cd0a0d965e84e673524f0", "e867578b74c62770971f64734d5e0729a870a4b0" ], "author": { "name": "TreeHugger Robot", "email": "treehugger-gerrit@google.com", "time": "Wed May 13 04:55:28 2020 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Wed May 13 04:55:28 2020 +0000" }, "message": "Merge \"Camera3: Add flush support to HEIC composite streams\" into rvc-dev" }, { "commit": "e867578b74c62770971f64734d5e0729a870a4b0", "tree": "90f507899ae0d082eab9ed82f3c04b3f41834b2a", "parents": [ "40fae84d5e67baab376c831df2b1ad33f9b989ce" ], "author": { "name": "Shuzhen Wang", "email": "shuzhenwang@google.com", "time": "Thu Dec 05 09:12:14 2019 -0800" }, "committer": { "name": "Shuzhen Wang", "email": "shuzhenwang@google.com", "time": "Tue May 12 15:02:52 2020 -0700" }, "message": "Camera3: Add flush support to HEIC composite streams\n\n- Handle various corner cases with regard to REQUEST_ERROR, RESULT_ERROR, and BUFFER_ERROR.\n- Drain the codec outputs in case the input buffer isn\u0027t dropped.\n- Allow APP_SEGMENT to drop while still producing valid output image.\n- Add a status tracker to manage active/idle state.\n- Use frame number as key for pending input frames since with ZSL, 2\ncapture result could have the same timestamp.\n- Also removed some deprecated variable/methods.\n\nTest: CTS, vendor testing\nBug: 145579077\nChange-Id: I9c3e929469b8fb75b32b016f9006036c954f663f\n" }, { "commit": "d1478ceafe5acf538e96f5d0e42dda92bbfb118e", "tree": "508c7fd844d177479685a73f328f47c06b721e13", "parents": [ "5120edaad25acb60218d81bde9a1e7b79ac3f143" ], "author": { "name": "Jayant Chowdhary", "email": "jchowdhary@google.com", "time": "Thu May 07 17:35:23 2020 -0700" }, "committer": { "name": "Jayant Chowdhary", "email": "jchowdhary@google.com", "time": "Mon May 11 15:14:21 2020 -0700" }, "message": "cameraserver: system camera rules should be checked before making onPhysicalCameraStatusChanged callbacks.\n\nBug: 152089822\n\nTest: GCA (sanity)\nTest: Camera CTS\n\nChange-Id: I1cdca010819550f9743f8a6d1c209b123cb16ba4\nSigned-off-by: Jayant Chowdhary \u003cjchowdhary@google.com\u003e\n" }, { "commit": "75655bf222817e4c963c78e7c2d288f528fdc563", "tree": "ee75df7c41aa22b2dcbdaa50aba1ba8e80fc39ff", "parents": [ "f6f6dccbb0f9ed2e065b25f9244b18e2b14b37f7", "23d978886f6441313d7125bd994d49767d799a2c" ], "author": { "name": "Treehugger Robot", "email": "treehugger-gerrit@google.com", "time": "Fri May 08 11:49:42 2020 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Fri May 08 11:49:42 2020 +0000" }, "message": "Merge \"Camera: Make originalDataSpace be const upon stream creation\" am: 23d978886f\n\nChange-Id: I5f522733603779431bc80f220ef4a0d6236896cd\n" }, { "commit": "de8ad03bcca4aeab917c1993272c698b472e5056", "tree": "851b3dbf77a19ac758996245ea395eb4f8e69895", "parents": [ "de3d42fb20e795986fa1cea70a86465da152eea4" ], "author": { "name": "Shuzhen Wang", "email": "shuzhenwang@google.com", "time": "Thu Aug 22 12:41:12 2019 -0700" }, "committer": { "name": "Hung-ying Tyan", "email": "tyanh@google.com", "time": "Fri May 08 10:21:57 2020 +0800" }, "message": "Camera: Make originalDataSpace be const upon stream creation\n\nThe previous logic was wrong(!) where DATASPACE_UNKNOWN shouldn\u0027t be\nused as an initializtion condition.\n\nTest: CTS and vendor testing\nBug: 139820060\nBug: 151405656\nChange-Id: I6b59d40ff796d48fe1804b45c189004f1ecc8c18\nMerged-In: I6b59d40ff796d48fe1804b45c189004f1ecc8c18\n(cherry picked from 2f5010dfa412c4998ab4047bfd3e20b595def61b)\n" }, { "commit": "2b5794206ede7558dd467d97a1903db1d6e63e6c", "tree": "7dfe38d745ae67ef5def6273391634fdc6fe29ef", "parents": [ "cfca9375b2e0d3c241540053a70dbc310b9899cc", "cc79094c69bdc85c7c8f52247a00bae1dff68473" ], "author": { "name": "Hui Yu", "email": "huiyu@google.com", "time": "Wed May 06 17:01:19 2020 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Wed May 06 17:01:19 2020 +0000" }, "message": "Merge \"Revert \"Add isUidActiveOrForeground() for camera/audio to use.\"\" into rvc-dev am: cc79094c69\n\nChange-Id: I5d67e226bfe4bbdadd6bbbeb3cd14a47beb26d4f\n" }, { "commit": "cc79094c69bdc85c7c8f52247a00bae1dff68473", "tree": "ae20e4e48fc2ccda1611c3010b378e4dc34b2e63", "parents": [ "b3cedfdf595bbb3538a7a6e36b70de5e62a58fa1", "12c7ec759a2629c2b11861ec89fd8a3bef778d39" ], "author": { "name": "Hui Yu", "email": "huiyu@google.com", "time": "Wed May 06 16:59:34 2020 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Wed May 06 16:59:34 2020 +0000" }, "message": "Merge \"Revert \"Add isUidActiveOrForeground() for camera/audio to use.\"\" into rvc-dev" }, { "commit": "551d83c0af2acbeb1cae0e319607674871e856d1", "tree": "c1d163a97b9981ac0f8fa16281211ba71def768e", "parents": [ "abaa31accc60534ef3edf1f86d26b26cb391dc38", "2b7dc4c1dfe65241e909cd976d8e38abe35f19dc" ], "author": { "name": "Bill Yi", "email": "byi@google.com", "time": "Mon May 04 20:37:44 2020 -0700" }, "committer": { "name": "Bill Yi", "email": "byi@google.com", "time": "Mon May 04 20:37:44 2020 -0700" }, "message": "Merge android10-qpr2-s3-release to aosp/master - DO NOT MERGE\n\nChange-Id: Ia4b1da17b1b8b00d873fe63673a7648cae04722f\n" }, { "commit": "12c7ec759a2629c2b11861ec89fd8a3bef778d39", "tree": "f6761f74625adddd3853d93fd8d5e92a7f388950", "parents": [ "ffffffc42242cf06c433e4e4958d7991a7e2848c" ], "author": { "name": "Hui Yu", "email": "huiyu@google.com", "time": "Mon May 04 17:40:52 2020 +0000" }, "committer": { "name": "Hui Yu", "email": "huiyu@google.com", "time": "Mon May 04 18:06:32 2020 +0000" }, "message": "Revert \"Add isUidActiveOrForeground() for camera/audio to use.\"\n\nRevert \"Add isUidActiveOrForeground() for camera/audio to use.\"\n\nRevert \"Add isUidActiveOrForeground for camera/audio to use.\"\n\nRevert submission 10829580-isUidForeground\n\nReason for revert: In CameraService.cpp, before this change, around \"am.isUidActive\", there was up to 300 ms retry. After this change, the code could move forward fast without retry, but at \"mAppOpsManager-\u003estartOpNoThrow\" call, for the same reason as uid is not updated fast enough, \"mAppOpsManager-\u003estartOpNoThrow\" could also fail.\n\nThis CL does not really fix the root cause, but it changes the timing and now the code fails at \"mAppOpsManager-\u003estartOpNoThrow\" call.\n\nAlso the timing change may also cause recent multiple CTS test failures.\n\n\nBug: 154570809, 155032617, 154849083\n\nReverted Changes:\nIffed63293:Add isUidActiveOrForeground() for camera/audio to ...\nI3685e0c8d:Add isUidActiveOrForeground() for camera/audio to ...\nI51ed1fe78:Add isUidActiveOrForeground for camera/audio to us...\n\nChange-Id: I8acde2524201b6c6d0d5c0ff9cfb2053ffbcb8ef\n" }, { "commit": "f60ce823df3f6b38114df4da88518ceaa8e43c3e", "tree": "357b28d5d494185f79231df449fa33ae794be664", "parents": [ "706aeeeb146f910a53130b3ca218b6b3d8295953", "2fc997ef3107415ba111cbe64d4355059830d85f" ], "author": { "name": "TreeHugger Robot", "email": "treehugger-gerrit@google.com", "time": "Mon May 04 05:44:00 2020 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Mon May 04 05:44:00 2020 +0000" }, "message": "Merge \"Camera: Initialize preCorrectionActiveArraySize\" into rvc-dev am: 2fc997ef31\n\nChange-Id: I23d84cb0401fb315e6326d401e780ca2498fcee6\n" }, { "commit": "2fc997ef3107415ba111cbe64d4355059830d85f", "tree": "24d9b2dbe9f7b9d590ac8cbc8486c7ef1510d1bc", "parents": [ "ef9abae0c7f05913cddb3e87566aa4d64b6f353f", "9bf8a6fcf9800df24961d2a4691fee7cccb242e9" ], "author": { "name": "TreeHugger Robot", "email": "treehugger-gerrit@google.com", "time": "Mon May 04 05:28:39 2020 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Mon May 04 05:28:39 2020 +0000" }, "message": "Merge \"Camera: Initialize preCorrectionActiveArraySize\" into rvc-dev" }, { "commit": "9bf8a6fcf9800df24961d2a4691fee7cccb242e9", "tree": "18213271661c1cdadb629c9d0c6113455fb3692d", "parents": [ "241746e794c0e160a18fcd2ddf989584e81f3dad" ], "author": { "name": "Shuzhen Wang", "email": "shuzhenwang@google.com", "time": "Fri May 01 09:49:04 2020 -0700" }, "committer": { "name": "Shuzhen Wang", "email": "shuzhenwang@google.com", "time": "Sat May 02 22:28:27 2020 -0700" }, "message": "Camera: Initialize preCorrectionActiveArraySize\n\nHandle the case where the HAL doesn\u0027t advertise\npreCorrectionActiveArraySize by initializing it to activeArraySize.\n\nTest: \"dumpsys media.camera\" before and after the change\nBug: 145300768\nChange-Id: I1281686d9b324793a4a99c6a4ddf5d693172507b\n" }, { "commit": "1dfdf2a61e3e03bc3344876a7873fd7c4a9406a0", "tree": "a86bbb1e90a58e729d9f55b42a296e8a6d8733b8", "parents": [ "db661b7ebfc80c1ff088fc4a7879383bb98a9276", "17f951088b42c4f399e1c18b65f1ffebee48fa80" ], "author": { "name": "TreeHugger Robot", "email": "treehugger-gerrit@google.com", "time": "Fri May 01 18:03:08 2020 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Fri May 01 18:03:08 2020 +0000" }, "message": "Merge \"Camera: Fix potentail race condition\" into rvc-dev am: 17f951088b\n\nChange-Id: I88454477a5149b1594e9eeaae39615276b3be342\n" }, { "commit": "17f951088b42c4f399e1c18b65f1ffebee48fa80", "tree": "3455820b06beee3f5b10d0272ad348a11b74e722", "parents": [ "fc8cd670b78d399981f95209e410e155c6bce43d", "7ffbd9898911062cea59c1c6b39875be88b66eb3" ], "author": { "name": "TreeHugger Robot", "email": "treehugger-gerrit@google.com", "time": "Fri May 01 18:00:47 2020 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Fri May 01 18:00:47 2020 +0000" }, "message": "Merge \"Camera: Fix potentail race condition\" into rvc-dev" }, { "commit": "4e9bdf3f0d5c8dcb3750bf5f1a5279d6f4658a00", "tree": "06dc9151878bf3a4aa9b7b9457f39553f7e99530", "parents": [ "038033ead8a64b0a7abdc2126fd30d89fded8474", "f872f885531a3dfaddc0e6f95c01117d151145e5" ], "author": { "name": "TreeHugger Robot", "email": "treehugger-gerrit@google.com", "time": "Thu Apr 30 21:21:49 2020 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Thu Apr 30 21:21:49 2020 +0000" }, "message": "Merge \"Camera: Skip session parameters in case of abandoned streams\" into rvc-dev am: f872f88553\n\nChange-Id: Ibc3bc335b17a24891efdfb86e6295c608b94aa1e\n" }, { "commit": "0d0191e6788af367ca6c3a563c8085ccac458341", "tree": "a7dade403e7c060aa17b2ab3dc3faff226437c52", "parents": [ "55bfd11fd19949f9a657eda09053901a2515060a" ], "author": { "name": "Emilian Peev", "email": "epeev@google.com", "time": "Tue Apr 21 17:01:18 2020 -0700" }, "committer": { "name": "Emilian Peev", "email": "epeev@google.com", "time": "Wed Apr 29 23:46:34 2020 +0000" }, "message": "Camera: Skip session parameters in case of abandoned streams\n\nSession parameter application may require an internal stream\nre-configuration. Sometimes clients can abandon one ore more\nregistered outputs before changing a session parameter value.\nEven if the new capture request doesn\u0027t reference the\nabandoned surfaces the session parameter cannot be properly\nconfigured. Keep the camera service behavior consistent with\nolder versions by skipping the internal stream\nre-configuration.\n\nBug: 113513019\nTest: Camera CTS\nChange-Id: I8fb49b59ae0aecf537484a7238fe7a8a5d3efe64\n" }, { "commit": "b6659276b6cc82e35ead2f2bbc8c6d2c673ad861", "tree": "dcc50fde8d056a23d1984f7f5841ac36c6f0c177", "parents": [ "4f57d42adcff94ca2471135f5173a4c7578ab68c", "26f937a4c27a91f53e08ab6a584b0db81e9e0b66" ], "author": { "name": "TreeHugger Robot", "email": "treehugger-gerrit@google.com", "time": "Wed Apr 29 23:19:53 2020 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Wed Apr 29 23:19:53 2020 +0000" }, "message": "Merge \"Camera: Fix off-by-1 error for scaling crop region\" into rvc-dev am: 26f937a4c2\n\nChange-Id: Ib96de6a190eb21248e0dc6e0d6c85e271e394c43\n" }, { "commit": "9b0d9534c75dc4d40edbf13938aa09c3eec737a1", "tree": "8497e2d67c87e7ba12b86bf7bd07d2cf7a531e1a", "parents": [ "ec77ef69320225579dbee12b5199442fe3e669ca" ], "author": { "name": "Shuzhen Wang", "email": "shuzhenwang@google.com", "time": "Tue Apr 14 17:14:20 2020 -0700" }, "committer": { "name": "Shuzhen Wang", "email": "shuzhenwang@google.com", "time": "Thu Apr 23 12:19:22 2020 -0700" }, "message": "Camera: Fix off-by-1 error for scaling crop region\n\nMake sure the scaling of coordinates based on zoomRatio is symmetric\nrelative to the center of the image. And use the center of the pixel\nfor calculation.\n\nTest: testZoomRatio, testDigitalZoom, cameraservice_test\nTest: vendor testing\nBug: 153959755\nChange-Id: I966bd31bde5afd50462a018590c7a4fefc3eaac6\n" }, { "commit": "cef0c2d43134cc26a1c3d4600abc6437a7dedcd9", "tree": "9e9179ecf00b600bb035be8bd5dcd333501d3f82", "parents": [ "4080e97fad8fc0058b0c6921d2f914737b99d9ae", "ec77ef69320225579dbee12b5199442fe3e669ca" ], "author": { "name": "TreeHugger Robot", "email": "treehugger-gerrit@google.com", "time": "Tue Apr 14 21:27:22 2020 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Tue Apr 14 21:27:22 2020 +0000" }, "message": "Merge \"Camera: Handle the case of calling Uid being cameraserver\" into rvc-dev am: ec77ef6932\n\nChange-Id: I5816f58c6258806744e19b8a70c447109d426df4\n" }, { "commit": "2c656796f416401ae48cd4a2e313dcb9e3aa256b", "tree": "32f9cfe2e8d6fa552d24a5c1c9bbbafb6607a3f5", "parents": [ "7e540682b362a3e8679e274084aeaefdf01314da" ], "author": { "name": "Shuzhen Wang", "email": "shuzhenwang@google.com", "time": "Mon Apr 13 17:36:49 2020 -0700" }, "committer": { "name": "Shuzhen Wang", "email": "shuzhenwang@google.com", "time": "Tue Apr 14 09:39:35 2020 -0700" }, "message": "Camera: Handle the case of calling Uid being cameraserver\n\nWith HAL1-camera2 legacy implementation, the getCameraCharacteristics\nmay be called without camera permission. So the cameraserver\u0027s Uid is\nused in that case.\n\nAppOpsManager returns MODE_IGNORED when the cameraserver\u0027s Uid is passed.\nDo not treat this as an error case.\n\nBug: 153511543\nTest: On Pixel 2 device, run \"adb root; adb shell setprop\npersist.camera.HAL3.enabled 0; adb reboot\", then \"atest\ncts/tests/camera/CaptureRequestTest\"\n\nChange-Id: I29aaa2045b14233537c737bf0738fbc32422540e\n" }, { "commit": "7ffbd9898911062cea59c1c6b39875be88b66eb3", "tree": "39ea58633a125ca880630f02f969afee0acae9e4", "parents": [ "b27ef83f2c8e37d2b9c50b001e03969c451b9131" ], "author": { "name": "Yin-Chia Yeh", "email": "yinchiayeh@google.com", "time": "Mon Apr 13 10:04:23 2020 -0700" }, "committer": { "name": "Yin-Chia Yeh", "email": "yinchiayeh@google.com", "time": "Mon Apr 13 10:05:10 2020 -0700" }, "message": "Camera: Fix potentail race condition\n\nmDistortionMappers are used in callback thread and request thread.\nHowever, callback thread does not query before calling mDistortionMappers[mId.c_str()],\nthis may cause insertion to the map and mDistortionMappers.find may run at the same time.\n\nBug: 153506800, 153457587\nTest: Camera CTS\nChange-Id: I899033bacd355113fbad3e8f7ec76482aa147158\n" }, { "commit": "7f25366432229bda3ca392e7ad1823889f582daf", "tree": "06d8e0aaa625dbcebfda8ae4b6d030c84ad841a2", "parents": [ "0b3d066d3f9b81766f6949988b5c86241539d613", "967bfe95b6e95d4e590bb172826623e8a59664bd" ], "author": { "name": "TreeHugger Robot", "email": "treehugger-gerrit@google.com", "time": "Wed Apr 08 19:22:26 2020 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Wed Apr 08 19:22:26 2020 +0000" }, "message": "Merge \"Camera: Fix possible invalid metadata access\" into rvc-dev am: 967bfe95b6\n\nChange-Id: Ic1e1b38ab5108f2c696c312f3dcfd8634bdbacbd\n" }, { "commit": "2a245e16f70635c0489efc204d8a76b935f4a0df", "tree": "c774fa4f6b9ff064c1c69536d043498c07aef414", "parents": [ "1ad04e663d0f6eb86032b7c4ac7ef7b3dba01de1" ], "author": { "name": "Emilian Peev", "email": "epeev@google.com", "time": "Tue Apr 07 16:54:14 2020 -0700" }, "committer": { "name": "Emilian Peev", "email": "epeev@google.com", "time": "Wed Apr 08 08:34:34 2020 -0700" }, "message": "Camera: Fix possible invalid metadata access\n\nCamera metadata entries can become invalid\nafter updates. Avoid using the possibly\nreleased entry pointer when extending\ncamera characteristics with dynamic depth\ntags.\nAdditionally simplify rotate and crop\nregion checks.\n\nBug: 152240541\nTest: cameraservice_test\nChange-Id: I416739ed7e128f4ec94353ec2938b9bf226be182\n" }, { "commit": "4b69cdcc970983a34f0c90f7597262acfb9ca462", "tree": "bf5de80f4a48ffc2ea8b90961f11b3dcc43dc377", "parents": [ "4e5d845771918df8d1b6816acba6ce8329163170", "0fa486f5148b706062f333e7283a0af4b9374382" ], "author": { "name": "TreeHugger Robot", "email": "treehugger-gerrit@google.com", "time": "Mon Apr 06 20:01:31 2020 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Mon Apr 06 20:01:31 2020 +0000" }, "message": "Merge \"Camera: fix use after free in sensor timestamp\" into rvc-dev am: 0fa486f514\n\nChange-Id: I4c02298be4ce62f6b9b26b380fd49fdb289d88c7\n" }, { "commit": "0fa486f5148b706062f333e7283a0af4b9374382", "tree": "cb929db2d288c553907d09e69abe7b57da3a4fb5", "parents": [ "95ec1b8ea487abbf4ef50d53c227338f559e9599", "c530c5973f425f574fc5e4add205938e5f040ab4" ], "author": { "name": "TreeHugger Robot", "email": "treehugger-gerrit@google.com", "time": "Mon Apr 06 19:42:12 2020 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Mon Apr 06 19:42:12 2020 +0000" }, "message": "Merge \"Camera: fix use after free in sensor timestamp\" into rvc-dev" }, { "commit": "28dcd1c4441915e377209e11e4dbc06db30d531e", "tree": "82e9df1fcd5809cb3e80eb1a18473472bca851a1", "parents": [ "1cfbd0a8a1083af1a7afeb19b2bdc0d757d9daf5" ], "author": { "name": "Yin-Chia Yeh", "email": "yinchiayeh@google.com", "time": "Wed Feb 05 12:41:07 2020 -0800" }, "committer": { "name": "Yin-Chia Yeh", "email": "yinchiayeh@google.com", "time": "Wed Apr 01 10:40:10 2020 -0700" }, "message": "Camera: don\u0027t stop preview on disconnecting device\n\nTest: partner monkey testing\nBug: 147333205\nMerged-In: I0a58c10f5372cd5e5420771a5ec8ae5e6ac93169\nChange-Id: I0a58c10f5372cd5e5420771a5ec8ae5e6ac93169\n" }, { "commit": "26a47a1077f98c90f83f1301933ff28f9cc01511", "tree": "a7f2356fe1cc6ef65b5651778e41db840bbd6d11", "parents": [ "16f443e9c82a7d6da5c5202187562b756287b40e", "ff54b89f5e95ff4da00f7cc1af7e240dd03569f2" ], "author": { "name": "TreeHugger Robot", "email": "treehugger-gerrit@google.com", "time": "Thu Mar 26 18:03:58 2020 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Thu Mar 26 18:03:58 2020 +0000" }, "message": "Merge \"Camera: Make sure JPEG_QUALITY has reasonable default values in default templates\" into rvc-dev am: ff54b89f5e\n\nChange-Id: I0e1b7ac63c2c986661d7d01592dab9fffd446b68\n" }, { "commit": "ff54b89f5e95ff4da00f7cc1af7e240dd03569f2", "tree": "f8ab0c14896e5255f9258edd1a65b5faf15a1637", "parents": [ "d155a1fd9493b0aad727214c78194d61175f2f29", "d25dc976bd8bb77228ff686a5944042ef061d8b7" ], "author": { "name": "TreeHugger Robot", "email": "treehugger-gerrit@google.com", "time": "Thu Mar 26 17:56:34 2020 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Thu Mar 26 17:56:34 2020 +0000" }, "message": "Merge \"Camera: Make sure JPEG_QUALITY has reasonable default values in default templates\" into rvc-dev" }, { "commit": "dd0cca348d8753af8c9e4e5df3c3df29d0506a16", "tree": "0f2ffbf4971db67901d04a7831699b0380aff8db", "parents": [ "89dce44d232904dee72bfa35e73942804b884009", "5a280ea72324ff62472c619c39dd955bd3bcd7d3" ], "author": { "name": "Hui Yu", "email": "huiyu@google.com", "time": "Thu Mar 26 00:04:04 2020 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Thu Mar 26 00:04:04 2020 +0000" }, "message": "Merge \"Add isUidActiveOrForeground() for camera/audio to use.\" into rvc-dev am: 5a280ea723\n\nChange-Id: I837b52cb058b25c53dfb963749b1040b61d7d3c6\n" }, { "commit": "ffffffc42242cf06c433e4e4958d7991a7e2848c", "tree": "d2ef2ad6334135cd2fde6ae172e163623739da0c", "parents": [ "1939a00071ce5dc757566c7af24a1f5589ea22f7" ], "author": { "name": "Hui Yu", "email": "huiyu@google.com", "time": "Tue Mar 24 16:13:59 2020 -0700" }, "committer": { "name": "Hui Yu", "email": "huiyu@google.com", "time": "Tue Mar 24 18:22:49 2020 -0700" }, "message": "Add isUidActiveOrForeground() for camera/audio to use.\n\nWhen start/resume activity, WindowManagerService start/resume the\nactivity, then post a runnable to DiaplayThread and\nActivityManagerService to update UidRecord\u0027s\nproc state, because the thread switch, the latency before proc\nstate update is undetermined.\n\nWhen CameraService calls ActivityManagerService.isUidActive(), the proc\nstate may not have been updated and camera access is denied.\n\nisUidActiveOrForeground() will check isUidActive() first, if false,\ncheck isUidForeground() which is actually to check with WindowManagerService if\nthe uid is foreground, which is equivalent to ActivityManagerService\u0027s uid\nactive, just updated earlier.\n\nBug: 151185692, 151777097, 109950150\nTest: manual test.\nChange-Id: I3685e0c8d2e69ca7ff3c4de4bef4ec754c400015\n" }, { "commit": "d25dc976bd8bb77228ff686a5944042ef061d8b7", "tree": "451783f05bb08ebdc229fb1f92fc970bcfa9065f", "parents": [ "8f612b453b1f2d8d873e615aae281cb047d5a7dc" ], "author": { "name": "Shuzhen Wang", "email": "shuzhenwang@google.com", "time": "Tue Mar 24 17:11:43 2020 -0700" }, "committer": { "name": "Shuzhen Wang", "email": "shuzhenwang@google.com", "time": "Tue Mar 24 17:11:43 2020 -0700" }, "message": "Camera: Make sure JPEG_QUALITY has reasonable default values in default templates\n\nTest: CameraDeviceTest on Pixel 4\nBug: 149337877\nChange-Id: I77b8302ba9011db80acb931b3849087d18b7153e\n" } ], "next": "3bdd6d9987643b7bf67de4e0a11e461415e68177" }