summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2021-11-12Snap for 7906314 from 90744053bb00cdf08b647e806ff60caa139152ab to sc-d2-releaseandroid-12.1.0_r26android-12.1.0_r25android-12.1.0_r24android-12.1.0_r23android-12.1.0_r18android-12.1.0_r17android-12.1.0_r16android-12.1.0_r15android-12.1.0_r14android-12.1.0_r13android-12.1.0_r12android12L-d2-s8-releaseandroid12L-d2-s7-releaseandroid12L-d2-s6-releaseandroid12L-d2-s5-releaseandroid12L-d2-s4-releaseandroid12L-d2-s3-releaseandroid12L-d2-s2-releaseandroid12L-d2-s1-releaseandroid12L-d2-releaseAndroid Build Coastguard Worker
Change-Id: I03b443d2c1d03a7268baa8c54cb5540b40a1f485
2021-11-09AOSP/Camera2: check system feature instead of actual camera deviceandroid-12.1.0_r9android-12.1.0_r8android-12.1.0_r7android-12.1.0_r22android-12.1.0_r21android-12.1.0_r20android-12.1.0_r19android-12.1.0_r11android-12.1.0_r10android12L-devandroid12-qpr3-s7-releaseandroid12-qpr3-s6-releaseandroid12-qpr3-s5-releaseandroid12-qpr3-s4-releaseandroid12-qpr3-s3-releaseandroid12-qpr3-s2-releaseandroid12-qpr3-s1-releaseandroid12-qpr3-releaseHung-ying Tyan
It is not reliable to check the actual camera devices at boot complete as camera devices may be created after the boot-complete event. Check the system features instead. Bug: 198371493 Bug: 203729113 Test: build aosp_$pixel, reboot, check the app, check log Change-Id: I5581621fed8244f6d19554be00f2c6543799dc92 Merged-In: I5581621fed8244f6d19554be00f2c6543799dc92 (cherry picked from commit addad94cce6823f386b539c0ee8e4b28926215d1)
2021-04-29Merge "Camera2: Migrate recording path to scoped storage" am: 6fef1744b3 am: ↵Treehugger Robot
c9dd457731 am: 58884f385b am: d45b595019 Original change: https://android-review.googlesource.com/c/platform/packages/apps/Camera2/+/1690087 Change-Id: Idd5a070e0c2e9632e9e5f8dc04ad45e267862d52
2021-04-29Merge "Camera2: Migrate recording path to scoped storage" am: 6fef1744b3 am: ↵android-12.0.0_r32android-12.0.0_r29android-12.0.0_r28android-12.0.0_r27android-12.0.0_r26android-12.0.0_r21android-12.0.0_r20android-12.0.0_r19android-12.0.0_r18android-12.0.0_r16android12-qpr1-releaseandroid12-qpr1-d-s3-releaseandroid12-qpr1-d-s2-releaseandroid12-qpr1-d-s1-releaseandroid12-qpr1-d-releaseandroid12-devTreehugger Robot
c9dd457731 am: 58884f385b Original change: https://android-review.googlesource.com/c/platform/packages/apps/Camera2/+/1690087 Change-Id: Iad85f7f2b7a84e640f5a6ec1599a32192ada910e
2021-04-29Merge "Camera2: Migrate recording path to scoped storage" am: 6fef1744b3 am: ↵Treehugger Robot
c9dd457731 Original change: https://android-review.googlesource.com/c/platform/packages/apps/Camera2/+/1690087 Change-Id: I6b594efb1867ea84e2f3764f50d80686adfb94a9
2021-04-29Merge "Camera2: Migrate recording path to scoped storage" am: 6fef1744b3Treehugger Robot
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Camera2/+/1690087 Change-Id: Id8166a2915005ef975a6684153f4a53ebb1d7389
2021-04-29Merge "Camera2: Migrate recording path to scoped storage"android-s-beta-2android-s-beta-1Treehugger Robot
2021-04-29Camera2: Migrate recording path to scoped storageShuzhen Wang
Use ContentResolver to store recorded video rather than using the app-specific storage. Test: Use Camera2 to record video, and verify using filmstrip/gallery Test: Camera Intents CtsVerifier test Bug: 185077726 Change-Id: I85e3d67c6ecb25869325f83250d872020aaa17cd
2021-04-21Merge "[LSC] Add LOCAL_LICENSE_KINDS to packages/apps/Camera2" am: ↵Treehugger Robot
df29d3b494 am: 4870a60b6c am: e948eba8a8 am: 94388cfc18 Original change: https://android-review.googlesource.com/c/platform/packages/apps/Camera2/+/1682288 Change-Id: I60532e361bb4a598238d6fe22a1a5ea020dd0e5c
2021-04-21Merge "[LSC] Add LOCAL_LICENSE_KINDS to packages/apps/Camera2" am: ↵Treehugger Robot
df29d3b494 am: 4870a60b6c am: e948eba8a8 Original change: https://android-review.googlesource.com/c/platform/packages/apps/Camera2/+/1682288 Change-Id: Ia39b2b6fe2838995270817e215f0be4a4be7f123
2021-04-21Merge "[LSC] Add LOCAL_LICENSE_KINDS to packages/apps/Camera2" am: ↵Treehugger Robot
df29d3b494 am: 4870a60b6c Original change: https://android-review.googlesource.com/c/platform/packages/apps/Camera2/+/1682288 Change-Id: Ib16c5a1cc208f9d878ce913e92573cc8369689ed
2021-04-21Merge "[LSC] Add LOCAL_LICENSE_KINDS to packages/apps/Camera2" am: df29d3b494Treehugger Robot
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Camera2/+/1682288 Change-Id: I226dd926c6e7b12eec4b98634103d26166f4a6c2
2021-04-21Merge "[LSC] Add LOCAL_LICENSE_KINDS to packages/apps/Camera2"Treehugger Robot
2021-04-20[LSC] Add LOCAL_LICENSE_KINDS to packages/apps/Camera2Bob Badour
Added SPDX-license-identifier-Apache-2.0 to: Android.mk tests/Android.mk Bug: 68860345 Bug: 151177513 Bug: 151953481 Test: m all Exempt-From-Owner-Approval: janitorial work Change-Id: Ia2923ca12ac97066d3021c053b114b15b537e704
2021-03-15Merge "Add <uses-library> information." am: e0b1380c2b am: f5f9ea7752 am: ↵Treehugger Robot
93b7776d9d Original change: https://android-review.googlesource.com/c/platform/packages/apps/Camera2/+/1628719 Change-Id: I603863f1d6b202c1c8b459cdfa3f43458114a1ef
2021-03-15Merge "Add <uses-library> information." am: e0b1380c2b am: f5f9ea7752Treehugger Robot
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Camera2/+/1628719 Change-Id: I2a2b2fddac119943acf4301fc18e4f44e4e9719c
2021-03-15Merge "Add <uses-library> information." am: e0b1380c2bTreehugger Robot
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Camera2/+/1628719 Change-Id: I2f7ce32f2bbfd4d77655d420360aa5c4d7794bdb
2021-03-15Merge "Add <uses-library> information."Treehugger Robot
2021-03-11Add <uses-library> information.Ulya Trafimovich
Camera2 app uses non-optional "org.apache.http.legacy" library. It is necessary to add this information to LOCAL_USES_LIBRARIES to pass manifest_check and generate correct class loader context for dexpreopt. Bug: 132357300 Test: m out/target/common/obj/APPS/Camera2_intermediates/enforce_uses_libraries.status Test: lunch aosp_cf_x86_64_phone-userdebug && m && launch_cvd \ adb wait-for-device && adb root && adb logcat \ | grep -E 'ClassLoaderContext [a-z ]+ mismatch' # no mismatch error messages related to Camera2 Change-Id: I39c1b30a59f172fb865ddde6003f9761a1889c80
2021-02-20[automerger skipped] Mark ab/7061308 as merged in stage. am: f3707cc57b -s ↵Xin Li
ours am: 0aebd3227e -s ours am skip reason: Change-Id I10acabb20d947be90b6935d0fdd8c5c343898240 with SHA-1 5392c5ad18 is in history Original change: undetermined MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I53d0ede704c4dd9527a01c250fcf3b3ec9c0e9fa
2021-02-20Merge "[LSC] Add LOCAL_LICENSE_KINDS to packages/apps/Camera2" am: ↵Bob Badour
dc05b79521 am: 7649cf177a am: 96552a5e0c Original change: https://android-review.googlesource.com/c/platform/packages/apps/Camera2/+/1588489 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I79ffa72d82c225a6fdaff948d5ba1915154fd48a
2021-02-20[automerger skipped] Mark ab/7061308 as merged in stage. am: f3707cc57b -s oursXin Li
am skip reason: Change-Id I10acabb20d947be90b6935d0fdd8c5c343898240 with SHA-1 5392c5ad18 is in history Original change: undetermined MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I18e87494313d8430d82ae12e19142ecc591729ce
2021-02-20Mark ab/7061308 as merged in stage.Xin Li
Bug: 180401296 Merged-In: I10acabb20d947be90b6935d0fdd8c5c343898240 Change-Id: Ie197f8fdf8d616619de71ad75c4bfbe642b900f2
2021-02-19Merge "[LSC] Add LOCAL_LICENSE_KINDS to packages/apps/Camera2" am: ↵Bob Badour
dc05b79521 am: 7649cf177a Original change: https://android-review.googlesource.com/c/platform/packages/apps/Camera2/+/1588489 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Ia3c8f702216f55a0b2f3b00dfe0542ad364cba70
2021-02-19Merge "[LSC] Add LOCAL_LICENSE_KINDS to packages/apps/Camera2" am: dc05b79521Bob Badour
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Camera2/+/1588489 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Id583cc2a5466eab4905cc1aeb8965237473dd96e
2021-02-18Merge "[LSC] Add LOCAL_LICENSE_KINDS to packages/apps/Camera2"Bob Badour
2021-02-12[LSC] Add LOCAL_LICENSE_KINDS to packages/apps/Camera2Bob Badour
Added SPDX-license-identifier-Apache-2.0 to: jni/Android.mk Bug: 68860345 Bug: 151177513 Bug: 151953481 Test: m all Exempt-From-Owner-Approval: janitorial work Change-Id: If6a4c8cd24c0c8f951b6558bacb7e9fa075f4587
2020-11-23Mark ab/6881855 as merged am: db25a9a782 am: 5392c5ad18Xin Li
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Camera2/+/13113001 Change-Id: Ie230aa54a0dc5412d63a7861d369d8c0a7e8c38e
2020-11-23Mark ab/6881855 as merged am: db25a9a782Xin Li
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Camera2/+/13113001 Change-Id: I10acabb20d947be90b6935d0fdd8c5c343898240
2020-11-23Mark ab/6881855 as mergedandroid-s-preview-1Xin Li
Bug: 172690556 Change-Id: Ie124ce16dae24d5121c5bfdc733bc442f8de923d
2020-11-08Revert "Camera2: add prop to support no audio camera recording"Zhijun He
This reverts commit 74a9d8bc41cead9a89c479a24e8af5cac92de60a. Test: Build Bug: 172748069 Change-Id: I76090e9d2527abdd395bcedff81d7f30e56764ab
2020-11-07Merge sc-d1-dev 6958804 into master.Bill Rassieur
Change-Id: I910291e8dca025fc0ba07c632f4f6a6f2ff6425f BUG:171916167
2020-10-10Merge "Remove Help & Feedback option with absent implementation" am: ↵Treehugger Robot
444195c51d am: cc987aee81 am: 381d0ee293 am: 467ad78f1a am: f6cfa82098 Original change: https://android-review.googlesource.com/c/platform/packages/apps/Camera2/+/1455284 Change-Id: I3d351726a37263b936c46abaf7022a9f5ef2464d
2020-10-09Merge "Remove Help & Feedback option with absent implementation" am: ↵Treehugger Robot
444195c51d am: cc987aee81 am: 381d0ee293 am: 467ad78f1a Original change: https://android-review.googlesource.com/c/platform/packages/apps/Camera2/+/1455284 Change-Id: I73041586058c38a544c4d865f0676546f08aace7
2020-10-09Merge "Remove Help & Feedback option with absent implementation" am: ↵Treehugger Robot
444195c51d am: cc987aee81 am: 381d0ee293 Original change: https://android-review.googlesource.com/c/platform/packages/apps/Camera2/+/1455284 Change-Id: I3430676f7e9a5cb615aa37a90e23f1066d9cec07
2020-10-09Merge "Remove Help & Feedback option with absent implementation" am: ↵Treehugger Robot
444195c51d am: cc987aee81 Original change: https://android-review.googlesource.com/c/platform/packages/apps/Camera2/+/1455284 Change-Id: I6705482a1f769d188b6cc74e3aa115cd809a58da
2020-10-09Merge "Remove Help & Feedback option with absent implementation" am: 444195c51dTreehugger Robot
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Camera2/+/1455284 Change-Id: Ia807d95bb12781082de7a050ef0dd2f7275c9533
2020-10-09Merge "Remove Help & Feedback option with absent implementation"Treehugger Robot
2020-10-09Remove Help & Feedback option with absent implementationEmilian Peev
The "Help & Feedback" menu option in the camera settings menu was never implemented and can be confusing to users. Bug: 169469748 Test: Manual using camera application Change-Id: I999314bef677c2966338ca22369810fc1cd948a3
2020-10-09[automerger skipped] Skip ab/6749736 in stage. am: 9e04ce7d66 -s ours am: ↵Xin Li
9a5211fcdc -s ours am: 7641634c69 -s ours am: 23e1596186 -s ours am skip reason: Change-Id I5aa308a65023521d6e35228754e0570a7083acb4 with SHA-1 e52e79c058 is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Camera2/+/12797208 Change-Id: I105b210346329107cbe97a2701d89bacd664d72c
2020-10-09[automerger skipped] Skip ab/6749736 in stage. am: 9e04ce7d66 -s ours am: ↵Xin Li
9a5211fcdc -s ours am: 7641634c69 -s ours am skip reason: Change-Id I5aa308a65023521d6e35228754e0570a7083acb4 with SHA-1 e52e79c058 is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Camera2/+/12797208 Change-Id: I3079c1fd32529b83290db0ab72410dcbe007ae29
2020-10-09[automerger skipped] Skip ab/6749736 in stage. am: 9e04ce7d66 -s ours am: ↵Xin Li
9a5211fcdc -s ours am skip reason: Change-Id I5aa308a65023521d6e35228754e0570a7083acb4 with SHA-1 e52e79c058 is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Camera2/+/12797208 Change-Id: I473b3529de3570b2a69dfc3b38f3d5febdeab9e3
2020-10-09[automerger skipped] Skip ab/6749736 in stage. am: 9e04ce7d66 -s oursXin Li
am skip reason: Change-Id I5aa308a65023521d6e35228754e0570a7083acb4 with SHA-1 e52e79c058 is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Camera2/+/12797208 Change-Id: Ic115aa9e69ea696b668699482614b08f6f5332de
2020-10-08Skip ab/6749736 in stage.Xin Li
Merged-In: I5aa308a65023521d6e35228754e0570a7083acb4 Change-Id: I2baa5b285321c6e9cc99317a884d8885cdc4e442
2020-09-14Merge "Camera: Avoid enabling unsupported CAF modes during image capture" ↵TreeHugger Robot
into rvc-dev am: 1a463d7444 am: 4f20d68fa5 am: 46e75e3494 Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Camera2/+/11707502 Change-Id: I7a37dc2b496a9c67f45dfd9b26d7384e7c88e194
2020-09-13Add external camera support am: d66d2cfcf2 am: 1c67d942b1 am: 8a8d63dd97Patrick Pun
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Camera2/+/11604391 Change-Id: Id46f797859277d76086831090e2ca34599b94cdc
2020-09-13Merge "Camera: Avoid enabling unsupported CAF modes during image capture" ↵TreeHugger Robot
into rvc-dev am: 1a463d7444 am: 4f20d68fa5 Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Camera2/+/11707502 Change-Id: I5ca27620f32983d4e5ad3c5c09612371fc2d14b0
2020-09-13Add external camera support am: d66d2cfcf2 am: 1c67d942b1Patrick Pun
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Camera2/+/11604391 Change-Id: Ib831c3a6c56d86c3dc98f6e0e4ec0afe8ec1b31d
2020-09-13Merge "Camera2: Set appropriate template for pre-capture" into rvc-dev am: ↵TreeHugger Robot
86f6fed52c am: 4ccaf4124f am: c8dfec60a6 Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Camera2/+/11311653 Change-Id: I22c054c1364c55ce6b8c61f3aa6936b725d03c4e
2020-09-13Merge "Camera2: Set appropriate template for pre-capture" into rvc-dev am: ↵TreeHugger Robot
86f6fed52c am: 4ccaf4124f Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Camera2/+/11311653 Change-Id: I5beadad729ff1c2fbe0e4412e0d41a238ed43ca7
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-19 19:59:05 +0000