)]}' { "log": [ { "commit": "800c4f39af6cabf29ca77d02dc8c2321d934101a", "tree": "0883915184ba38004484615bacbab05515b03bdc", "parents": [ "ae36a0b59be8af2bd7100a9e3e4433daca7a7a69", "fd2fb97a3f96e62bbcd63e484aa266090a70b6ce" ], "author": { "name": "Treehugger Robot", "email": "treehugger-gerrit@google.com", "time": "Mon Mar 23 21:02:40 2020 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Mon Mar 23 21:02:40 2020 +0000" }, "message": "Merge \"Camera: don\u0027t stop preview on disconnecting device\" am: fd2fb97a3f\n\nChange-Id: I1e8bfbfcf07d4d906624459c4d6b83271d21575e\n" }, { "commit": "fd2fb97a3f96e62bbcd63e484aa266090a70b6ce", "tree": "ac1409b1008f1d6cfa09d53eeca552a47917076a", "parents": [ "0141bbe644288f980b4448c430e73ff8b5ea9a30", "df14304ef839ceb1ac4e54fbc6d9474c625025d9" ], "author": { "name": "Treehugger Robot", "email": "treehugger-gerrit@google.com", "time": "Mon Mar 23 20:44:32 2020 +0000" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Mon Mar 23 20:44:32 2020 +0000" }, "message": "Merge \"Camera: don\u0027t stop preview on disconnecting device\"" }, { "commit": "935a03364789a0b8b6d51f594f2b680ec0cddebc", "tree": "7de87633827dbadb8c1ef773b54c2f191ed7e89a", "parents": [ "3cdf9ab8147f6242d59f4c85f9a0d1b91dac2c6d", "acff0376e4bf1b4f2fadcf7118c5a008fbec1ecf" ], "author": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Mon Mar 16 18:24:59 2020 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Mon Mar 16 18:24:59 2020 +0000" }, "message": "Merge \"Add mInterfaceLock back to Camera3Device methods called by RequestThread.\" am: e4f1dbca67 am: acff0376e4\n\nChange-Id: Iac4ea156bbb257ad28141ecc84ebc8eed0c3b21e\n" }, { "commit": "e4f1dbca673187c0e1a384338845e8b770c8227b", "tree": "a3c622cce97a8eb6720bc4ef5706fb80c298e381", "parents": [ "24507dc4eadf3d533c12f9a8e7def12ed67d90a0", "dfc4659a471639db64a336f75085b23619f5ccbe" ], "author": { "name": "Treehugger Robot", "email": "treehugger-gerrit@google.com", "time": "Mon Mar 16 17:59:47 2020 +0000" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Mon Mar 16 17:59:47 2020 +0000" }, "message": "Merge \"Add mInterfaceLock back to Camera3Device methods called by RequestThread.\"" }, { "commit": "8570165f927b43188059a689cbad1353d19c560d", "tree": "4ce0f5e36613629df2cb597ce3eb483de6d88609", "parents": [ "42489acbf68b71cc832a9d57adffcf6855a63dc8", "33df7bdd30214fededa12b12dfa9f86571cc3f92" ], "author": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Thu Mar 12 01:43:21 2020 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Thu Mar 12 01:43:21 2020 +0000" }, "message": "Merge \"cameraserver: Fix logic to skip callbacks for non HAL3 devices for vendor listeners.\" am: 27c20f484c am: 33df7bdd30\n\nChange-Id: I5e6fce5679bf852d9929d23e7a6bd4ef7711421a\n" }, { "commit": "27c20f484c31ca66b84c43e1cdd09908b0d13c28", "tree": "e326bfab82363f680a4a17ef62cb68aaa21466e5", "parents": [ "ed7c7e6f62442fd2fd4982645d082378a8832e14", "edfb26069d7548ea33ec379f39768de5622ea7f4" ], "author": { "name": "Treehugger Robot", "email": "treehugger-gerrit@google.com", "time": "Thu Mar 12 01:12:52 2020 +0000" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Thu Mar 12 01:12:52 2020 +0000" }, "message": "Merge \"cameraserver: Fix logic to skip callbacks for non HAL3 devices for vendor listeners.\"" }, { "commit": "859bcfc10ff9e1702d1bc7cfad066807b46db497", "tree": "5ab8027dca088203f5da46cfd77d8892ef453d1e", "parents": [ "db51e1f159df4cec37032b436ae6bce746c402c7", "ec29306db53ae51d6a1bc094f3b4ca3f98b9f01a" ], "author": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Wed Mar 11 20:17:31 2020 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Wed Mar 11 20:17:31 2020 +0000" }, "message": "Merge \"Camera: Add onCameraOpened/onCameraClosed callbacks\" into qt-qpr1-dev am: 67110b519a am: ec29306db5\n\nChange-Id: I786534d1aff256842b0e26db3e550754f7ce0b87\n" }, { "commit": "edfb26069d7548ea33ec379f39768de5622ea7f4", "tree": "c47e2e84c4174a4afd262cb08b9c5808b40dae70", "parents": [ "550fef9128badbdd37a7f335d54609f02bc8685a" ], "author": { "name": "Jayant Chowdhary", "email": "jchowdhary@google.com", "time": "Tue Feb 25 13:38:29 2020 -0800" }, "committer": { "name": "Jayant Chowdhary", "email": "jchowdhary@google.com", "time": "Tue Mar 10 15:33:56 2020 -0700" }, "message": "cameraserver: Fix logic to skip callbacks for non HAL3 devices for vendor listeners.\n\nFixes regression caused by aosp/1152176, status update callbacks were being skipped\nfor non HAL3 devices for non vendor listeners. Non vendor listeners\nshould still get callbacks in case of non HAL3 devices.\n\nBug: 150180641\n\nTest: Camera2 App\nTest: CTS\nTest: Use vendor clients of cameraserver\nTest: Vendor testing\n\nMerged-In: Ic31f71887b55f3d838ca35274a5f65802ea50584\nChange-Id: Ifab0be4dac4b42f6923ce48ab57aeb0aaf26575b\nSigned-off-by: Jayant Chowdhary \u003cjchowdhary@google.com\u003e\n" }, { "commit": "1bb30b2efa3cf029daaedf7cfb4cbec7433ee38d", "tree": "90e9b007d4327887126db4907cd3131d9a083a82", "parents": [ "a6544e3bf7de17f104d5fb509d6cb7f6d90dc79f" ], "author": { "name": "Shuzhen Wang", "email": "shuzhenwang@google.com", "time": "Fri Mar 06 09:02:23 2020 -0800" }, "committer": { "name": "Shuzhen Wang", "email": "shuzhenwang@google.com", "time": "Tue Mar 10 11:38:13 2020 -0700" }, "message": "Camera: Add onCameraOpened/onCameraClosed callbacks\n\nThe onCameraOpened/onCameraClosed callbacks are used to notify camera\nservice client with [] permission that a certain camera device has been\nopened/closed.\n\nTest: Manually check callbacks are received in SystemUI app\nBug: 150540299\nChange-Id: If6f3624c43927c30afef7df0a780eafe3ae4c527\nMerged-In: If6f3624c43927c30afef7df0a780eafe3ae4c527\n" }, { "commit": "2bd6a50aca056f2702004acec2bc8627f28d90b3", "tree": "c017ca6fa429d62889d558e6842901c495b43d77", "parents": [ "fafd12efc2347d45d86d334e08f9d5df4239a6c0", "e26f97034667129d5c64ee4372d58b54efab0db7" ], "author": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Wed Mar 04 18:29:29 2020 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Wed Mar 04 18:29:29 2020 +0000" }, "message": "Merge \"Camera: Fix possible ExifUtils heap corruption\" into qt-dev am: f3f966faa6 am: 06b7522331 am: e26f970346\n\nChange-Id: Ifad78a01e48f0a31cb92a956f99ea1157875d3eb\n" }, { "commit": "06b7522331a2ba20ee63aabee21c29ecc7287394", "tree": "120c191031960562ca1a04d067e38c538dd7db03", "parents": [ "29e2bfb97270d6c406e2b66664f5c5dd47a9ebb3", "f3f966faa6f46156726a338208f6c10a97d3fb4b" ], "author": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Wed Mar 04 17:58:27 2020 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Wed Mar 04 17:58:27 2020 +0000" }, "message": "Merge \"Camera: Fix possible ExifUtils heap corruption\" into qt-dev am: f3f966faa6\n\nChange-Id: I1172c6499824d907555a7e4d5996c23b2f5c4b9d\n" }, { "commit": "106e30258163a575fe70e96a4ffbdbdd2668aacd", "tree": "fabe88831fa986010f3cb6cd345059de056bcd66", "parents": [ "3af8d573315ee912dffaf6c159e619e0b7a1bb14", "f5f3a4a0067ee7681fb30981e7fb5e630a88a80a" ], "author": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Thu Feb 27 03:22:55 2020 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Thu Feb 27 03:22:55 2020 +0000" }, "message": "Merge \"Use std::optional for nullable\" am: f5f3a4a006\n\nChange-Id: Ib6a5d008a955d9b0ceff9bdbbd41b4acbe989695\n" }, { "commit": "ee71fdf3dbfc31177dbaffb4ad1c3746ccd203cd", "tree": "678361907de4b2aed77d0010b9b6e400dc553db9", "parents": [ "cb52a18fd16e046702d4cdfdfd6050b9e21bacd9" ], "author": { "name": "Jooyung Han", "email": "jooyung@google.com", "time": "Thu Jan 23 12:27:18 2020 +0900" }, "committer": { "name": "Jooyung Han", "email": "jooyung@google.com", "time": "Thu Feb 27 03:04:57 2020 +0000" }, "message": "Use std::optional for nullable\n\nAIDL now use std::optional to represent nullable types for efficiency\ninstead of std::unique_ptr which might cause additional heap allocation.\n\nBug: 1447732670\nTest: m\nMerged-In: I9045bc6fc2eb06839203af6db94a80de9b83ad1f\nChange-Id: I9045bc6fc2eb06839203af6db94a80de9b83ad1f\n(cherry picked from commit 0c230cf92f4efbacbd8a20ab7b0b7c6c5f5e92b6)\n\nExempt-From-Owner-Approval: CP from master\n" }, { "commit": "dfc4659a471639db64a336f75085b23619f5ccbe", "tree": "b21105e0c445f54bb625052c440e09a53d02eaea", "parents": [ "550fef9128badbdd37a7f335d54609f02bc8685a" ], "author": { "name": "Jayant Chowdhary", "email": "jchowdhary@google.com", "time": "Thu Jan 30 13:09:59 2020 -0800" }, "committer": { "name": "Jayant Chowdhary", "email": "jchowdhary@google.com", "time": "Tue Feb 25 17:25:01 2020 -0800" }, "message": "Add mInterfaceLock back to Camera3Device methods called by RequestThread.\n\nMethods like reconfigureCamera called by the RequestThread internally\ncall methods which might expect to have mInterfaceLock locked\n(eg: configureStreamsLocked).\n\nAlso, function calls which expect to be serialized w.r.t\nreconfigureCamera can cause reported camera status to be inconsistent\nw.r.t the expected status.\n\nFor example the following situation might occur\nthrough CameraTest.java#testVideoSnapshot :\n\nFor certain video sizes that would fail to configure the camera\nstartRecordingL\n camera reconfiguration is triggered -\u003e reconfigureCamera() starts\n waitUntilDrained -\u003e gets interleaved with reconfigureCamera()\n reconfigureCamera() completes\n Here the status of the camera device is active instead of CONFIGURED.\n updateRecording\n createStream() called expects the camera to not be in an ACTIVE\n state since updateProcessorStream cannot handle stream\n configuration failure gracefully when the device is streaming.\n However since waitUntilDrained did not complete after\n reconfigureCamera the camera status is STATUS_ACTIVE.\n\nAs a result, we should hold mInterfaceMutex while\ncalling these methods. To avoid deadlocks (b/143513518), we can have the thread\ncalling disconnect, relinquish mInterfaceMutex right before it starts\nwaiting on RequestThread to exit. It can re-acquire it when\nRequestThread finishes.\n\nBug: 147313521\n\nTest: atest CameraTest.java#testVideoSnapshot on pixel2 passes\nTest: camera CTS\nTest: GCA (sanity)\n\nMerged-In: I384f62bc9936d9691dfe9c13ff743e3d07f2ed55\nChange-Id: I384f62bc9936d9691dfe9c13ff743e3d07f2ed55\nSigned-off-by: Jayant Chowdhary \u003cjchowdhary@google.com\u003e\n(cherry picked from commit 646c31b058e25dd8ee44ff4ec5a5c3005c8c829c)\n" }, { "commit": "649a27ad16faeb7a6bf87a50a33d19d461ece27c", "tree": "b711c590fb7c9148d9e04f3c16a11c185bb34008", "parents": [ "cadf7289e0dacf4a40422f0b36f97891649d398b" ], "author": { "name": "Emilian Peev", "email": "epeev@google.com", "time": "Tue Feb 18 13:38:04 2020 -0800" }, "committer": { "name": "Emilian Peev", "email": "epeev@google.com", "time": "Tue Feb 18 13:38:04 2020 -0800" }, "message": "Camera: Fix possible ExifUtils heap corruption\n\nBoth EXIF_TAG_IMAGE_WIDTH and EXIF_TAG_IMAGE_LENGTH\nexpect short values as per EXIF spec. Call appropriate\nlibexif function to avoid possible heap corruption.\n\nBug: 148223871\nTest: run sts-engbuild-no-spl-lock -m StsHostTestCases --test android.security.sts.Poc20_02#testPocBug_148223871\nChange-Id: I57a774454b52c16d7da9f90d7e3a3407294606a5\n" }, { "commit": "04613e1ac72ddff0d86f09b5dcb8645e0342dda6", "tree": "786766e9af0b74270987b0d32a965e762a742385", "parents": [ "2308ec5ee0e4c15890c29eb70134631beb74d65c", "7d564738165333a2fb1e20147f1979a3ffccefd0" ], "author": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Thu Feb 06 19:22:27 2020 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Thu Feb 06 19:22:27 2020 +0000" }, "message": "Merge \"Use libbinderthreadstateutils.\" am: 7d56473816\n\nChange-Id: I72b0f76a2207f8ec8c0c79dd36b80bbeb32791ea\n" }, { "commit": "df14304ef839ceb1ac4e54fbc6d9474c625025d9", "tree": "d41ca3a3bb6950d4fc46626de72e2e1085e359b1", "parents": [ "381d0e4d68bc904d468611c558b56e4646182dc7" ], "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 Feb 05 12:41:07 2020 -0800" }, "message": "Camera: don\u0027t stop preview on disconnecting device\n\nTest: partner monkey testing\nBug: 147333205\nChange-Id: I0a58c10f5372cd5e5420771a5ec8ae5e6ac93169\n" }, { "commit": "0fcc78cdea615e4dd93d9d310644f927f769ed8d", "tree": "824773feaa6dec366dd87735264d72f1aedb145e", "parents": [ "5b16d6b28d7bd7145cd45a1446c616027d33f3f9" ], "author": { "name": "Steven Moreland", "email": "smoreland@google.com", "time": "Fri Jan 31 15:02:25 2020 -0800" }, "committer": { "name": "Steven Moreland", "email": "smoreland@google.com", "time": "Wed Feb 05 10:14:50 2020 -0800" }, "message": "Use libbinderthreadstateutils.\n\nClients needing to differentiate between system/vendor used to be able\nto use isServingCall. However, this was expensive to implement. This\nalternative approach instead requires users of this API to use\nlibbinderthreadstateutils which does a slighty different operation.\n\nBug: 148692216\nTest: atest VtsHalCameraServiceV2_0TargetTest\nTest: running AImageReaderVendorTest\nTest: try face unlock\nChange-Id: I5615f4e8863487d0de8dad2d0529214750897036\nMerged-In: I5615f4e8863487d0de8dad2d0529214750897036\n" }, { "commit": "9279fa954ac08e851618b660ab426bbf7a3c6477", "tree": "789e1d5526165a4aadfcc55a47114228b04c1405", "parents": [ "e32e81084278221408c1e6f735f929a90787768a", "733c728752ae6958c88b2da4a4c662d266294b70" ], "author": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Thu Jan 30 20:36:30 2020 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Thu Jan 30 20:36:30 2020 +0000" }, "message": "Merge \"CameraService: hold onto SensorPrivacyManager\" am: 733c728752\n\nChange-Id: Ibdf8f29d1ede305d4fc7f7b18ee5f37c25a85162\n" }, { "commit": "3cf67173b15b9ab2df4a9d029e49c4ceaa64be9d", "tree": "3c4dc37f5d68ca02c6c5360bedfb1a077c7631f3", "parents": [ "b7765027eca85ef49f842a60db9ebda1bfe7d53c" ], "author": { "name": "Steven Moreland", "email": "smoreland@google.com", "time": "Wed Jan 29 11:44:22 2020 -0800" }, "committer": { "name": "Steven Moreland", "email": "smoreland@google.com", "time": "Wed Jan 29 11:44:22 2020 -0800" }, "message": "CameraService: hold onto SensorPrivacyManager\n\nunlinkToDeath is no longer required, (this change in behavior is to\navoid leaks) so holding onto the service here (still calling\nunlinkToDeath to avoid a log, but may for instance remove all\nunlinkToDeath calls in the future).\n\nBug: 145692765\nTest: boot, see linkToDeath maintained\nChange-Id: Ib74ab470580643ff61fc684fdd4e16d5e38389af\n" }, { "commit": "bd2e388b26faff9d686bf56e476009843b4615df", "tree": "9fd4f720217961241ed5cadc43d38f01e156c493", "parents": [ "cb257970c1921db3cbfd15823ef0a561257b4690", "12638d3b84c5cad75135de224169a5b1e3caaf6b" ], "author": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Fri Dec 27 21:19:19 2019 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Fri Dec 27 21:19:19 2019 +0000" }, "message": "Merge \"Functions called by RequestThread::threadLoop must not hold mInterfaceMutex.\" am: 2638df9bf8 am: 12638d3b84\n\nChange-Id: I0993e9e07e212773a92aade3148d1462aab4bfe1\n" }, { "commit": "2638df9bf8fbe3e82c1908b47df206746080fb70", "tree": "95ec34c8139dec38eb7e10104bd376117dfefcc8", "parents": [ "801a252a4203c54ad7165f522f4b36dd1f14fc92", "37eca2499bfb3cda510f0a2e2a4e9d629b405a36" ], "author": { "name": "Jayant Chowdhary", "email": "jchowdhary@google.com", "time": "Fri Dec 27 20:28:48 2019 +0000" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Fri Dec 27 20:28:48 2019 +0000" }, "message": "Merge \"Functions called by RequestThread::threadLoop must not hold mInterfaceMutex.\"" }, { "commit": "1d8e707a3c713429d1e21349b2c9dacac07b8591", "tree": "f8735d228d541c4832d101c602328f5ebe4eef71", "parents": [ "f1ecd8fc035ea16977e65c2ca6e9a1663c80a3d1", "053fe0f226924f287741de7c45e1bb9a9bff8812" ], "author": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Thu Dec 12 04:43:18 2019 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Thu Dec 12 04:43:18 2019 +0000" }, "message": "Merge \"Camera: Handle onBuffersDiscarded callback\" into qt-qpr1-dev am: 6a971a6aec am: 053fe0f226\n\nChange-Id: I4e8808204579c8baf79438cc8c323b2c65b84257\n" }, { "commit": "37eca2499bfb3cda510f0a2e2a4e9d629b405a36", "tree": "fe7f6d9647772349d4c87203b1db141e78c64474", "parents": [ "3066e206366b25b6b64cf0ad29188bd04b56b183" ], "author": { "name": "Jayant Chowdhary", "email": "jchowdhary@google.com", "time": "Mon Nov 18 08:55:56 2019 -0800" }, "committer": { "name": "Jayant Chowdhary", "email": "jchowdhary@google.com", "time": "Wed Dec 11 14:10:36 2019 -0800" }, "message": "Functions called by RequestThread::threadLoop must not hold mInterfaceMutex.\n\nFunctions called by RequestThread::threadLoop must not hold\nmInterfaceMutex since the following deadlock scenario may occur:\n\nT1: disconnect() -\u003e holds mInterfaceMutex and waits for RequestThread to\n exit\n T2: RequestThread::threadLoop()-\u003ereconfigureCamera (or any other function) that waits on\n mInterfaceMutex\n\nleading to a deadlock\n\nBug: 143513518\n\nTest: GCA\nTest: CTS\n\nChange-Id: I4bd856e5263934a54cd7087a01d35cfe10936196\nSigned-off-by: Jayant Chowdhary \u003cjchowdhary@google.com\u003e\n" }, { "commit": "d65084c86d0760afce46cd889b58b3d982088017", "tree": "d0bcc9d9ad39d899fa60e929e3fc9a7e994369d2", "parents": [ "960bbfab7bd5f2fff6afdecb920f21b8eb3fee45" ], "author": { "name": "Shuzhen Wang", "email": "shuzhenwang@google.com", "time": "Thu Aug 15 09:11:56 2019 -0700" }, "committer": { "name": "Shuzhen Wang", "email": "shuzhenwang@google.com", "time": "Mon Dec 09 22:21:11 2019 +0000" }, "message": "Camera: Handle onBuffersDiscarded callback\n\nUse onBuffersDiscarded callback from buffer queue to invalidate the\nbuffer caches in cameraserver process.\n\nTest: Run testDiscardFreeBuffers, and use trace to profile memory\nBug: 136677409\nBug: 145617243\nChange-Id: Ifac5e852e2a1ac50f5c3f2e047966c59eeb5f1ba\nMerged-In: Ifac5e852e2a1ac50f5c3f2e047966c59eeb5f1ba\n(cherry picked from commit 0160ddd149893fd14c563ac9a124e49443b69fe4)\n" }, { "commit": "b7be229b0748034b6711fd855339af762e9097de", "tree": "f792ad2b8c278688acb339c8f13fb58461c6ba50", "parents": [ "decaebce1d97f871f80847999063c6ea56cf6b81", "6ffc16c3531ed5a8dd9e5e1647537bd093156d96" ], "author": { "name": "Jayant Chowdhary", "email": "jchowdhary@google.com", "time": "Thu Dec 05 11:03:49 2019 -0800" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Thu Dec 05 11:03:49 2019 -0800" }, "message": "Merge \"cameraserver: filter out non-HAL3 devices from HIDL addListener.\" am: 58205951c3\nam: 6ffc16c353\n\nChange-Id: Icc89c3b8f7af5ca7899f1bbc1cddf65d87ecdda3\n" }, { "commit": "58205951c319c089b1d320f81028262b9a470400", "tree": "2748ca345f579eac2ed61e77a61bdde0634a4a6c", "parents": [ "0287266a3e2543268938e1b91129fb934b92b356", "8fe02b24e4cdf93cb1c004b7d77c01671bd44916" ], "author": { "name": "Treehugger Robot", "email": "treehugger-gerrit@google.com", "time": "Thu Dec 05 18:34:29 2019 +0000" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Thu Dec 05 18:34:29 2019 +0000" }, "message": "Merge \"cameraserver: filter out non-HAL3 devices from HIDL addListener.\"" }, { "commit": "1960c88baffd5371b69bbe5268702dd02b8a24a3", "tree": "419f3e1fefaf996d23e7184a8eb9f5a13cbef079", "parents": [ "f2bb7b0ccc86a06deae882ac3974e2004eb98a27", "a4f8c20bf985d4a6d3a108d6813fe01d5b41cd55" ], "author": { "name": "Emilian Peev", "email": "epeev@google.com", "time": "Wed Nov 20 08:23:56 2019 -0800" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Wed Nov 20 08:23:56 2019 -0800" }, "message": "Merge \"Camera: Check consumer interface before disconnecting\" am: aa59be48d4\nam: a4f8c20bf9\n\nChange-Id: I691c6c369db7b6334a54dbe98b61711b8185e1cb\n" }, { "commit": "a4f8c20bf985d4a6d3a108d6813fe01d5b41cd55", "tree": "36c529afa2ebdbbe4a31b8649aaf60cd957ff979", "parents": [ "f1a372c1792ad6b92a7cabd804a5195589daf8e0", "aa59be48d4385700852552e3359f5c41a73fcd16" ], "author": { "name": "Emilian Peev", "email": "epeev@google.com", "time": "Wed Nov 20 08:20:02 2019 -0800" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Wed Nov 20 08:20:02 2019 -0800" }, "message": "Merge \"Camera: Check consumer interface before disconnecting\"\nam: aa59be48d4\n\nChange-Id: I2c1b1878b8ca56bcce5a977afec2170a62a738a0\n" }, { "commit": "960bbfab7bd5f2fff6afdecb920f21b8eb3fee45", "tree": "6eca1abc80b0d3ea6a0680f45fd0ea28019815f1", "parents": [ "9132522c7e3702227cf65756d11630d51d022f3f" ], "author": { "name": "Emilian Peev", "email": "epeev@google.com", "time": "Wed Oct 30 10:12:46 2019 -0700" }, "committer": { "name": "Emilian Peev", "email": "epeev@google.com", "time": "Tue Nov 19 17:09:42 2019 +0000" }, "message": "Camera: Check consumer interface before disconnecting\n\nThe internal buffer queue and respective \u0027mConsumer\u0027 may\nnever get initialized in case the connection and/or\nconfiguration of client shared output surfaces fails.\nTo avoid possible instabilities check whether the\nconsumer interface is valid before trying to disconnect.\n\nBug: 143506890\nTest: atest\ncts/tests/camera/src/android/hardware/camera2/cts/MultiViewTest.java\n\nChange-Id: Ia533233444fd548ddb52f4fde06212a21bc843bc\nMerged-In: Ia533233444fd548ddb52f4fde06212a21bc843bc\n" }, { "commit": "0dff6354a26026e997592e65de60d51fc1413f4f", "tree": "310442d464502c421836a4ef3697f1ede7b646f4", "parents": [ "c9b7938917ab330a9b5be036c94b644432402c51", "80cf46d6fb0248d62996e8277c1b699379e68e04" ], "author": { "name": "Michael Gonzalez", "email": "michgonz@codeaurora.org", "time": "Mon Nov 18 13:46:34 2019 -0800" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Mon Nov 18 13:46:34 2019 -0800" }, "message": "Merge changes Iba1c82b0,Ia498f6dd,I16fd11f5 into qt-qpr1-dev am: 40f8906f45\nam: 80cf46d6fb\n\nChange-Id: I05b66f64f0f941cde473d02d02e6c1714d7d4a6a\n" }, { "commit": "f2ae75ddc535e8ecb253d0b657e597c227057838", "tree": "61c1153d1df097e72171679ce8fb3db1313f5bfe", "parents": [ "0017f0d7714fd06bfbc8faf3039f5fac8c3bdef4" ], "author": { "name": "Michael Gonzalez", "email": "michgonz@codeaurora.org", "time": "Tue Oct 08 14:30:32 2019 -0700" }, "committer": { "name": "Shuzhen Wang", "email": "shuzhenwang@google.com", "time": "Fri Nov 08 18:57:31 2019 +0000" }, "message": "Camera: Heic: Wait for output TS before dequeuing output buffers\n\nDuring testHeicExif, the codec output buffer timestamp may rarely arrive\nafter the first codec output tiles arrive.\n\nTest: vendor testing\nBug: 141169323\nChange-Id: Iba1c82b087533cb87a32d69f7d6908e2c925b807\nMerged-In: Iba1c82b087533cb87a32d69f7d6908e2c925b807\n(cherry picked from commit 5c103f2962cd41a948dca4f2156c6efdf506bef1)\n" }, { "commit": "0017f0d7714fd06bfbc8faf3039f5fac8c3bdef4", "tree": "437279d82780f895267ddf9f7c3ebb79f0067521", "parents": [ "983f81403e9189c52e23f878c6ea5d22e97448e2" ], "author": { "name": "Michael Gonzalez", "email": "michgonz@codeaurora.org", "time": "Wed Oct 09 15:38:17 2019 -0700" }, "committer": { "name": "Shuzhen Wang", "email": "shuzhenwang@google.com", "time": "Fri Nov 08 18:57:02 2019 +0000" }, "message": "Camera: Heic: Handle out-of-order buffer outputs\n\nDuring reprocess usecases, the Camera HAL may return JPEG Appsegment\nframes out of order. This leads to a scenario where\nmAppSegmentConsumer-\u003elockNextBuffer may not refer to the currently muxed\nframe.\n\nTo work around this, the number of lockable appsegment buffers has been\nincreased.\n\nTest: Vendor testing\nBug: 141169323\nChange-Id: Ia498f6ddaba588b66cbaeee94fe8bdd7314bb90c\nMerged-In: Ia498f6ddaba588b66cbaeee94fe8bdd7314bb90c\n(cherry picked from commit b5986a36b2913ec100b110720c3e24e26fd0d1dd)\n" }, { "commit": "983f81403e9189c52e23f878c6ea5d22e97448e2", "tree": "541d7935d24f3855262fe810e557f9b4230bc983", "parents": [ "4333c308afa4a695fd8f444d308b794cad656a6e" ], "author": { "name": "Shuzhen Wang", "email": "shuzhenwang@google.com", "time": "Wed Sep 25 14:19:28 2019 -0700" }, "committer": { "name": "Shuzhen Wang", "email": "shuzhenwang@google.com", "time": "Fri Nov 08 18:54:15 2019 +0000" }, "message": "Camera: Heic: Wait for first output tile callback before muxer start\n\nIn order for muxer to start writing any track, the format returned from\nonFormatChanged must first be available. By waiting for first output\ntile callback, we are guaranteed to have received onFormatChanged, which\nmeans a valid format is available for muxer to use.\n\nThis change also makes it such that no multiple muxers are inflight, avoiding\ndequeueBuffer failure because right now we only support maximum dequeued\nbuffer count to be 1.\n\nAdd more verbose logs for ease of debugging.\n\nTest: Vendor testing\nBug: 141169323\nChange-Id: I16fd11f5558e525ceae59df00533553e4b4e7589\nMerged-In: I16fd11f5558e525ceae59df00533553e4b4e7589\n(cherry picked from commit 3d00ee51a207d15718fcac4fefc72306532d68af)\n" }, { "commit": "8fe02b24e4cdf93cb1c004b7d77c01671bd44916", "tree": "b98bc23bfd5801683f09420cbeb179b2d24a0992", "parents": [ "3066e206366b25b6b64cf0ad29188bd04b56b183" ], "author": { "name": "Jayant Chowdhary", "email": "jchowdhary@google.com", "time": "Fri Oct 25 11:01:00 2019 -0700" }, "committer": { "name": "Jayant Chowdhary", "email": "jchowdhary@google.com", "time": "Fri Nov 01 10:55:38 2019 -0700" }, "message": "cameraserver: filter out non-HAL3 devices from HIDL addListener.\n\nBug: 143192708\n\nTest: Use vendor clients of cameraserver\nTest: GCA (sanity)\n\nMerged-In: Ic31f71887b55f3d838ca35274a5f65802ea50584\nChange-Id: I51ae92d3596a962ca6ca551f8fab9fd0c77b6283\nSigned-off-by: Jayant Chowdhary \u003cjchowdhary@google.com\u003e\n" }, { "commit": "6fcb941084faecce31909f1c50ee1ba442244f8b", "tree": "d8904b383fd5d7e01c3c966c1c57c44266dbad18", "parents": [ "22cd27bcc50b17ebb5104400cece4c34f1729930", "c499a089250910118da5a292794d0dc1c9053171" ], "author": { "name": "Xin Li", "email": "delphij@google.com", "time": "Wed Oct 30 14:30:59 2019 -0700" }, "committer": { "name": "Xin Li", "email": "delphij@google.com", "time": "Wed Oct 30 14:30:59 2019 -0700" }, "message": "DO NOT MERGE - qt-qpr1-dev-plus-aosp-without-vendor@5915889 into stage-aosp-master\n\nBug: 142003500\nChange-Id: I0de886061b2d75f9c37e8edbd4e7e08225d0186b\n" }, { "commit": "359adca4b7cf734ab9a0d27a005b9f6dfdc0ad8e", "tree": "741e8f07f2f56c89d2e42e32233d5c4e9d6c0c37", "parents": [ "2218ec1a22bb644669b7c142cea1a06c00abcf49" ], "author": { "name": "Emilian Peev", "email": "epeev@google.com", "time": "Wed Oct 30 10:12:46 2019 -0700" }, "committer": { "name": "Emilian Peev", "email": "epeev@google.com", "time": "Wed Oct 30 21:06:40 2019 +0000" }, "message": "Camera: Check consumer interface before disconnecting\n\nThe internal buffer queue and respective \u0027mConsumer\u0027 may\nnever get initialized in case the connection and/or\nconfiguration of client shared output surfaces fails.\nTo avoid possible instabilities check whether the\nconsumer interface is valid before trying to disconnect.\n\nBug: 143506890\nTest: atest\ncts/tests/camera/src/android/hardware/camera2/cts/MultiViewTest.java\n\nChange-Id: Ia533233444fd548ddb52f4fde06212a21bc843bc\n" }, { "commit": "b7c2cf5d34843dcaf43053acc9da91cccaf122ac", "tree": "dbddd7d90ff918a155557baa943d5b1db79cf626", "parents": [ "f16f21366cbc91778d3e4c57d0d679dafd274d1f" ], "author": { "name": "Jayant Chowdhary", "email": "jchowdhary@google.com", "time": "Mon Oct 07 15:26:41 2019 -0700" }, "committer": { "name": "Jayant Chowdhary", "email": "jchowdhary@google.com", "time": "Thu Oct 24 15:51:05 2019 -0700" }, "message": "cameraserver: Avoiding deadlocks while calling isPublicallyHiddenSecureCamera().\n\nThe following scenario can occur:\n\n T1 serving Client A\u0027s disconnect() call:\n T2 : serving Client B\u0027s connect() call\n T2 : CameraProviderManager::openSession() locks mInterfaceMutex and waits on open() HAL\n interface call\n T1: updateStatus() locks mStatusListenerMutex\n T1: CameraProviderManager::isPublicallyHiddenSecureCamera() waits\n on mInterfaceMutex\n T2: while waiting on open(), gets a torchModeStatus() callback from the camera HAL\n T2: onStatusChanged()\n T2: broadcastTorchModeStatus() which waits on mStatusListenerMutex\n\nAs a result there\u0027s a possible circular hold and wait between T1 and T2.\n\nWe cache isPublicallyHiddenSecureCamera in CameraState. That doesn\u0027t completely\navoid having to hold mInterfaceLock while calling isPublicallyHiddenSecureCamera() in CameraService\n(cache updates), instead it reduces it. We instead need to hold mCameraStates lock which has a\nsmaller scope.\n\nBug: 141756275\n\nTest: CTS\nTest: GCA (sanity)\n\nMerged-In: I8562c83478b1fe8fbda7c85f97b995985666918d\nMerged-In: I4a697c1eaccc3603007be4a595febea981fbeb64\nChange-Id: Ie5508afb126a874f76fbbfc2dd19ef79ae6255e0\n(cherry picked from commit fd39db81e44e191baa476a579de6cc2618de025a)\nSigned-off-by: Jayant Chowdhary \u003cjchowdhary@google.com\u003e\n" }, { "commit": "ff7eab2a57ff31501e9da98bdc2c633c4996eae5", "tree": "2f68d5ff7da61153da6702aba670149784a5fe89", "parents": [ "89f3994620c9b19ece47694680b3c3aad594d924", "01510dc5268a5320a289640abb92a58bc20e3c5a" ], "author": { "name": "Emilian Peev", "email": "epeev@google.com", "time": "Wed Oct 23 15:26:39 2019 -0700" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Wed Oct 23 15:26:39 2019 -0700" }, "message": "Merge \"Camera: Release all composite streams during \"detachDevice\"\" into qt-qpr1-dev am: f16f21366c\nam: 01510dc526\n\nChange-Id: Id88dc89d3cf99266e34211aa72b4e99bb259c40d\n" }, { "commit": "5e4c732e8646ec700b495bc9ca532d92034f44fb", "tree": "bff57382c04a8d040964a8f7d3238c20ebd0eb28", "parents": [ "ca7582109dd529eb80dff3d6135a20950a9e3b47" ], "author": { "name": "Emilian Peev", "email": "epeev@google.com", "time": "Tue Oct 22 14:20:52 2019 -0700" }, "committer": { "name": "Emilian Peev", "email": "epeev@google.com", "time": "Wed Oct 23 09:28:36 2019 -0700" }, "message": "Camera: Release all composite streams during \"detachDevice\"\n\n\"CameraDeviceClient\" which keeps all references to active\ncomposite streams may not get immediately destroyed after\nclient disconnect. This means that all registered output\nsurfaces in composite streams will continue to have\nan active connection. In such scenario camera clients will\nnot be able to re-use the same surface as long as the older\ninstances are still alive.\n Avoid this behavior by explicitly releasing all remaining\ncomposite streams during \"detachDevice\". The method must\nbe called as part of the client disconnect and will\nensure that all surface connections are removed.\n\nBug: 143212133\nTest: Camera CTS\nChange-Id: I08710645539b687f046116a88576f05bbcbdbaff\n" }, { "commit": "31706c85b15f0e4f72cda2391aab7d6e3404de8c", "tree": "67d4418891d6d5662cf080f0419a2d0149986862", "parents": [ "f94b6d6d8118e27213e38c0449159c60cbd74362", "fd39db81e44e191baa476a579de6cc2618de025a" ], "author": { "name": "Jayant Chowdhary", "email": "jchowdhary@google.com", "time": "Mon Oct 21 14:51:56 2019 -0700" }, "committer": { "name": "Jayant Chowdhary", "email": "jchowdhary@google.com", "time": "Mon Oct 21 16:46:51 2019 -0700" }, "message": "resolve merge conflicts of f7b975c56a98c3134adc5dc95834673eeee81f0d to qt-qpr1-dev-plus-aosp\n\nTest: build\nTest: Camera2 app take picture(sanity)\n\nMerged-In: I4a697c1eaccc3603007be4a595febea981fbeb64\nChange-Id: I8562c83478b1fe8fbda7c85f97b995985666918d\nSigned-off-by: Jayant Chowdhary \u003cjchowdhary@google.com\u003e\n" }, { "commit": "8863a154f82f06b7267348d5d8f6a371d90ba1cb", "tree": "6b3baba11f2a280775416eeb6c17bfc23a7c1503", "parents": [ "4520fef512aa02e8557b147104cc343bc2994910", "c52243f298aa3e570197831c8c383fdedb8f4ac6" ], "author": { "name": "Jayant Chowdhary", "email": "jchowdhary@google.com", "time": "Mon Oct 21 11:10:06 2019 -0700" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Mon Oct 21 11:10:06 2019 -0700" }, "message": "Merge changes from topic \"hiddenCameraDeadlock\"\nam: c52243f298\n\nChange-Id: Iced231eeaf55af13dfff514f21ce3398cdbd6a0c\n" }, { "commit": "c52243f298aa3e570197831c8c383fdedb8f4ac6", "tree": "ef93786ab04ffd918b68adbb25d1c3a43633d791", "parents": [ "4426ce8d95c78ba08d86c6d6c7f329033c1876c8", "fd39db81e44e191baa476a579de6cc2618de025a" ], "author": { "name": "Jayant Chowdhary", "email": "jchowdhary@google.com", "time": "Mon Oct 21 17:00:19 2019 +0000" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Mon Oct 21 17:00:19 2019 +0000" }, "message": "Merge changes from topic \"hiddenCameraDeadlock\"\n\n* changes:\n cameraserver: Avoiding deadlocks while calling isPublicallyHiddenSecureCamera().\n Do not include hidden secure cameras in camera1: getNumberOfCameras\n" }, { "commit": "fd39db81e44e191baa476a579de6cc2618de025a", "tree": "bbd531650f20bb1a84b0e169b32fc558835313f4", "parents": [ "56c3307952478ba42bf33ad88d8e0e194623224a" ], "author": { "name": "Jayant Chowdhary", "email": "jchowdhary@google.com", "time": "Mon Oct 07 15:26:41 2019 -0700" }, "committer": { "name": "Jayant Chowdhary", "email": "jchowdhary@google.com", "time": "Wed Oct 16 14:48:24 2019 -0700" }, "message": "cameraserver: Avoiding deadlocks while calling isPublicallyHiddenSecureCamera().\n\nThe following scenario can occur:\n\n T1 serving Client A\u0027s disconnect() call:\n T2 : serving Client B\u0027s connect() call\n T2 : CameraProviderManager::openSession() locks mInterfaceMutex and waits on open() HAL\n interface call\n T1: updateStatus() locks mStatusListenerMutex\n T1: CameraProviderManager::isPublicallyHiddenSecureCamera() waits\n on mInterfaceMutex\n T2: while waiting on open(), gets a torchModeStatus() callback from the camera HAL\n T2: onStatusChanged()\n T2: broadcastTorchModeStatus() which waits on mStatusListenerMutex\n\nAs a result there\u0027s a possible circular hold and wait between T1 and T2.\n\nWe cache isPublicallyHiddenSecureCamera in CameraState. That doesn\u0027t completely\navoid having to hold mInterfaceLock while calling isPublicallyHiddenSecureCamera() in CameraService\n(cache updates), instead it reduces it. We instead need to hold mCameraStates lock which has a\nsmaller scope.\n\nBug: 141756275\n\nTest: CTS\nTest: GCA (sanity)\n\nMerged-In: I4a697c1eaccc3603007be4a595febea981fbeb64\nChange-Id: Ie5508afb126a874f76fbbfc2dd19ef79ae6255e0\nSigned-off-by: Jayant Chowdhary \u003cjchowdhary@google.com\u003e\n" }, { "commit": "56c3307952478ba42bf33ad88d8e0e194623224a", "tree": "041c5c18627f7511034af70ab2f6815d1a783620", "parents": [ "9ee56ec1a7ace45b42b65e01fdda98114b5c0833" ], "author": { "name": "Jayant Chowdhary", "email": "jchowdhary@google.com", "time": "Wed Sep 18 20:14:02 2019 -0700" }, "committer": { "name": "Jayant Chowdhary", "email": "jchowdhary@google.com", "time": "Wed Oct 16 13:53:39 2019 -0700" }, "message": "Do not include hidden secure cameras in camera1: getNumberOfCameras\n\nApps cannot connect to hidden secure cameras. Do not include them in the\nnumber of cameras reported by camera1 api.\n\nBug: 141247926\n\nTest: Without CL -\u003e mark all cameras as hidden secure cameras;\n atest FastBasicsTest.java#testCamera1 fails\n With CL -\u003e mark all cameras as hidden secure cameras;\n atest FastBasicsTest.java#testCamera1 passes\n\nTest: camera CTS\n\nMerged-In: I9d1721fd5e94fa7f692c3da52aa667ae9247d368\nChange-Id: I229a336bed6b2695e16c1457cb8f74c26b07f7e8\nSigned-off-by: Jayant Chowdhary \u003cjchowdhary@google.com\u003e\n(cherry picked from commit cf935409652e633096729bdb64029cf2383534e3)\n" }, { "commit": "ecd8336f9ccbf4339b3527680d7f32d48cb15872", "tree": "c520c4eb6b137daeaa9c1454c63f6a034ce496e8", "parents": [ "aa9c382be3bc801731cd4b39231b360d3e3388d8", "81d1403fb3afe153b47cde2d0b528fb4858113f5" ], "author": { "name": "Dongwon Kang", "email": "dwkang@google.com", "time": "Tue Oct 15 11:45:42 2019 -0700" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Tue Oct 15 11:45:42 2019 -0700" }, "message": "Merge \"libmedia: separate codeclist from libmedia\" am: 1f72838954 am: 8b470dc956\nam: 81d1403fb3\n\nChange-Id: I1586c4149d5f3822fdb991180c831cf25595bbe6\n" }, { "commit": "8b470dc95691b5a5c3442629a348b44a59886792", "tree": "fc58976e0cda56aba734b3222bf6f14a8a6a0624", "parents": [ "07bd8e774093b73e225562bbd5095a1732246477", "1f72838954cb3689fb58eef6276553d9a45ff0a8" ], "author": { "name": "Dongwon Kang", "email": "dwkang@google.com", "time": "Tue Oct 15 10:30:20 2019 -0700" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Tue Oct 15 10:30:20 2019 -0700" }, "message": "Merge \"libmedia: separate codeclist from libmedia\"\nam: 1f72838954\n\nChange-Id: I7ceb439ed034386635399982392b6b842e08c105\n" }, { "commit": "a42a62d8633fa6fcabc8129a2c798da860630821", "tree": "77e009a25a0a222aba1cabdc276b5bc9da549d04", "parents": [ "342d7bcf44b3edcce763f0417ad0a13b11bde285" ], "author": { "name": "Dongwon Kang", "email": "dwkang@google.com", "time": "Mon Sep 23 17:48:14 2019 -0700" }, "committer": { "name": "Dongwon Kang", "email": "dwkang@google.com", "time": "Fri Oct 11 21:40:26 2019 -0700" }, "message": "libmedia: separate codeclist from libmedia\n\nTest: build.\nBug: 139201422\nChange-Id: I150c3bd04cc68a3b96a8762ba193fc1595ee6da3\nMerged-In: I150c3bd04cc68a3b96a8762ba193fc1595ee6da3\n" }, { "commit": "55766c4a99f4af1a09b66512b71931e48040db34", "tree": "2a1ce8bf091af7cf9883e7987ad8f4a05ce0994a", "parents": [ "7d6446db9a810bbc172087c51452887d414ab108", "ca7582109dd529eb80dff3d6135a20950a9e3b47" ], "author": { "name": "Emilian Peev", "email": "epeev@google.com", "time": "Fri Oct 11 10:53:25 2019 -0700" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Fri Oct 11 10:53:25 2019 -0700" }, "message": "Merge \"Camera: Set input timestamp before returning depth jpegs\" into qt-qpr1-dev\nam: ca7582109d\n\nChange-Id: I031a488aba1f745014170340cddeb9ca6d2ab8d9\n" }, { "commit": "a8a70b42254125ea3987d8deafbbedad36743186", "tree": "ea833c0e3c1088117b6626ff5d5473394251effb", "parents": [ "18ea000d7f15726e4c11c4a9e7e59e8a18a9c227", "4f0a23d0dc08aa553389f17ab7e3f89fc6125496" ], "author": { "name": "Marco Nelissen", "email": "marcone@google.com", "time": "Thu Oct 03 13:25:05 2019 -0700" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Thu Oct 03 13:25:05 2019 -0700" }, "message": "Merge \"Remove libmediadrm symlinks\"\nam: 4f0a23d0dc\n\nChange-Id: Id2a5c304d8b8397afe933f2ddca97d2879385494\n" }, { "commit": "90a839f6611a7e4ffd6c5af35ba0f16e88b9e2bd", "tree": "b4a1bc7a283c584bbc0eecdd20176e3ea91aedd9", "parents": [ "16639a6e00d6f0f43486209795011f21ff0dc465" ], "author": { "name": "Emilian Peev", "email": "epeev@google.com", "time": "Wed Oct 02 15:12:50 2019 -0700" }, "committer": { "name": "Emilian Peev", "email": "epeev@google.com", "time": "Wed Oct 02 15:16:45 2019 -0700" }, "message": "Camera: Set input timestamp before returning depth jpegs\n\nThe depth jpeg result and image timestamps must always match.\nSet the depth jpeg output surface timestamp accordingly before\nreturning the resulting output buffer.\n\nBug: 142011420\nTest: atest\ncts/tests/camera/src/android/hardware/camera2/cts/StillCaptureTest.java#testDynamicDepthCapture\n\nChange-Id: I2d70367d3cc60014d24cc138e4ca882b2111e161\n" }, { "commit": "99a2c4a2c49f5d32d9ba79585890b5fa7ed52f2a", "tree": "c4b3ad327d441c728334593b733c29c39e826d6e", "parents": [ "8eb9e24ea239a05c767ac15f5d25d5b6c56aa8be", "b4e0c3b19f11e972c9b789550c4e321cf26fa1c8" ], "author": { "name": "Marco Nelissen", "email": "marcone@google.com", "time": "Wed Oct 02 14:59:40 2019 -0700" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Wed Oct 02 14:59:40 2019 -0700" }, "message": "Remove libmediadrm symlinks\nam: b4e0c3b19f\n\nChange-Id: Ib2ecb92e4a07385f201b884f15b8143c9c4c2c02\n" }, { "commit": "b4e0c3b19f11e972c9b789550c4e321cf26fa1c8", "tree": "0b8ca8cb36cba24e658232e5fa0b286d75318995", "parents": [ "bcc132d8e562375f7830839caf84307f523f623d" ], "author": { "name": "Marco Nelissen", "email": "marcone@google.com", "time": "Fri Sep 27 10:21:55 2019 -0700" }, "committer": { "name": "Marco Nelissen", "email": "marcone@google.com", "time": "Wed Oct 02 19:54:39 2019 +0000" }, "message": "Remove libmediadrm symlinks\n\nTest: build\nChange-Id: I53d703b6d34226926437b0207a2b3d51dff6881a\nMerged-In: I53d703b6d34226926437b0207a2b3d51dff6881a\n" }, { "commit": "55b259cf5ec16df77b52206e8209f5df2fc214c5", "tree": "29989150d2cfb026f11ec5d43edb8116442e7311", "parents": [ "87025d5658d1a3d78c1a634035f7126f0ba8a4f1" ], "author": { "name": "Marco Nelissen", "email": "marcone@google.com", "time": "Fri Sep 27 10:21:55 2019 -0700" }, "committer": { "name": "Marco Nelissen", "email": "marcone@google.com", "time": "Tue Oct 01 13:43:37 2019 -0700" }, "message": "Remove libmediadrm symlinks\n\nTest: build\nChange-Id: I53d703b6d34226926437b0207a2b3d51dff6881a\nMerged-In: I53d703b6d34226926437b0207a2b3d51dff6881a\n" }, { "commit": "3644001ea41d1b54407dc56fd914a9a257560aba", "tree": "7c9a16da90ea7ed39c90dc817b884510fedc6dbd", "parents": [ "15acd121f0f8f006ac7e8ca81dc2a4b2cd8eb6b1", "863695e7ab51af3db3b97a21de180d3002d85d90" ], "author": { "name": "Chong Zhang", "email": "chz@google.com", "time": "Sun Sep 22 04:31:52 2019 -0700" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Sun Sep 22 04:31:52 2019 -0700" }, "message": "Merge \"Make a copy of output format in onOutputFormatChanged\" into qt-qpr1-dev\nam: 863695e7ab\n\nChange-Id: I2927d2a6cef66c31c18d0ad942830f59d9556a57\n" }, { "commit": "863695e7ab51af3db3b97a21de180d3002d85d90", "tree": "35f4beeb0636eb3d462ca0f8409c0ed7e86a40f5", "parents": [ "a11810536889285331a3b82fa202311fd5bf8b8d", "1fa2686026ce128fa16f47fb00f33ecc70ecdb4f" ], "author": { "name": "TreeHugger Robot", "email": "treehugger-gerrit@google.com", "time": "Sun Sep 22 11:19:04 2019 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Sun Sep 22 11:19:04 2019 +0000" }, "message": "Merge \"Make a copy of output format in onOutputFormatChanged\" into qt-qpr1-dev" }, { "commit": "15acd121f0f8f006ac7e8ca81dc2a4b2cd8eb6b1", "tree": "43c0813eb09b6adb7566ff607fa2df7d34be2d98", "parents": [ "3dcd55bf8d45e9f7ab40ba00e7afdfb9b0036517", "a11810536889285331a3b82fa202311fd5bf8b8d" ], "author": { "name": "Shuzhen Wang", "email": "shuzhenwang@google.com", "time": "Fri Sep 20 17:55:17 2019 -0700" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Fri Sep 20 17:55:17 2019 -0700" }, "message": "Merge \"Camera: Delay pingCameraServiceProxy to end of onFirstRef\" into qt-qpr1-dev\nam: a118105368\n\nChange-Id: Ia1913dfc9e1dc1d94b8c285819bd4137986c7fde\n" }, { "commit": "a11810536889285331a3b82fa202311fd5bf8b8d", "tree": "4c40e322fab6bf959962ad7b966c64b4c26aca49", "parents": [ "eaf3f613a91f4b6383d4c2d81cbedefebef83ec7", "24b44157d3a9736fce60479cbbbabadf53471df0" ], "author": { "name": "TreeHugger Robot", "email": "treehugger-gerrit@google.com", "time": "Sat Sep 21 00:39:34 2019 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Sat Sep 21 00:39:34 2019 +0000" }, "message": "Merge \"Camera: Delay pingCameraServiceProxy to end of onFirstRef\" into qt-qpr1-dev" }, { "commit": "665814684e84dc2caaa316382854eaca360c7c75", "tree": "3c44b302f587ae635fcf16be3388e448cbf01087", "parents": [ "99a94746c9a2f0fc2bb6f7086aa8b586a58e0a49", "cf935409652e633096729bdb64029cf2383534e3" ], "author": { "name": "Jayant Chowdhary", "email": "jchowdhary@google.com", "time": "Fri Sep 20 12:16:09 2019 -0700" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Fri Sep 20 12:16:09 2019 -0700" }, "message": "Do not include hidden secure cameras in camera1: getNumberOfCameras\nam: cf93540965\n\nChange-Id: Ieb6594b60f1c3f1dee3fec91cabd589f029b93f1\n" }, { "commit": "1fa2686026ce128fa16f47fb00f33ecc70ecdb4f", "tree": "09afcd977ec8cfbb267ab1820687f2e954bd2978", "parents": [ "804b87d1f80df7b5fbe77e59100c375be1542db7" ], "author": { "name": "Chong Zhang", "email": "chz@google.com", "time": "Mon Sep 16 16:15:00 2019 -0700" }, "committer": { "name": "Chong Zhang", "email": "chz@google.com", "time": "Fri Sep 20 18:21:42 2019 +0000" }, "message": "Make a copy of output format in onOutputFormatChanged\n\nMake a copy of output format in NDK and camera\u0027s heic encoder.\n(MediaCodec.java JNI is already making a copy, so copy out of\nMediaCodec.cpp to avoid unnecessary dup)\n\nbug:141140020\nChange-Id: I8afb1e48b73f0fb2fa584bdee2b93985b48a5e91\n(cherry picked from commit 860eff192e00df5977be5ff8a6fbf3efa6f1f8d5)\n" }, { "commit": "24b44157d3a9736fce60479cbbbabadf53471df0", "tree": "4f4e0b6b8941b52fee0ed67d764734d098453d68", "parents": [ "804b87d1f80df7b5fbe77e59100c375be1542db7" ], "author": { "name": "Shuzhen Wang", "email": "shuzhenwang@google.com", "time": "Fri Sep 20 10:38:11 2019 -0700" }, "committer": { "name": "Shuzhen Wang", "email": "shuzhenwang@google.com", "time": "Fri Sep 20 10:48:18 2019 -0700" }, "message": "Camera: Delay pingCameraServiceProxy to end of onFirstRef\n\nThe cameraservice is only registered to service manager after onFirstRef\nis returned. To reduce the probability of getBinderService() call\nreturning null, move pingCameraServiceProxy to end of onFirstRef().\n\nAlso add debug messages in onFirstRef and main() for better diagnoses.\n\nTest: Camera CTS\nBug: 140414594\nChange-Id: I52defd1c138ade57ebc5181c42aff30921fbeaeb\n" }, { "commit": "cf935409652e633096729bdb64029cf2383534e3", "tree": "af977a82797600bc63166e809cd567a21704140a", "parents": [ "804b87d1f80df7b5fbe77e59100c375be1542db7" ], "author": { "name": "Jayant Chowdhary", "email": "jchowdhary@google.com", "time": "Wed Sep 18 20:14:02 2019 -0700" }, "committer": { "name": "Jayant Chowdhary", "email": "jchowdhary@google.com", "time": "Fri Sep 20 10:10:29 2019 -0700" }, "message": "Do not include hidden secure cameras in camera1: getNumberOfCameras\n\nApps cannot connect to hidden secure cameras. Do not include them in the\nnumber of cameras reported by camera1 api.\n\nBug: 141247926\n\nTest: Without CL -\u003e mark all cameras as hidden secure cameras;\n atest FastBasicsTest.java#testCamera1 fails\n With CL -\u003e mark all cameras as hidden secure cameras;\n atest FastBasicsTest.java#testCamera1 passes\n\nTest: camera CTS\n\nMerged-In: I9d1721fd5e94fa7f692c3da52aa667ae9247d368\nChange-Id: I229a336bed6b2695e16c1457cb8f74c26b07f7e8\nSigned-off-by: Jayant Chowdhary \u003cjchowdhary@google.com\u003e\n" }, { "commit": "fdb43e49e9b43df47c8d9afb86f7e4ab83f8702b", "tree": "124853b510e9586e006aca7aea9dd2291f6265ea", "parents": [ "ee14f8236132fc05a1236e0c54aaf9af91b38b56", "cfaf477e54f6c9d58b079f73507a5dfbeb773faa" ], "author": { "name": "TreeHugger Robot", "email": "treehugger-gerrit@google.com", "time": "Wed Sep 11 20:31:33 2019 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Wed Sep 11 20:31:33 2019 +0000" }, "message": "Merge \"Merge qt-r1-dev-plus-aosp-without-vendor (5817612) into stage-aosp-master\" into stage-aosp-master" }, { "commit": "8c7465931249ed0ffea7de99f2d736ce0bc607dc", "tree": "fa18665065517131b1275581b6bae15fee3de385", "parents": [ "d4730c8745e1f6f5567afbe3b8a351d5f8819f40", "2dc8ae5642ff2e4d92a5f141189f73082d0a9478" ], "author": { "name": "Steven Moreland", "email": "smoreland@google.com", "time": "Mon Sep 09 14:44:58 2019 -0700" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Mon Sep 09 14:44:58 2019 -0700" }, "message": "Merge \"Remove libhwbinder/libhidltransport deps\" am: 6cffe44e0f am: b7d2632c22\nam: 2dc8ae5642\n\nChange-Id: I7be03dd52255dffbdc04357144b2582d27f5079e\n" }, { "commit": "2dc8ae5642ff2e4d92a5f141189f73082d0a9478", "tree": "933101c420fd8c2e7b4fdb5baf5c10310739bb17", "parents": [ "f6d4e3349b7b44995109f845328ce73e98eb6b82", "b7d2632c22781990ab23d492abce4820334a2842" ], "author": { "name": "Steven Moreland", "email": "smoreland@google.com", "time": "Mon Sep 09 14:37:57 2019 -0700" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Mon Sep 09 14:37:57 2019 -0700" }, "message": "Merge \"Remove libhwbinder/libhidltransport deps\" am: 6cffe44e0f\nam: b7d2632c22\n\nChange-Id: I93c5296391c469571e153e5366ee90ab9754ea9c\n" }, { "commit": "af905470168892078ca85cbd77c844b07f46d1d7", "tree": "02acf167a294e18f49a8cf075aa6ee7eb21fbf68", "parents": [ "1210f45ea764f0d186e55a19c068283a4ff6cfac" ], "author": { "name": "Steven Moreland", "email": "smoreland@google.com", "time": "Fri Sep 06 12:08:49 2019 -0700" }, "committer": { "name": "Steven Moreland", "email": "smoreland@google.com", "time": "Fri Sep 06 12:08:49 2019 -0700" }, "message": "Remove libhwbinder/libhidltransport deps\n\nSince these were combined into libhidlbase.\n\nBug: 135686713\nTest: build only (libhwbinder/libhidltransport are empty)\nChange-Id: I6cc85a91afb603e31b85090917f9f3b59d82a4d1\n" }, { "commit": "022afb0ad88d5875db1c3215bbf5d837f8eef881", "tree": "4c7f35eb5f50cc4b5f32a0709ed4d7fb34c09818", "parents": [ "fd4f1d63c3ddc44a17ff90325f820fb910cc447a", "3ef81e1acc74da842b3689418f007267caddf99d" ], "author": { "name": "Yin-Chia Yeh", "email": "yinchiayeh@google.com", "time": "Fri Aug 02 15:44:49 2019 -0700" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Fri Aug 02 15:44:49 2019 -0700" }, "message": "Merge \"Camera: listen to provider instance names from hwservicemanager\" into qt-qpr1-dev\nam: 3ef81e1acc\n\nChange-Id: Ibf110bfe47dad8a64305c9e03cbacad485cf44f2\n" }, { "commit": "3ef81e1acc74da842b3689418f007267caddf99d", "tree": "fdf6a6f82a6d3b1a164f4e0eb603ef18278f8ff7", "parents": [ "732af1892e74e716b7a96aea90079afa767bd8b9", "26c7997dea97345a81bcabd21fa07050c8ff0a57" ], "author": { "name": "TreeHugger Robot", "email": "treehugger-gerrit@google.com", "time": "Fri Aug 02 22:19:07 2019 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Fri Aug 02 22:19:07 2019 +0000" }, "message": "Merge \"Camera: listen to provider instance names from hwservicemanager\" into qt-qpr1-dev" }, { "commit": "fd4da0e171e440407031f71e46e03178ac4ca0ee", "tree": "fa68b044fe5f163dd3ccce91e4d16b0066ea6c3c", "parents": [ "59640ab7f81a7431bdc2940102cb5730a5c98bb6", "a18f033c098040461d0b37962b5309ed8f751266" ], "author": { "name": "Emilian Peev", "email": "epeev@google.com", "time": "Tue Jul 30 13:53:59 2019 -0700" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Tue Jul 30 13:53:59 2019 -0700" }, "message": "Merge \"Camera: Update depth photo container item MIME type\" into qt-r1-dev am: b94ff28527\nam: a18f033c09\n\nChange-Id: I2a9b9e82eb1f625cbaf83b54aba51a44ace8292b\n" }, { "commit": "083f5d1ea29f7dce37958c2cb849db99509aedbc", "tree": "fa68b044fe5f163dd3ccce91e4d16b0066ea6c3c", "parents": [ "8f163dd2b0a3a5319c68efb9a631a16f528aa9fd", "b94ff28527e7d2a826992d83de1961114bab136f" ], "author": { "name": "Emilian Peev", "email": "epeev@google.com", "time": "Tue Jul 30 13:40:19 2019 -0700" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Tue Jul 30 13:40:19 2019 -0700" }, "message": "Merge \"Camera: Update depth photo container item MIME type\" into qt-r1-dev\nam: b94ff28527\n\nChange-Id: I04b305f0f15f6aef77960e4e274663061e80c262\n" }, { "commit": "26c7997dea97345a81bcabd21fa07050c8ff0a57", "tree": "3972c857ca6683491bc6ec10c9212dda7a922021", "parents": [ "8454f90b4d71cf47dfcdb7e3268dc5cd20046d3a" ], "author": { "name": "Yin-Chia Yeh", "email": "yinchiayeh@google.com", "time": "Tue Jun 25 10:53:03 2019 -0700" }, "committer": { "name": "Yin-Chia Yeh", "email": "yinchiayeh@google.com", "time": "Tue Jul 30 13:27:51 2019 -0700" }, "message": "Camera: listen to provider instance names from hwservicemanager\n\nAlso remove the expected argument in addProviderLocked method as\nwe now can query from device manifest for instance names.\n\nTest: manually modify Pixel3 manifest to test, CTS\nBug: 136010319\nMerged-In: Ib57fd84ad8f22aac2a82920e03148cff2592daae\nChange-Id: Ib57fd84ad8f22aac2a82920e03148cff2592daae\n" }, { "commit": "ea0bf32a189b3998880181118caf6016ed4b7d0f", "tree": "ef434308dcec9ac2e17d0d5ba750cb535c0faf1b", "parents": [ "1c74123afb488b39c850e3b897fc921a9396bfb1" ], "author": { "name": "Emilian Peev", "email": "epeev@google.com", "time": "Thu Jul 25 15:12:39 2019 -0700" }, "committer": { "name": "Emilian Peev", "email": "epeev@google.com", "time": "Thu Jul 25 15:38:53 2019 -0700" }, "message": "Camera: Update depth photo container item MIME type\n\nReplace the item MIME type with value supported\nby the dynamic depth specification.\n\nBug: 138399780\nTest: runtest -x\ncts/tests/camera/src/android/hardware/camera2/cts/ImageReaderTest.java\n-m testDynamicDepth\n\nChange-Id: Ib51dd69e6de7da3269eccfa6b671fe95a269b4d6\n" }, { "commit": "1a4916e1ae1865aa137caba8db9e2966f6e504cf", "tree": "97f253117d520b2c518ba6a4378eeadc2c40450b", "parents": [ "39cf2ddd0c05bfa2ef70a4ac041f22e993d86fd1", "1393a2838d5cebb468a85891abae9ac4b3262397" ], "author": { "name": "Shuzhen Wang", "email": "shuzhenwang@google.com", "time": "Tue Jul 09 19:45:58 2019 -0700" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Tue Jul 09 19:45:58 2019 -0700" }, "message": "Merge \"Camera: Filter out NIR cameras for camera1 API\" into qt-r1-dev\nam: 1393a2838d\n\nChange-Id: Ifb63713dbfa2a3ebfe73da41ceeb32f58d744db0\n" }, { "commit": "7a7e63456bcdba32ea41180d53fc9ecafba9c484", "tree": "714623a21f7d950fd638320810fe1538373cffe6", "parents": [ "4c6d99520c95386e5a4f4a94aafe9c63053ae734" ], "author": { "name": "Shuzhen Wang", "email": "shuzhenwang@google.com", "time": "Fri May 31 16:28:21 2019 -0700" }, "committer": { "name": "Shuzhen Wang", "email": "shuzhenwang@google.com", "time": "Tue Jul 09 16:15:09 2019 -0700" }, "message": "Camera: Filter out NIR cameras for camera1 API\n\nThis is to reduce application confusion when switching between back and\nfront cameras.\n\nTest: Observe dumpsys on a phone with NIR camera device\nBug: 133141567\nChange-Id: I0c11b99fc3a0304d54562548d109df8c56ba1db1\n" }, { "commit": "becafffaefe0223cb818942655bd42f7b725d561", "tree": "5153df5381bd96c6aaf6c957f8d00a129ef14fc5", "parents": [ "be86ab7c08d699ce9718243901771c5563d06d05", "2f34814d1b8f1e62a4f22511c7cb93016d213bff" ], "author": { "name": "Steven Moreland", "email": "smoreland@google.com", "time": "Mon Jul 08 17:52:30 2019 -0700" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Mon Jul 08 17:52:30 2019 -0700" }, "message": "Hold onto linked binder.\nam: 2f34814d1b\n\nChange-Id: I159588250cee3137727a8db02bc3930cc2d7d0c4\n" }, { "commit": "2f34814d1b8f1e62a4f22511c7cb93016d213bff", "tree": "f117fac9b7834dba35e32b22788d75c0c2482588", "parents": [ "964a74820baeb013430730f8f852690bc5a9183c" ], "author": { "name": "Steven Moreland", "email": "smoreland@google.com", "time": "Tue Jul 02 15:59:07 2019 -0700" }, "committer": { "name": "Steven Moreland", "email": "smoreland@google.com", "time": "Mon Jul 08 21:36:57 2019 +0000" }, "message": "Hold onto linked binder.\n\nunlinkToDeath is no longer required, (this change in behavior is to\navoid leaks) so holding onto ActivityManager here (still calling\nunlinkToDeath to avoid a log, but may for instance remove all\nunlinkToDeath calls in the future).\n\nExempt-From-Owner-Approval: approval received on AOSP CL, only\n whitespace difference here.\n\nBug: 134576445\nTest: boot\nChange-Id: I273f77aac2b80ba9be70197cc3842f83a11bbd1c\n" }, { "commit": "ca343cb6c17454dbaf41fbaba9ef90474265b819", "tree": "b074cfb5411b9f0a20e07bf4e3d7480028dfc7be", "parents": [ "6d5ee512f5d184fea6c5d11070c8230d39447cfd", "ae59ab3159097828a42e6cef4b35891f9e75a3ff" ], "author": { "name": "Yin-Chia Yeh", "email": "yinchiayeh@google.com", "time": "Wed Jul 03 18:49:23 2019 -0700" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Wed Jul 03 18:49:23 2019 -0700" }, "message": "Merge \"Camera: fix format overriden logic\" into qt-dev\nam: ae59ab3159\n\nChange-Id: I2303a7112ae1c08e169e837732c1aeb769d25091\n" }, { "commit": "9066766c0f6fc1c9282023070de2abacaa25a6df", "tree": "4484bcdfea9726e072ec7c56eb4317950ff742f8", "parents": [ "9694a99645a42c23d489ce605e5cea4fdc0e1936" ], "author": { "name": "Yin-Chia Yeh", "email": "yinchiayeh@google.com", "time": "Mon Jul 01 15:45:00 2019 -0700" }, "committer": { "name": "Yin-Chia Yeh", "email": "yinchiayeh@google.com", "time": "Tue Jul 02 11:00:01 2019 -0700" }, "message": "Camera: fix format overriden logic\n\nOriginal logic was comparing an overridden format int, switch\nto use a const original format.\n\nTest: partner device, Pixel 3 CTS\nBug: 136456900\nChange-Id: I03d6e190770ee05e40446c417e323f546fdc2689\n" }, { "commit": "d4e179b95ae90aa5d6698bdd50d018908da6950e", "tree": "6a1b6e67ed1fe2956dd8153767d35e1465b7ceb7", "parents": [ "5146b3556d7ce5fd926ce9dc769569816d3efc40", "99fd097ae6b9542051917270e6d2a92ae707da4a" ], "author": { "name": "TreeHugger Robot", "email": "treehugger-gerrit@google.com", "time": "Fri Jun 28 08:25:46 2019 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Fri Jun 28 08:25:46 2019 +0000" }, "message": "Merge \"Camera: reduce long inflight request list spam\" into qt-r1-dev" }, { "commit": "99fd097ae6b9542051917270e6d2a92ae707da4a", "tree": "405d316732cb67bbb5d8d85ed9dd9528b9268c2d", "parents": [ "a5a6788d8eff3c8808e8816055f0fca5a873b950" ], "author": { "name": "Yin-Chia Yeh", "email": "yinchiayeh@google.com", "time": "Thu Jun 27 14:22:44 2019 -0700" }, "committer": { "name": "Yin-Chia Yeh", "email": "yinchiayeh@google.com", "time": "Thu Jun 27 14:22:44 2019 -0700" }, "message": "Camera: reduce long inflight request list spam\n\nBy checking the expected duration for all inflight requests to\nfinish and only log when it takes more than a threshold (5 secs)\nto process all inflight requests and the list is long.\n\nTest: manual testing\nBug: 135927862\nChange-Id: Iaa2c593f1e69f63b1da7d35d73c696de3510cd2c\n" }, { "commit": "418653c613941453f3745496497eefc5a3d6dcbe", "tree": "0d00441e39413e19ae352047b2bd0d26d18cbe5a", "parents": [ "58b1638dfe92ec92c4aa93581efcd19584e87d83", "5bf11bf8ffb548c87fe409b6859c390e335a118e" ], "author": { "name": "Jayant Chowdhary", "email": "jchowdhary@google.com", "time": "Wed Jun 26 21:20:04 2019 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Wed Jun 26 21:20:04 2019 +0000" }, "message": "Merge \"cameraserver: Fix logging for vendor clients in connectDevice\" into qt-r1-dev" }, { "commit": "5bf11bf8ffb548c87fe409b6859c390e335a118e", "tree": "1cf0aecc7ebe3ac1b0b383222b4f5c6f58f752bd", "parents": [ "174084011ca8b593a8cf35412928517b9e864be9" ], "author": { "name": "Jayant Chowdhary", "email": "jchowdhary@google.com", "time": "Mon Jun 24 19:42:56 2019 -0700" }, "committer": { "name": "Jayant Chowdhary", "email": "jchowdhary@google.com", "time": "Tue Jun 25 11:01:02 2019 -0700" }, "message": "cameraserver: Fix logging for vendor clients in connectDevice\n\nBug: 135658628\n\nTest: GCA; auth\n\nChange-Id: I57c60f36461534c66d0c6eaa5bbe04f76a976dcb\nSigned-off-by: Jayant Chowdhary \u003cjchowdhary@google.com\u003e\n" }, { "commit": "94c98021b7e0ea614d92a1d1ea8bf163de9136bd", "tree": "788292b06ccba866f790469bbcbfcb1d762509f8", "parents": [ "a69eacc42ca98e7da08efaac1426c691be0a85b2" ], "author": { "name": "Emilian Peev", "email": "epeev@google.com", "time": "Wed Jun 19 09:11:51 2019 -0700" }, "committer": { "name": "Emilian Peev", "email": "epeev@google.com", "time": "Wed Jun 19 13:23:19 2019 -0700" }, "message": "Camera: Destroy jpeg handle in \u0027encodeGrayscaleJpeg\u0027\n\nMake sure \u0027jpeg_destroy_compress()\u0027 is always called\nbefore leaving \u0027encodeGrayscaleJpeg()\u0027.\nAdditionally fix misspelling of \u0027intrinsic\u0027.\n\nBug: 135622974\nTest: atest\ncts/tests/camera/src/android/hardware/camera2/cts/StillCaptureTest.java#testDynamicDepth\n--generate-baseline\u003d12\nChange-Id: I55c1f86881ba05aac6aac6981df5fcb276c9d4da\n" }, { "commit": "f9b4eb9e3f74ee03adccdf471d9e1073b6bc9d8c", "tree": "6b40d02f452498ca27294677f68b11ebac9994ac", "parents": [ "9c8dfd599caf7c8b727b90601da4fc8160d23ab4" ], "author": { "name": "Shuzhen Wang", "email": "shuzhenwang@google.com", "time": "Mon Jun 10 11:06:01 2019 -0700" }, "committer": { "name": "Shuzhen Wang", "email": "shuzhenwang@google.com", "time": "Mon Jun 10 22:48:33 2019 -0700" }, "message": "Camera: Compare old and new overrides for finishConfigure\n\nWith the new dataSpace/format override logic, during\nfinishConfiguration, we shouldn\u0027t check mDataSpaceOverride flag anymore\nbecause now mDataSpaceOverride will be true for reconfigure.\n\nInstead, we should check if the new override is the same as old\noverride.\n\nTest: testPrepare on HAL device with dataSpace override\nBug: 134800141\nChange-Id: I1ddc258100dfd7e3c2cc86f9e476d8d52c710e3f\n" }, { "commit": "8caf80a23a6abdfdea466e424679b176c4c649bc", "tree": "061c39cd7f365101d458dc6c0e982c48a89b41e8", "parents": [ "ca77ca26c12734407f12581854701b1d255cbba3", "9265395f3429d1c324e66a91a6a42cf5525b4498" ], "author": { "name": "TreeHugger Robot", "email": "treehugger-gerrit@google.com", "time": "Fri Jun 07 00:05:50 2019 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Fri Jun 07 00:05:50 2019 +0000" }, "message": "Merge \"Camera: Use original format and dataSpace for reconfigure\" into qt-dev" }, { "commit": "b61526c6a080af7bc062b231c52d1b7e6545868d", "tree": "1d5916e12e4d7a3ee2493dca2185677431fbab0d", "parents": [ "46238cd0395a0cb759bb1370356a8ac0fb2fa72b" ], "author": { "name": "Jayant Chowdhary", "email": "jchowdhary@google.com", "time": "Mon May 13 19:37:42 2019 -0700" }, "committer": { "name": "Jayant Chowdhary", "email": "jchowdhary@google.com", "time": "Wed Jun 05 16:51:08 2019 -0700" }, "message": "cameraserver: Stop appOps camera reporting for vendor clients.\n\nSince vendor native clients don\u0027t have package names, appOps reporting\nwould be inaccurate for them. In order to avoid that, we stop appOps\nreporting for vendor clients.\n\nBug: 132718220\n\nTest: AImageReaderVendorTest, use hal client for cameraserver, GCA(sanity)\n\nChange-Id: Ie6f80e8ab530aa755df57f8d25d9f1a15a20d7f7\nSigned-off-by: Jayant Chowdhary \u003cjchowdhary@google.com\u003e\n" }, { "commit": "9265395f3429d1c324e66a91a6a42cf5525b4498", "tree": "e7142391b15465d7174e2c0ab0a93c7f7423447e", "parents": [ "90d1d53862638210d848ddedef2600aae35337d3" ], "author": { "name": "Shuzhen Wang", "email": "shuzhenwang@google.com", "time": "Tue May 07 15:11:43 2019 -0700" }, "committer": { "name": "Shuzhen Wang", "email": "shuzhenwang@google.com", "time": "Wed Jun 05 15:23:19 2019 -0700" }, "message": "Camera: Use original format and dataSpace for reconfigure\n\nStarting from HAL device version 3.5, the format and dataSpace for\nIMPLEMENTATION_DEFINED pixel format uses original instead of overridden\nvalues.\n\nThis makes HAL interface behavior consistent in that HAL doesn\u0027t need to\ndistinguish between first-time configureStreams and subsequent\nreconfigure.\n\nTest: Camera CTS and partner testing\nBug: 131864007\nChange-Id: Ie5fdc7e9b6c11c1c96a069262b9458455855bcef\n" }, { "commit": "688abaa2865dab9ba955a6543a965d10e4c506db", "tree": "260fed212b84c3ce6afcaded95707082c66b7dcc", "parents": [ "86bd6afc79a46d586be816172f3cef7e7c89dc09" ], "author": { "name": "Chong Zhang", "email": "chz@google.com", "time": "Fri May 17 16:32:23 2019 -0700" }, "committer": { "name": "Chong Zhang", "email": "chz@google.com", "time": "Tue May 21 12:03:30 2019 -0700" }, "message": "Enumerate all hevc encoders to find one that support CQ @ 512x512 size\n\nbug: 132905160\ntest: ImageReaderTest#testHeic\nChange-Id: I497b203f7e21299eb4e322af4d4c5c925cf5a48a\n" }, { "commit": "d68496deee058c6c03c35859b2548bfee3393a62", "tree": "02b4f7eade9369f92f807b2191ef3409b1accffa", "parents": [ "4f1b69083719207f8cde2a6bf22bd3ebef80fdd8", "f8e28fb940d725afb26a37c1964fbd1fcdb50fe8" ], "author": { "name": "TreeHugger Robot", "email": "treehugger-gerrit@google.com", "time": "Mon May 20 02:09:36 2019 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Mon May 20 02:09:36 2019 +0000" }, "message": "Merge \"Camera: fix acquire fence FD double close\" into qt-dev" }, { "commit": "302652eab7ad68a89af1dcf06c190492e941b8c1", "tree": "3913775585af1ef99e5ba38fd5970de392e9ff6b", "parents": [ "5f31276553dea24e56b4a4feae6edfd939e07d5e", "11648852d7e9b92d36879bb2ed6d9953751121c5" ], "author": { "name": "TreeHugger Robot", "email": "treehugger-gerrit@google.com", "time": "Fri May 17 23:57:00 2019 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Fri May 17 23:57:00 2019 +0000" }, "message": "Merge \"Camera: cleanup some dead code\" into qt-dev" }, { "commit": "5f31276553dea24e56b4a4feae6edfd939e07d5e", "tree": "7ded9ca6848e3599bfaf4ae96288b332de59acda", "parents": [ "1dc04e4127742b47a700c41915637967ae41c37a", "5ee9984930753d3231f457be1bbcdba8910b7666" ], "author": { "name": "TreeHugger Robot", "email": "treehugger-gerrit@google.com", "time": "Fri May 17 21:20:44 2019 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Fri May 17 21:20:44 2019 +0000" }, "message": "Merge \"Camera: Allow out of order ZSL shutter vs regular shutter\" into qt-dev" }, { "commit": "f8e28fb940d725afb26a37c1964fbd1fcdb50fe8", "tree": "c45ffdcd968213bb90e658a4d75957921a31903b", "parents": [ "11648852d7e9b92d36879bb2ed6d9953751121c5" ], "author": { "name": "Yin-Chia Yeh", "email": "yinchiayeh@google.com", "time": "Thu May 16 11:46:54 2019 -0700" }, "committer": { "name": "Yin-Chia Yeh", "email": "yinchiayeh@google.com", "time": "Fri May 17 14:17:58 2019 -0700" }, "message": "Camera: fix acquire fence FD double close\n\nThis patch fixes several issues:\n* Change the timing the acquire fence FD is closed: we used to\n close the FD when the buffer is returned from HAL. This patch\n changes that to after the request is sent to HAL (or failed\n to send to HAL)\n* Cleanup inflight buffer map if the request fails to be sent to\n HAL\n* With the CL, the acquire fence FDs are now closed by\n - HalInterface::processBatchCaptureRequests if the HIDL\n processCaptureRequests call succeeds and HAL is running\n in binderized mode (for passthrough mode the FD is owned\n by HAL if the HIDL call succeeds)\n - Camera3Device::cleanupFailedRequests otherwise\n\nTest: Camera CTS tests\nBug: 132594861\nChange-Id: I5f67ae9e7b8008738bd9a24246d754a6a3669b0c\n" }, { "commit": "11648852d7e9b92d36879bb2ed6d9953751121c5", "tree": "2828a179c15a51d0eb1094a886673c9232eba764", "parents": [ "e445c2817a0996d6ced1c24e3a9d8532fd7ee51a" ], "author": { "name": "Yin-Chia Yeh", "email": "yinchiayeh@google.com", "time": "Thu May 16 10:42:54 2019 -0700" }, "committer": { "name": "Yin-Chia Yeh", "email": "yinchiayeh@google.com", "time": "Thu May 16 10:42:54 2019 -0700" }, "message": "Camera: cleanup some dead code\n\nWe no longer have code path running non-HIDL interface.\nThis cleanup also simplifies some logic needed for fixing\nb/132594861\n\nBug: 132594861\nTest: Camera CTS\nChange-Id: If15ea359a1a59c5a8e7a59818ce4db8120000bc4\n" }, { "commit": "eb99a27ffabbdf1795c063bd630f437a5d446052", "tree": "88316801946b87bd13b78bdfe65f6b4a8f6a6beb", "parents": [ "b09f621af65848cb1c9336091d857ba2a8e6fdf8", "38bbaf299649d1addcaec105417af0aeca4c2051" ], "author": { "name": "TreeHugger Robot", "email": "treehugger-gerrit@google.com", "time": "Sat May 11 01:07:26 2019 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Sat May 11 01:07:26 2019 +0000" }, "message": "Merge \"Camera: Prune depth samples with low confidence\" into qt-dev" }, { "commit": "b14e4295b2cd6aebb77d67108dc6b639f24d25d2", "tree": "2934e7eae30ff36f48c14575f39f0f7bacb09650", "parents": [ "432e0fd4a48678e34d7c63e3d9b8514d1fb08be6", "c2cba12587834d9f9b7d076d740e8abb2cca3d51" ], "author": { "name": "TreeHugger Robot", "email": "treehugger-gerrit@google.com", "time": "Fri May 10 22:35:53 2019 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Fri May 10 22:35:53 2019 +0000" }, "message": "Merge \"Camera: Add logical camera related metadata in dumpsys\" into qt-dev" }, { "commit": "38bbaf299649d1addcaec105417af0aeca4c2051", "tree": "05470f6ea595f0d78f4dc2a813fc18b74da8d80c", "parents": [ "d7f726d950aa842f7c835510d795057c97d8efb4" ], "author": { "name": "Emilian Peev", "email": "epeev@google.com", "time": "Fri May 10 12:58:18 2019 -0700" }, "committer": { "name": "Emilian Peev", "email": "epeev@google.com", "time": "Fri May 10 14:55:08 2019 -0700" }, "message": "Camera: Prune depth samples with low confidence\n\nDepth samples with low confidence can skew the\nnear/far values and impact the range inverse coding.\nAvoid using such samples when searching for the near\nand far points and clamp their values if necessary.\n\nBug: 132248813\nTest: Camera CTS\nChange-Id: I7dc134b50e46c664f9fc8750b9b9b37c416c9afe\n" }, { "commit": "c2cba12587834d9f9b7d076d740e8abb2cca3d51", "tree": "29657a65fcad27f15d13e9773185cb0fa13ad17a", "parents": [ "34a740d5360edd1f0bfd6a13b4d75667f550a512" ], "author": { "name": "Shuzhen Wang", "email": "shuzhenwang@google.com", "time": "Thu May 17 18:10:24 2018 -0700" }, "committer": { "name": "Shuzhen Wang", "email": "shuzhenwang@google.com", "time": "Fri May 10 17:57:31 2019 +0000" }, "message": "Camera: Add logical camera related metadata in dumpsys\n\nAdd below logical camera support to dumpsys:\n- Physical camera id to stream info.\n- Physical camera request/result metadata.\n- Physical camera metadata in tag monitor.\n\nAlso fixed an issue of missing vendor tags in physical metadata.\n\nTest: Run physical streams and observe dumpsys\nBug: 111940580\nChange-Id: I02889b213ff5e7ec29506c0483ef40de9d107ccb\n" }, { "commit": "c578a50c9d54e18441ffea41ce81eefbb17360ff", "tree": "c77c416a2119d2396d349ecdd4bb3c054100f0d1", "parents": [ "4714c214a0fa5a85f6f8b98c7a6c2339b6a847d1" ], "author": { "name": "Jayant Chowdhary", "email": "jchowdhary@google.com", "time": "Wed May 08 10:57:54 2019 -0700" }, "committer": { "name": "Jayant Chowdhary", "email": "jchowdhary@google.com", "time": "Wed May 08 12:56:52 2019 -0700" }, "message": "cameraservice: re-map oom_adj scores and states of native vendor clients.\n\nOverride the oom_adj scores of vendor clients from to PERCEPTIBLE_APP_ADJ.\nOverride the process state of vendor clients to to PROCESS_STATE_PERSISTENT_UI.\n\nThis is in order for app processes to take priority over vendor clients.\nFor example, this could help in the case of the default camera app and\nface auth contending for resources from the lock screen.\n\nBug: 132117718\n\nTest: manual test on lockscreen, try to double press and open camera app\n while a vendor client is connected to a contending camera device.\n\nChange-Id: Ie5fabb59c876cb02eb706f3dda8f748c69e3c063\nSigned-off-by: Jayant Chowdhary \u003cjchowdhary@google.com\u003e\n" }, { "commit": "5ee9984930753d3231f457be1bbcdba8910b7666", "tree": "cf585cf5da36f4576303ecceacf1b2d0cf0c29bc", "parents": [ "34a740d5360edd1f0bfd6a13b4d75667f550a512" ], "author": { "name": "Shuzhen Wang", "email": "shuzhenwang@google.com", "time": "Fri Apr 12 11:55:48 2019 -0700" }, "committer": { "name": "Shuzhen Wang", "email": "shuzhenwang@google.com", "time": "Mon May 06 11:32:45 2019 -0700" }, "message": "Camera: Allow out of order ZSL shutter vs regular shutter\n\nHAL ZSL request may be out-of-order compared to normal/reprocess\nrequests. Allow such case to improve shot lantecy.\n\nTest: Camera CTS, 3P camera app sanity test.\nBug: 120604717\nChange-Id: Id994efbe392094cdae694afaa2d159bc9c49d5f0\n" }, { "commit": "573a270f26d063a388eb467d381a06c94bcfe7c4", "tree": "c5ba0096a779e5ba7f8063fe2ffe5e03dc08823d", "parents": [ "e069424fbece0edd7d432d15f0078b6d4d176c1c" ], "author": { "name": "Yin-Chia Yeh", "email": "yinchiayeh@google.com", "time": "Wed Apr 17 10:08:55 2019 -0700" }, "committer": { "name": "Yin-Chia Yeh", "email": "yinchiayeh@google.com", "time": "Fri May 03 21:44:00 2019 +0000" }, "message": "Camera: clear buffer cache when stream is reconfigured\n\nAlso fix a issue for finishConfiguration is unintentionally\ndelayed till first capture request.\n\nTest: Camera CTS + partner device testing\nBug: 126390310\nChange-Id: Ibca740a7160cbf41e01884dbcef8ba51eb4c75f7\n" } ], "next": "9561db99ec348b40207765e2fea4a0e96e7843aa" }