)]}' { "log": [ { "commit": "0ec48f8587618ef385cda4d757a2c1dfdf269cf2", "tree": "43a7c19106049cf9e78afaaf5e1bbf2a2c2e35ac", "parents": [ "c482a16514091f44c4fc5623c1c24af2e7338730", "353d2e39948802eac48f2fe4329d9afd3e59a395" ], "author": { "name": "Bob Badour", "email": "bbadour@google.com", "time": "Mon Mar 01 07:54:04 2021 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Mon Mar 01 07:54:04 2021 +0000" }, "message": "Merge \"[LSC] Add LOCAL_LICENSE_KINDS to frameworks/av\" am: 353d2e3994\n\nOriginal change: https://android-review.googlesource.com/c/platform/frameworks/av/+/1609822\n\nMUST ONLY BE SUBMITTED BY AUTOMERGER\n\nChange-Id: I6a5c6b069bf1457594777637a61b0e6b5f3e04d2\n" }, { "commit": "59b2dcccdb0ab7292dd6e440fb4a9deb74ad1c75", "tree": "0043f21c35230677f884bbc05c232e19ed908f0a", "parents": [ "020dc0424b331d59e78b6b0881f3399c73acc66e" ], "author": { "name": "Bob Badour", "email": "bbadour@google.com", "time": "Fri Feb 26 03:47:28 2021 -0800" }, "committer": { "name": "Bob Badour", "email": "bbadour@google.com", "time": "Fri Feb 26 03:47:28 2021 -0800" }, "message": "[LSC] Add LOCAL_LICENSE_KINDS to frameworks/av\n\nAdded SPDX-license-identifier-Apache-2.0 to:\n media/codec2/hidl/plugin/Android.bp\n services/camera/libcameraservice/libcameraservice_fuzzer/Android.bp\n\nBug: 68860345\nBug: 151177513\nBug: 151953481\n\nTest: m all\n\nExempt-From-Owner-Approval: janitorial work\nChange-Id: I7b0377f4bedb9056ebb02caa0b3d4c5c50c86368\n" }, { "commit": "093c98404dcd552cef7c963a83781d6dc7d0aa0d", "tree": "8367de14b0c8cf3805eac362ac2689f79a30b73f", "parents": [ "7f944c9c0b1e3a12f2325bc3d9bfc95854f7355c", "8c4f38aea37b843d1a28c16a37fe2a5c7cbc1813" ], "author": { "name": "Kris Alder", "email": "kalder@google.com", "time": "Tue Feb 23 21:53:37 2021 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Tue Feb 23 21:53:37 2021 +0000" }, "message": "Merge \"Added camera_service_fuzzer\" am: 8c4f38aea3\n\nOriginal change: https://android-review.googlesource.com/c/platform/frameworks/av/+/1537224\n\nMUST ONLY BE SUBMITTED BY AUTOMERGER\n\nChange-Id: If9af06217dd104b9a41ddb09173628ff8510b0a0\n" }, { "commit": "6a08a9293b732532e98607d41a42bc06a52e8184", "tree": "a33a0ab6ffb3cf820c22f1a9ee53d2001dfaf9bb", "parents": [ "ad9882e76f9debbd2ada2b616d5f51b8908ed764", "0c3f0588700228d4d81dded56480d14857e1b2cd" ], "author": { "name": "Xin Li", "email": "delphij@google.com", "time": "Sun Feb 21 09:25:04 2021 -0800" }, "committer": { "name": "Xin Li", "email": "delphij@google.com", "time": "Sun Feb 21 09:25:04 2021 -0800" }, "message": "Merge ab/7061308 into stage.\n\nBug: 180401296\nMerged-In: Iffdea341e5cd3cc2ef82e1b9c0adf211b3c29381\nChange-Id: I9e0e28ec101bde3ee24c946e9fb5c11b1cceba64\n" }, { "commit": "8c4f38aea37b843d1a28c16a37fe2a5c7cbc1813", "tree": "761518b7a2bb3ccb1b778fc7ab980f20f4dc99e8", "parents": [ "3107a0bb93fdfb4909b4dcb27fd3b57243a2a495", "394fdf81a91f5576e9f947e98cdf8d8a6090784c" ], "author": { "name": "Kris Alder", "email": "kalder@google.com", "time": "Fri Feb 19 17:37:08 2021 +0000" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Fri Feb 19 17:37:08 2021 +0000" }, "message": "Merge \"Added camera_service_fuzzer\"" }, { "commit": "948e6aace91d16acfaa97763c7228029a1c2afe0", "tree": "e1213aacab8f21fd8bf9dcd02dbc82741013379f", "parents": [ "367398038247b09a3f92e05affac5f9b1f5e2f90" ], "author": { "name": "Bob Badour", "email": "bbadour@google.com", "time": "Fri Feb 12 21:02:31 2021 -0800" }, "committer": { "name": "Bob Badour", "email": "bbadour@google.com", "time": "Tue Feb 16 04:09:57 2021 -0800" }, "message": "[LSC] Add LOCAL_LICENSE_KINDS to frameworks/av\n\nAdded SPDX-license-identifier-Apache-2.0 to:\n apex/Android.bp\n camera/cameraserver/Android.bp\n camera/tests/Android.mk\n cmds/screenrecord/Android.bp\n cmds/stagefright/Android.mk\n drm/common/Android.bp\n drm/drmserver/Android.bp\n drm/libdrmframework/Android.bp\n drm/libdrmframework/plugins/common/util/Android.bp\n drm/libdrmframework/plugins/forward-lock/FwdLockEngine/Android.bp\n drm/libdrmframework/plugins/forward-lock/internal-format/common/Android.bp\n drm/libdrmframework/plugins/forward-lock/internal-format/converter/Android.bp\n drm/libdrmframework/plugins/forward-lock/internal-format/decoder/Android.bp\n drm/libdrmframework/plugins/passthru/Android.bp\n drm/libmediadrm/Android.bp\n drm/libmediadrm/fuzzer/Android.bp\n drm/libmediadrm/protos/Android.bp\n drm/libmediadrm/tests/Android.bp\n drm/mediacas/plugins/clearkey/Android.bp\n drm/mediacas/plugins/clearkey/tests/Android.bp\n drm/mediacas/plugins/mock/Android.bp\n drm/mediadrm/plugins/clearkey/common/Android.bp\n drm/mediadrm/plugins/clearkey/default/Android.bp\n drm/mediadrm/plugins/clearkey/default/tests/Android.bp\n drm/mediadrm/plugins/mock/Android.bp\n media/audioserver/Android.mk\n media/bufferpool/1.0/Android.bp\n media/bufferpool/1.0/vts/Android.bp\n media/bufferpool/2.0/Android.bp\n media/bufferpool/2.0/tests/Android.bp\n media/codec2/components/aac/Android.bp\n media/codec2/components/amr_nb_wb/Android.bp\n media/codec2/components/aom/Android.bp\n media/codec2/components/avc/Android.bp\n media/codec2/components/base/Android.bp\n media/codec2/components/cmds/Android.bp\n media/codec2/components/flac/Android.bp\n media/codec2/components/g711/Android.bp\n media/codec2/components/gav1/Android.bp\n media/codec2/components/gsm/Android.bp\n media/codec2/components/hevc/Android.bp\n media/codec2/components/mp3/Android.bp\n media/codec2/components/mpeg2/Android.bp\n media/codec2/components/mpeg4_h263/Android.bp\n media/codec2/components/opus/Android.bp\n media/codec2/components/raw/Android.bp\n media/codec2/components/vorbis/Android.bp\n media/codec2/components/vpx/Android.bp\n media/codec2/components/xaac/Android.bp\n media/codec2/core/Android.bp\n media/codec2/faultinjection/Android.bp\n media/codec2/fuzzer/Android.bp\n media/codec2/hidl/1.0/utils/Android.bp\n media/codec2/hidl/1.0/vts/functional/Android.bp\n media/codec2/hidl/1.0/vts/functional/audio/Android.bp\n media/codec2/hidl/1.0/vts/functional/common/Android.bp\n media/codec2/hidl/1.0/vts/functional/component/Android.bp\n media/codec2/hidl/1.0/vts/functional/master/Android.bp\n media/codec2/hidl/1.0/vts/functional/video/Android.bp\n media/codec2/hidl/1.1/utils/Android.bp\n media/codec2/hidl/client/Android.bp\n media/codec2/hidl/services/Android.bp\n media/codec2/sfplugin/Android.bp\n media/codec2/sfplugin/tests/Android.bp\n media/codec2/sfplugin/utils/Android.bp\n media/codec2/tests/Android.bp\n media/codec2/vndk/Android.bp\n media/codecs/amrnb/common/Android.bp\n media/codecs/amrnb/enc/fuzzer/Android.bp\n media/codecs/amrnb/fuzzer/Android.bp\n media/codecs/amrwb/dec/fuzzer/Android.bp\n media/codecs/amrwb/enc/Android.bp\n media/codecs/amrwb/enc/SampleCode/Android.bp\n media/codecs/amrwb/enc/fuzzer/Android.bp\n media/codecs/amrwb/enc/test/Android.bp\n media/codecs/g711/decoder/Android.bp\n media/codecs/g711/fuzzer/Android.bp\n media/codecs/m4v_h263/dec/Android.bp\n media/codecs/m4v_h263/dec/test/Android.bp\n media/codecs/m4v_h263/fuzzer/Android.bp\n media/codecs/mp3dec/fuzzer/Android.bp\n media/extractors/Android.bp\n media/extractors/aac/Android.bp\n media/extractors/amr/Android.bp\n media/extractors/flac/Android.bp\n media/extractors/fuzzers/Android.bp\n media/extractors/midi/Android.bp\n media/extractors/mkv/Android.bp\n media/extractors/mp3/Android.bp\n media/extractors/mp4/Android.bp\n media/extractors/mpeg2/Android.bp\n media/extractors/ogg/Android.bp\n media/extractors/tests/Android.bp\n media/extractors/wav/Android.bp\n media/img_utils/Android.bp\n media/libaaudio/Android.bp\n media/libaaudio/examples/Android.bp\n media/libaaudio/examples/input_monitor/Android.bp\n media/libaaudio/examples/loopback/Android.bp\n media/libaaudio/examples/write_sine/Android.bp\n media/libaaudio/src/Android.bp\n media/libaaudio/tests/Android.bp\n media/libaudioclient/Android.bp\n media/libaudioclient/tests/Android.bp\n media/libaudiofoundation/Android.bp\n media/libaudiofoundation/tests/Android.bp\n media/libaudiohal/Android.bp\n media/libaudiohal/impl/Android.bp\n media/libaudioprocessing/Android.bp\n media/libaudioprocessing/audio-resampler/Android.bp\n media/libaudioprocessing/tests/Android.bp\n media/libaudioprocessing/tests/fuzzer/Android.bp\n media/libcpustats/Android.bp\n media/libdatasource/Android.bp\n media/libeffects/config/Android.bp\n media/libeffects/downmix/Android.bp\n media/libeffects/downmix/tests/Android.bp\n media/libeffects/dynamicsproc/Android.bp\n media/libeffects/factory/Android.bp\n media/libeffects/loudness/Android.bp\n media/libeffects/lvm/benchmarks/Android.bp\n media/libeffects/lvm/lib/Android.bp\n media/libeffects/lvm/tests/Android.bp\n media/libeffects/lvm/wrapper/Android.bp\n media/libeffects/preprocessing/Android.bp\n media/libeffects/preprocessing/benchmarks/Android.bp\n media/libeffects/preprocessing/tests/Android.bp\n media/libeffects/proxy/Android.bp\n media/libeffects/visualizer/Android.mk\n media/libheif/Android.bp\n media/libmedia/Android.bp\n media/libmedia/tests/codeclist/Android.bp\n media/libmedia/xsd/Android.bp\n media/libmedia/xsd/vts/Android.bp\n media/libmediahelper/Android.bp\n media/libmediahelper/tests/Android.bp\n media/libmediametrics/Android.bp\n media/libmediaplayerservice/Android.bp\n media/libmediaplayerservice/datasource/Android.bp\n media/libmediaplayerservice/nuplayer/Android.bp\n media/libmediaplayerservice/tests/Android.bp\n media/libmediaplayerservice/tests/stagefrightRecorder/Android.bp\n media/libmediatranscoding/Android.bp\n media/libmediatranscoding/tests/Android.bp\n media/libnbaio/Android.bp\n media/libnblog/Android.bp\n media/libstagefright/Android.bp\n media/libstagefright/bqhelper/Android.bp\n media/libstagefright/bqhelper/tests/Android.bp\n media/libstagefright/codecs/aacdec/Android.bp\n media/libstagefright/codecs/aacenc/Android.bp\n media/libstagefright/codecs/amrnb/dec/Android.bp\n media/libstagefright/codecs/amrnb/enc/Android.bp\n media/libstagefright/codecs/amrwbenc/Android.bp\n media/libstagefright/codecs/avcdec/Android.bp\n media/libstagefright/codecs/avcenc/Android.bp\n media/libstagefright/codecs/common/Android.bp\n media/libstagefright/codecs/flac/dec/Android.bp\n media/libstagefright/codecs/flac/enc/Android.bp\n media/libstagefright/codecs/g711/dec/Android.bp\n media/libstagefright/codecs/gsm/dec/Android.bp\n media/libstagefright/codecs/hevcdec/Android.bp\n media/libstagefright/codecs/m4v_h263/dec/Android.bp\n media/libstagefright/codecs/m4v_h263/enc/Android.bp\n media/libstagefright/codecs/mp3dec/Android.bp\n media/libstagefright/codecs/mpeg2dec/Android.bp\n media/libstagefright/codecs/on2/dec/Android.bp\n media/libstagefright/codecs/on2/enc/Android.bp\n media/libstagefright/codecs/opus/dec/Android.bp\n media/libstagefright/codecs/raw/Android.bp\n media/libstagefright/codecs/vorbis/dec/Android.bp\n media/libstagefright/codecs/xaacdec/Android.bp\n media/libstagefright/colorconversion/Android.bp\n media/libstagefright/data/Android.bp\n media/libstagefright/filters/Android.bp\n media/libstagefright/flac/dec/Android.bp\n media/libstagefright/flac/dec/test/Android.bp\n media/libstagefright/foundation/Android.bp\n media/libstagefright/foundation/tests/AVCUtils/Android.bp\n media/libstagefright/foundation/tests/Android.bp\n media/libstagefright/foundation/tests/OpusHeader/Android.bp\n media/libstagefright/foundation/tests/colorutils/Android.bp\n media/libstagefright/http/Android.bp\n media/libstagefright/httplive/Android.bp\n media/libstagefright/id3/Android.bp\n media/libstagefright/id3/test/Android.bp\n media/libstagefright/mpeg2ts/Android.bp\n media/libstagefright/mpeg2ts/test/Android.bp\n media/libstagefright/omx/Android.bp\n media/libstagefright/omx/tests/Android.bp\n media/libstagefright/rtsp/Android.bp\n media/libstagefright/tests/Android.bp\n media/libstagefright/tests/ESDS/Android.bp\n media/libstagefright/tests/HEVC/Android.bp\n media/libstagefright/tests/extractorFactory/Android.bp\n media/libstagefright/tests/fuzzers/Android.bp\n media/libstagefright/tests/mediacodec/Android.bp\n media/libstagefright/tests/metadatautils/Android.bp\n media/libstagefright/tests/writer/Android.bp\n media/libstagefright/timedtext/Android.bp\n media/libstagefright/timedtext/test/Android.bp\n media/libstagefright/webm/Android.bp\n media/libstagefright/webm/tests/Android.bp\n media/libstagefright/writer_fuzzers/Android.bp\n media/libstagefright/xmlparser/Android.bp\n media/libstagefright/xmlparser/test/Android.bp\n media/libstagefright/xmlparser/vts/Android.bp\n media/libwatchdog/Android.bp\n media/mediaserver/Android.bp\n media/mtp/Android.bp\n media/mtp/tests/Android.bp\n media/tests/benchmark/Android.bp\n media/tests/benchmark/MediaBenchmarkTest/Android.bp\n media/tests/benchmark/MediaBenchmarkTest/src/main/cpp/Android.bp\n media/tests/benchmark/src/native/common/Android.bp\n media/tests/benchmark/src/native/decoder/Android.bp\n media/tests/benchmark/src/native/encoder/Android.bp\n media/tests/benchmark/src/native/extractor/Android.bp\n media/tests/benchmark/src/native/muxer/Android.bp\n media/tests/benchmark/tests/Android.bp\n media/utils/Android.bp\n media/utils/fuzzers/Android.bp\n services/audioflinger/Android.bp\n services/audiopolicy/Android.bp\n services/audiopolicy/common/Android.bp\n services/audiopolicy/common/managerdefinitions/Android.bp\n services/audiopolicy/config/Android.bp\n services/audiopolicy/engine/common/Android.bp\n services/audiopolicy/engine/config/Android.bp\n services/audiopolicy/engine/interface/Android.bp\n services/audiopolicy/engineconfigurable/Android.bp\n services/audiopolicy/engineconfigurable/config/Android.bp\n services/audiopolicy/engineconfigurable/config/example/automotive/Android.bp\n services/audiopolicy/engineconfigurable/config/example/caremu/Android.bp\n services/audiopolicy/engineconfigurable/config/example/phone/Android.bp\n services/audiopolicy/engineconfigurable/parameter-framework/Android.bp\n services/audiopolicy/engineconfigurable/parameter-framework/plugin/Android.bp\n services/audiopolicy/engineconfigurable/tools/Android.bp\n services/audiopolicy/engineconfigurable/wrapper/Android.bp\n services/audiopolicy/enginedefault/Android.bp\n services/audiopolicy/enginedefault/config/example/Android.bp\n services/audiopolicy/manager/Android.mk\n services/audiopolicy/managerdefault/Android.bp\n services/audiopolicy/service/Android.mk\n services/audiopolicy/tests/Android.bp\n services/camera/libcameraservice/Android.bp\n services/camera/libcameraservice/fuzzer/Android.bp\n services/camera/libcameraservice/tests/Android.mk\n services/mediacodec/Android.bp\n services/mediacodec/registrant/Android.bp\n services/mediaextractor/Android.bp\n services/medialog/Android.bp\n services/medialog/fuzzer/Android.bp\n services/mediametrics/Android.bp\n services/mediametrics/benchmarks/Android.bp\n services/mediametrics/fuzzer/Android.bp\n services/mediametrics/tests/Android.bp\n services/mediaresourcemanager/Android.bp\n services/mediaresourcemanager/fuzzer/Android.bp\n services/mediaresourcemanager/test/Android.bp\n services/mediatranscoding/Android.bp\n services/mediatranscoding/tests/Android.bp\n services/minijail/Android.bp\n services/oboeservice/Android.bp\n\nAdded SPDX-license-identifier-Apache-2.0 SPDX-license-identifier-BSD to:\n media/codecs/amrnb/dec/Android.bp\n media/codecs/amrnb/dec/test/Android.bp\n media/codecs/amrnb/enc/Android.bp\n media/codecs/amrnb/enc/test/Android.bp\n media/codecs/amrwb/dec/Android.bp\n media/codecs/amrwb/dec/test/Android.bp\n media/codecs/m4v_h263/enc/Android.bp\n media/codecs/m4v_h263/enc/test/Android.bp\n media/codecs/mp3dec/Android.bp\n media/codecs/mp3dec/test/Android.bp\n\nAdded SPDX-license-identifier-Apache-2.0 SPDX-license-identifier-BSD\n SPDX-license-identifier-MIT SPDX-license-identifier-Unicode-DFS\n legacy_by_exception_only\nto:\n Android.bp\n\nAdded SPDX-license-identifier-Apache-2.0 SPDX-license-identifier-MIT\n SPDX-license-identifier-Unicode-DFS\nto:\n apex/testing/Android.bp\n camera/Android.bp\n camera/ndk/Android.bp\n media/ndk/Android.bp\n services/audiopolicy/engineconfigurable/parameter-framework/examples/Car/Android.bp\n services/audiopolicy/engineconfigurable/parameter-framework/examples/CarEmu/Android.bp\n services/audiopolicy/engineconfigurable/parameter-framework/examples/Phone/Android.bp\n services/audiopolicy/engineconfigurable/parameter-framework/examples/SettingsNoInput/Android.bp\n services/audiopolicy/engineconfigurable/parameter-framework/examples/SettingsNoOutput/Android.bp\n services/audiopolicy/tests/resources/Android.bp\n\nAdded SPDX-license-identifier-Apache-2.0 legacy_by_exception_only\nto:\n drm/mediadrm/plugins/clearkey/hidl/Android.bp\n\nBug: 68860345\nBug: 151177513\nBug: 151953481\n\nTest: m all\n\nExempt-From-Owner-Approval: janitorial work\n\nChange-Id: I8360756b326b891b56629127091540310851c941\nMerged-in: Ic169757d64ad8da7eebd0e1febdcbfb467fe81f4\nMerged-in: Ifa3fefe5dc12229e8043a54ffd1f3958d6b02310\nMerged-in: I1e32081a069c4c1b25aa200dcdb165c0feb07b8a\nMerged-in: Ib2050becaf89b8e4db5867bc601dedeb4eb8ebd2\nMerged-in: I5a4d51fb1244ed49bcd70e446aaa26e2aa8ed7b1\n" }, { "commit": "394fdf81a91f5576e9f947e98cdf8d8a6090784c", "tree": "60b4700f7da9af77583f7823b47f715811236852", "parents": [ "a6ccc1881c266cb9486b1dc4ae1233d6b63107ad" ], "author": { "name": "Ayushi Khopkar", "email": "ayushi.khopkar@ittiam.com", "time": "Fri Dec 25 17:39:49 2020 +0530" }, "committer": { "name": "Ayushi Khopkar", "email": "ayushi.khopkar@ittiam.com", "time": "Thu Jan 28 15:31:32 2021 +0530" }, "message": "Added camera_service_fuzzer\n\nTest: ./camera_service_fuzzer\nBug: 174737048\n\nChange-Id: Idedd6112efbfc9127d162ec4a1145661f6775a0a\n" }, { "commit": "2610b34be2f01c7f3a96e98e257d3d690a1eef28", "tree": "403e86834368a7af7f10b599fead99cef5f7e3b2", "parents": [ "b208216c0dad0b587c7ec680b96049dcb81d99a0", "f7057ca95ee4f70a0199592761fbf8235a1855c2" ], "author": { "name": "Treehugger Robot", "email": "treehugger-gerrit@google.com", "time": "Mon Jan 25 20:45:52 2021 +0000" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Mon Jan 25 20:45:52 2021 +0000" }, "message": "Merge \"Camera: fix wrong metadata pointer\"" }, { "commit": "f7057ca95ee4f70a0199592761fbf8235a1855c2", "tree": "ce45b24eb01a1fdfd3ad13e49dbeef0b854a87fe", "parents": [ "b96da7539c8bb6c89e43d1c34b2a7cf89ebaa0fc" ], "author": { "name": "Yin-Chia Yeh", "email": "yinchiayeh@google.com", "time": "Mon Nov 16 14:11:40 2020 -0800" }, "committer": { "name": "Yin-Chia Yeh", "email": "yinchiayeh@google.com", "time": "Mon Jan 25 18:46:13 2021 +0000" }, "message": "Camera: fix wrong metadata pointer\n\nFixed the issue when halRequest-\u003esettings is nullptr some\ninflight request calculation is wrong.\n\nTest: partner testing\nBug: 169310293\nChange-Id: Iccbf0c543299065d8beac79f4e5c87e4514fceba\n" }, { "commit": "99da7fc6dae0ae90f4ef5d527b0db78b9c65efa5", "tree": "90ad9124bc2d91b078825b1d6767f10777f84431", "parents": [ "666f0b36be4cf032ed2aca375e4cbb3b46f1004e", "aab6038b83f5101b487cb2ba162d84e8ba7c304b" ], "author": { "name": "TreeHugger Robot", "email": "treehugger-gerrit@google.com", "time": "Fri Dec 11 04:17:21 2020 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Fri Dec 11 04:17:21 2020 +0000" }, "message": "Merge \"Camera: Remove app segment stream\u0027s locked buffer tracking\" into rvc-qpr-dev am: aab6038b83\n\nOriginal change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/av/+/13084269\n\nMUST ONLY BE SUBMITTED BY AUTOMERGER\n\nChange-Id: If4bcb14e999d9f6f1614d48e3b613e6c3e5ca3bc\n" }, { "commit": "aab6038b83f5101b487cb2ba162d84e8ba7c304b", "tree": "de90f35e8c2aab92bab4418b61069cecdf32f079", "parents": [ "abe2569e0429cd90c4189b460fc377cfbec7daed", "6b97414787adcadb88d7b7ede90f787a7c7dcb2d" ], "author": { "name": "TreeHugger Robot", "email": "treehugger-gerrit@google.com", "time": "Fri Dec 11 03:48:16 2020 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Fri Dec 11 03:48:16 2020 +0000" }, "message": "Merge \"Camera: Remove app segment stream\u0027s locked buffer tracking\" into rvc-qpr-dev" }, { "commit": "6b97414787adcadb88d7b7ede90f787a7c7dcb2d", "tree": "f8a54db73d4f7163868d5d5a94d69bd5a98e54ea", "parents": [ "e0a387421fab08b47352f09c60744747b5b624e4" ], "author": { "name": "Shuzhen Wang", "email": "shuzhenwang@google.com", "time": "Wed Nov 18 16:37:45 2020 -0800" }, "committer": { "name": "Shuzhen Wang", "email": "shuzhenwang@google.com", "time": "Thu Dec 10 18:14:40 2020 +0000" }, "message": "Camera: Remove app segment stream\u0027s locked buffer tracking\n\nThe app segment CpuConsumer\u0027s max locked buffer count is already\nenforced by the buffer queue. No need to monitor the locked buffer count\nseparately.\n\nIn case we are exceeding the max locked buffer count, the lockBuffer()\ncall returns failure, so further app segment processing will be deferred.\n\nTest: vendor testing\nBug: 173583542\nChange-Id: I02522bcc695ee00ac4ee48df4cfd76ce35522cb9\nMerged-In: I02522bcc695ee00ac4ee48df4cfd76ce35522cb9\n" }, { "commit": "260cc57e41e68e5c42a3ce8ed76d7f3e7a5f3490", "tree": "031059dd7bad48b1086679f4fad51839eadab212", "parents": [ "3cbeba827d39bc2e6c9c35ad522d5133547acbe6", "515de614767603d15d0825030079821385acdade" ], "author": { "name": "TreeHugger Robot", "email": "treehugger-gerrit@google.com", "time": "Thu Dec 03 16:56:28 2020 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Thu Dec 03 16:56:28 2020 +0000" }, "message": "Merge \"Camera: Document behavior when cropRegion and zoomRation conflict\" into rvc-qpr-dev am: 515de61476\n\nOriginal change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/av/+/13149080\n\nChange-Id: I086292bc6cc399cf6eed413659fc6446fcb67846\n" }, { "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": "c2dae590b622a309d25aae958723441d35dbffd7", "tree": "e06378ff8ed41e7dabba8535e73617a8a953ef2f", "parents": [ "763b935ef71fbe678d9c402b2c9f6cbefbdb68f6" ], "author": { "name": "Shuzhen Wang", "email": "shuzhenwang@google.com", "time": "Mon Nov 30 20:16:06 2020 -0800" }, "committer": { "name": "Shuzhen Wang", "email": "shuzhenwang@google.com", "time": "Tue Dec 01 09:45:03 2020 -0800" }, "message": "Camera: Document behavior when cropRegion and zoomRation conflict\n\nIn case cropRegion \u003d\u003d windowboxing and zoomRatio !\u003d 1.0f, specify the\ncamera framework behavior of overriding cropRegion.\n\nTest: CaptureRequestTest#testZoomRatio\nBug: 172873869\nChange-Id: I9f3f51bca431841feacb4b2cce702dea179bacb9\n" }, { "commit": "4bf4af8a605a1b84d8e4795ccbf17f122fc8ae4a", "tree": "2f04116a2a6817826c2f6210af2ab6c6fcd8d978", "parents": [ "4bdc8012ddc888e7a23f931b01ee550c11a1c93a", "c1e1c7400bfec8dbe727d48107bfca8c275a66dd" ], "author": { "name": "Treehugger Robot", "email": "treehugger-gerrit@google.com", "time": "Sat Nov 14 02:33:07 2020 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Sat Nov 14 02:33:07 2020 +0000" }, "message": "Merge \"Add componentid for fuzzers\" am: 82fa8db39f am: fc30eb4813 am: c1e1c7400b\n\nOriginal change: https://android-review.googlesource.com/c/platform/frameworks/av/+/1498201\n\nChange-Id: I7be457008d8a67dc74aab19730bffba180af2d33\n" }, { "commit": "c1e1c7400bfec8dbe727d48107bfca8c275a66dd", "tree": "57feb547614b0c45f975582f43ce913a2c710ff9", "parents": [ "77aaf7a96ad0facd18f8c827cfed8f4423792de3", "fc30eb4813b5d6d51a4262cdc42e6658a45a38df" ], "author": { "name": "Treehugger Robot", "email": "treehugger-gerrit@google.com", "time": "Sat Nov 14 02:03:17 2020 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Sat Nov 14 02:03:17 2020 +0000" }, "message": "Merge \"Add componentid for fuzzers\" am: 82fa8db39f am: fc30eb4813\n\nOriginal change: https://android-review.googlesource.com/c/platform/frameworks/av/+/1498201\n\nChange-Id: If850388bb728337b9ef186111c72189f49929b6a\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": "2d2e3c8b588ac061f190e9d6d855c823d9a2fa0c", "tree": "f70093fd262b9677963a9e4a8197004f1778ed56", "parents": [ "91a6def18bdde236ad9a162eecea40e60e092772", "110e3572fecea3794f6fadf1e36d3891ccac0146" ], "author": { "name": "Branden Archer", "email": "brarcher@google.com", "time": "Fri Nov 13 08:25:41 2020 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Fri Nov 13 08:25:41 2020 +0000" }, "message": "Merge \"Add fuzzer for DepthPhotoProcessor\" am: e430d28c34 am: b1c8d8e5a4 am: 110e3572fe\n\nOriginal change: https://android-review.googlesource.com/c/platform/frameworks/av/+/1478696\n\nChange-Id: I4f47cfec1619525527eea0f30a63ffb5e13388e7\n" }, { "commit": "91a6def18bdde236ad9a162eecea40e60e092772", "tree": "a404748eba2808c0f26f69703bfca2e3fc9f123b", "parents": [ "7889b8b459d037fdd248222ecf768a3aa1e05749", "253cab9a2ea2de068daae7c41990f18612bf8bdf" ], "author": { "name": "Treehugger Robot", "email": "treehugger-gerrit@google.com", "time": "Fri Nov 13 08:25:10 2020 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Fri Nov 13 08:25:10 2020 +0000" }, "message": "Merge \"Add fuzzer for DistortionMapperFuzzer\" am: bb069027e4 am: 0e517d92f2 am: 253cab9a2e\n\nOriginal change: https://android-review.googlesource.com/c/platform/frameworks/av/+/1481582\n\nChange-Id: Ia14ef40bc44f912aec19a5d068a53377fa5381cc\n" }, { "commit": "110e3572fecea3794f6fadf1e36d3891ccac0146", "tree": "c89fc27c6f39ae400f543deb37dc0c3f0d1ba6fe", "parents": [ "253cab9a2ea2de068daae7c41990f18612bf8bdf", "b1c8d8e5a45432fe2fe4f455cac519df883dee73" ], "author": { "name": "Branden Archer", "email": "brarcher@google.com", "time": "Fri Nov 13 08:08:09 2020 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Fri Nov 13 08:08:09 2020 +0000" }, "message": "Merge \"Add fuzzer for DepthPhotoProcessor\" am: e430d28c34 am: b1c8d8e5a4\n\nOriginal change: https://android-review.googlesource.com/c/platform/frameworks/av/+/1478696\n\nChange-Id: Ibe7ccbc0af46451c1e355ad982741681a3b7b831\n" }, { "commit": "253cab9a2ea2de068daae7c41990f18612bf8bdf", "tree": "75206ca5e2bee56db27a84abc39148b0eac396c8", "parents": [ "b409569772524fbcc5ccd7307774895fb8b6cc43", "0e517d92f27d7e2159bc01bd5c95ff5f252b75a1" ], "author": { "name": "Treehugger Robot", "email": "treehugger-gerrit@google.com", "time": "Fri Nov 13 08:07:50 2020 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Fri Nov 13 08:07:50 2020 +0000" }, "message": "Merge \"Add fuzzer for DistortionMapperFuzzer\" am: bb069027e4 am: 0e517d92f2\n\nOriginal change: https://android-review.googlesource.com/c/platform/frameworks/av/+/1481582\n\nChange-Id: Ia553036ea653f8b12240ad9ca4fc0fdbed030221\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": "c894f7ffde650e6877101df8623fe3aa63bb16b4", "tree": "6f35e15e67dd6ab5b77cf98da7c1aee0f467b602", "parents": [ "2e53a20fea1c596aad48a390cce82ffd693407dd", "a0020f9af7c60332248bf4f4cbaf8b3ccba7331c" ], "author": { "name": "Jayant Chowdhary", "email": "jchowdhary@google.com", "time": "Fri Sep 25 22:42:39 2020 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Fri Sep 25 22:42:39 2020 +0000" }, "message": "Merge \"Camera: Fix deadlock caused by ordering of mStatusLock and mCameraStatesLock.\" am: 9fb67351a9 am: bd8b8c172c am: a0020f9af7\n\nOriginal change: https://android-review.googlesource.com/c/platform/frameworks/av/+/1438091\n\nChange-Id: I637a79e24e1e97cbb0378912ff513fff582eef99\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": "ff30ed79d2c4715e355824980c4978c066ebf177", "tree": "38aeea79df0f997d00dec8dbdbff5b6badabf56c", "parents": [ "818e657599a6aa2b1bdfe0d16d98db37dca6ed7b", "e75114727d73502257ef503451453c6f85ded175" ], "author": { "name": "Yin-Chia Yeh", "email": "yinchiayeh@google.com", "time": "Fri Aug 28 19:24:10 2020 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Fri Aug 28 19:24:10 2020 +0000" }, "message": "Camera: fix wrong signalStreamFlush call am: e75114727d\n\nOriginal change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/av/+/12480929\n\nChange-Id: I57927fb97bad116b2f27d3f92e5085a5626d3262\n" }, { "commit": "e75114727d73502257ef503451453c6f85ded175", "tree": "e440b3f5a2e0b7663bb16d4c197c8b9a85079fb6", "parents": [ "1a342950d36668c89c7f72488a478506849c3370" ], "author": { "name": "Yin-Chia Yeh", "email": "yinchiayeh@google.com", "time": "Tue Jul 28 00:17:58 2020 -0700" }, "committer": { "name": "Xin Li", "email": "delphij@google.com", "time": "Fri Aug 28 15:36:33 2020 +0000" }, "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(cherry picked from commit e52b8fa8fabd74555dd1ebb2e9405460a545a919)\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" } ], "next": "12c7ec759a2629c2b11861ec89fd8a3bef778d39" }