summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2021-08-19Merge cherrypicks of [15617994, 15618969, 15618970, 15617995, 15618032, ↵android-vts-12.0_r9android-vts-12.0_r8android-vts-12.0_r7android-vts-12.0_r6android-vts-12.0_r5android-vts-12.0_r4android-vts-12.0_r3android-vts-12.0_r2android-vts-12.0_r12android-vts-12.0_r11android-vts-12.0_r10android-vts-12.0_r1android-security-12.0.0_r60android-security-12.0.0_r59android-security-12.0.0_r58android-security-12.0.0_r57android-security-12.0.0_r56android-security-12.0.0_r55android-security-12.0.0_r54android-security-12.0.0_r53android-security-12.0.0_r52android-security-12.0.0_r51android-security-12.0.0_r50android-security-12.0.0_r49android-security-12.0.0_r48android-security-12.0.0_r47android-security-12.0.0_r46android-security-12.0.0_r45android-security-12.0.0_r44android-security-12.0.0_r43android-security-12.0.0_r42android-security-12.0.0_r41android-security-12.0.0_r40android-security-12.0.0_r39android-security-12.0.0_r38android-security-12.0.0_r37android-security-12.0.0_r36android-security-12.0.0_r35android-security-12.0.0_r34android-platform-12.0.0_r1android-cts-12.0_r9android-cts-12.0_r8android-cts-12.0_r7android-cts-12.0_r6android-cts-12.0_r5android-cts-12.0_r4android-cts-12.0_r3android-cts-12.0_r2android-cts-12.0_r12android-cts-12.0_r11android-cts-12.0_r10android-cts-12.0_r1android-12.0.0_r9android-12.0.0_r8android-12.0.0_r34android-12.0.0_r33android-12.0.0_r31android-12.0.0_r30android-12.0.0_r3android-12.0.0_r25android-12.0.0_r2android-12.0.0_r11android-12.0.0_r10android-12.0.0_r1android12-tests-releaseandroid12-security-releaseandroid12-s5-releaseandroid12-s4-releaseandroid12-s3-releaseandroid12-s2-releaseandroid12-s1-releaseandroid12-releaseAndroid Build Coastguard Worker
15618033, 15618190, 15620097, 15618565, 15620098, 15617967, 15619902, 15620257, 15619392] into sc-release Change-Id: I3b705fb2e745ef1256b12fa4284723046511e597
2021-08-19Camera: Return sequence id as part of advanced extension requestsEmilian Peev
Bug: 196090349 Test: atest -c cts/tests/camera/src/android/hardware/camera2/cts/CameraExtensionSessionTest.java Change-Id: I4df863e8a1f9dac704f48677739b822c9d7b5052 (cherry picked from commit d31c61c2028c5f2220d21ba94cf5c71597814910)
2021-06-15Snap for 7456046 from bd39a022721442d648986257ed2c274a076c34b9 to sc-releaseandroid-build-team Robot
Change-Id: Ib949c37dfc7530ede918ad82fa323cdeffaa5aa9
2021-06-14Merge "Camera: Sync camera extensions stubs" into sc-devandroid12-devTreeHugger Robot
2021-05-18Camera: Sync camera extensions stubsEmilian Peev
Bug: 188579227 Test: Camera CTS Change-Id: I8d73224aad75998566abd6472c66ae770be533ce
2021-05-13Snap for 7357013 from 24382da26383b1bbac9de5a6d3644276f7833141 to sc-releaseandroid-build-team Robot
Change-Id: I99b426c25fbd0da29dd5fb0d6cddf70b4ce84fa0
2021-05-12Merge "Camera: Move extension sample from product to vendor" into sc-devTreeHugger Robot
2021-05-12Snap for 7354453 from 22c27ec0be07ebe31bacb26ff0178147306f02e6 to sc-releaseandroid-build-team Robot
Change-Id: I658ea49110ee2692010b3feca882c42c64b0d5d1
2021-05-11Camera2: Add camera extension 1.2.0 stubsEmilian Peev
Extend the CameraX extension stubs and add support for the newer 1.2.0 version. Bug: 179819443 Test: Successful build Change-Id: I20852035e51771ab409499664e196aac9f7050d5
2021-05-10Camera: Move extension sample from product to vendorEmilian Peev
GSI builds need to erase and flash vanilla AOSP product partition which will remove the sample extension implementation library. Continue running all extension tests in case of GSI builds and move the sample library to the vendor partition. Bug: 187143095 Test: Successful build Change-Id: I22443e743c232a3c25414d7972095043ee8ef786
2021-04-08Snap for 7266202 from 874fc716738bfa90ae22c1e8c70a9e560153c030 to sc-releaseandroid-build-team Robot
Change-Id: I93f7bd684adc1960ed1e9fe416d0e26fab27bc8c
2021-04-06Camera: Disable Auto, Night and Beauty extensionsEmilian Peev
Reduce extension test case load by skipping extension with same/similar functionality such Auto, Night and Beauty. Bug: 184447319 Bug: 180451435 Test: atest -c cts/tests/camera/src/android/hardware/camera2/cts/CameraExtensionCharacteristicsTest.java atest -c cts/tests/camera/src/android/hardware/camera2/cts/CameraExtensionSessionTest.java Change-Id: Ifcdf30f2889a1ef9132017e34845c7f623f9809b
2021-03-03Snap for 7180829 from ad7e5bf4083532644becfa37c8f3a467d6db8384 to sc-releaseandroid-build-team Robot
Change-Id: I5688bf6dcbe26b10ecb98074826d8d3140d53c8d
2021-03-01[LSC] Add LOCAL_LICENSE_KINDS to frameworks/exBob Badour
Added SPDX-license-identifier-Apache-2.0 to: camera2/extensions/sample/Android.bp camera2/extensions/stub/Android.bp Bug: 68860345 Bug: 151177513 Bug: 151953481 Test: m all Exempt-From-Owner-Approval: janitorial work Change-Id: I5d557a0aa3242dc78edff010b48810ed61d17a1d
2021-02-21Snap for 7160059 from 1c07499d343fbd0066e427a3f85b8a961f21eded to sc-releaseandroid-build-team Robot
Change-Id: I3d6a519c912187aa75763c8f61a7d21f07a82171
2021-02-20[automerger skipped] Mark ab/7061308 as merged in stage. am: 4012e3625d -s ↵Xin Li
ours am: f00b63237a -s ours am skip reason: Change-Id I6cad41aa327c6cdd8561ef0f5a537e9920b95370 with SHA-1 fbb0d02ab1 is in history Original change: undetermined MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Ifce16df2841bd87165969aaa384d305cdc3f0e77
2021-02-20[automerger skipped] Mark ab/7061308 as merged in stage. am: 4012e3625d -s oursXin Li
am skip reason: Change-Id I6cad41aa327c6cdd8561ef0f5a537e9920b95370 with SHA-1 fbb0d02ab1 is in history Original change: undetermined MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I7f3f5bccfdb873e0490da7145e4a06d11b3e7c28
2021-02-20Mark ab/7061308 as merged in stage.android-s-beta-5android-s-beta-4android-s-beta-3android-s-beta-2android-s-beta-1android-s-beta-5android-s-beta-4Xin Li
Bug: 180401296 Merged-In: I6cad41aa327c6cdd8561ef0f5a537e9920b95370 Change-Id: Id2cd14677d550a06a7cbb67b415dea037b51077b
2021-02-17Snap for 7149879 from 0ab7c37b90a19779ff0f501248d51ebd256b8e5e to sc-releaseandroid-build-team Robot
Change-Id: If2fdf5fd8be0fa38aabda24feb4d034f51d80947
2021-02-16Merge "[LSC] Add LOCAL_LICENSE_KINDS to frameworks/ex" am: 6d2844c3f8 am: ↵Treehugger Robot
9b635907e3 am: ac74f57dd3 Original change: https://android-review.googlesource.com/c/platform/frameworks/ex/+/1589019 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I36c31e92bc573aaa0f83a8c816111c0cd5ef4b8c
2021-02-16Merge "[LSC] Add LOCAL_LICENSE_KINDS to frameworks/ex" am: 6d2844c3f8 am: ↵Treehugger Robot
9b635907e3 Original change: https://android-review.googlesource.com/c/platform/frameworks/ex/+/1589019 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I643f686ac5bb27f421baa3b7fee7bae0e79e32c6
2021-02-16Merge "[LSC] Add LOCAL_LICENSE_KINDS to frameworks/ex" am: 6d2844c3f8Treehugger Robot
Original change: https://android-review.googlesource.com/c/platform/frameworks/ex/+/1589019 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Ib75b97afe6297d4e47e3723f96bc2543fba0baf2
2021-02-16Merge "[LSC] Add LOCAL_LICENSE_KINDS to frameworks/ex"android-s-preview-1Treehugger Robot
2021-02-12[LSC] Add LOCAL_LICENSE_KINDS to frameworks/exBob Badour
Added SPDX-license-identifier-Apache-2.0 to: camera2/portability/Android.bp camera2/portability/tests/Android.bp camera2/public/Android.bp camera2/utils/Android.bp camera2/utils/tests/Android.bp common/Android.bp common/tests/Android.bp framesequence/Android.bp framesequence/jni/Android.bp framesequence/samples/FrameSequenceSamples/Android.bp Bug: 68860345 Bug: 151177513 Bug: 151953481 Test: m all Exempt-From-Owner-Approval: janitorial work Change-Id: Ia93c1e0f00e4a6346cf164f6a4257faf946065a2
2021-01-26Snap for 7102381 from ccd08bf01eace87712692b871de0b4e239d617f6 to sc-releaseandroid-build-team Robot
Change-Id: Ia397aaeaa76390b60d0cb20ac921219124c602a8
2021-01-25Merge "Camera2: Add support for Camera2 extension session callbacks"TreeHugger Robot
2021-01-14Camera2: Add support for Camera2 extension session callbacksEmilian Peev
Add blocking extension session callback support which can track the state transitions. Additionally add the vendor side extension stubs and a very basic sample implementation of the extensions that can easily run on various devices. Bug: 170481080 Test: atest cts/tests/camera/src/android/hardware/camera2/cts/CameraExtensionManagerTest.java atest cts/tests/camera/src/android/hardware/camera2/cts/CameraExtensionSessionTest.java Change-Id: I2067d9d12e7cffa859c2a97bfbdcd4e5c8fa49dc
2021-01-13Snap for 7078355 from a75f7a32d87802f9cd2a3a3b4958e7cdab9d52a7 to sc-releaseandroid-build-team Robot
Change-Id: I54ae3d6d7f0be88ca18a480d422bca4f4bb37e8e
2021-01-12Merge "Use today's date as the "list accurate as date"." am: 1927aec963 am: ↵Régis Décamps
bfca28b8db am: 785a185e40 Original change: https://android-review.googlesource.com/c/platform/frameworks/ex/+/95488 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Ib2cd4d764a4cccee59e221b742c7c93be8a835f9
2021-01-12Merge "Use today's date as the "list accurate as date"." am: 1927aec963 am: ↵Régis Décamps
bfca28b8db Original change: https://android-review.googlesource.com/c/platform/frameworks/ex/+/95488 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Idb11e28f9ac014b489e3b8f3aa8d82c8f8b9b808
2021-01-12Merge "Use today's date as the "list accurate as date"." am: 1927aec963Régis Décamps
Original change: https://android-review.googlesource.com/c/platform/frameworks/ex/+/95488 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I506ef53c84be77a95a720daf7592b9981e5447d6
2021-01-12Merge "Use today's date as the "list accurate as date"."Régis Décamps
2020-11-26Snap for 6995927 from e64abe349d0f9dedee2aa227c1c5dce2821a1ac8 to sc-releaseandroid-build-team Robot
Change-Id: I746aab8b2e0283713ecf19c7200588ebf8aec3cd
2020-11-25Mark ab/6881855 as merged am: abf15b124f am: fbb0d02ab1Xin Li
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/ex/+/13112979 Change-Id: I25a563c7b1c05a321a7ecbab0620e0c39b36e943
2020-11-25Mark ab/6881855 as merged am: abf15b124fXin Li
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/ex/+/13112979 Change-Id: I6cad41aa327c6cdd8561ef0f5a537e9920b95370
2020-11-23Mark ab/6881855 as mergedXin Li
Bug: 172690556 Change-Id: Idf3b4ae990544bdb18245b2b83553383d9ef27da
2020-10-10Snap for 6896080 from c74e8f693ca9b0560c51eb60e8120383caa4ab92 to sc-releaseandroid-build-team Robot
Change-Id: Ice6983d0012e316101d32099893a42ca26b38b9a
2020-10-09[automerger skipped] Skip ab/6749736 in stage. am: 84a4b3ba90 -s ours am: ↵Xin Li
23c8f8a495 -s ours am: 900f839322 -s ours am skip reason: Change-Id Ia300ad3ebe878568c3b5eb02741901c5d0929e80 with SHA-1 858457f8c2 is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/ex/+/12795232 Change-Id: Id130a7544e7895ebe10c562fc37c7aaf6bc910fa
2020-10-09[automerger skipped] Skip ab/6749736 in stage. am: 84a4b3ba90 -s ours am: ↵Xin Li
23c8f8a495 -s ours am skip reason: Change-Id Ia300ad3ebe878568c3b5eb02741901c5d0929e80 with SHA-1 858457f8c2 is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/ex/+/12795232 Change-Id: Icf432d2e463020b5597c0ae49873a7eb59f46d82
2020-10-09[automerger skipped] Skip ab/6749736 in stage. am: 84a4b3ba90 -s oursXin Li
am skip reason: Change-Id Ia300ad3ebe878568c3b5eb02741901c5d0929e80 with SHA-1 858457f8c2 is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/ex/+/12795232 Change-Id: Ie18c0319e3eb63288165d30a7152f59ee37f14d9
2020-10-08Skip ab/6749736 in stage.Xin Li
Merged-In: Ia300ad3ebe878568c3b5eb02741901c5d0929e80 Change-Id: I18240c3a8a7f46deb6faa80e80d901b9930eae54
2020-09-12Snap for 6829063 from 1f3f122de8f2e40b2d2364edfd2803aa80bb1933 to sc-releaseandroid-build-team Robot
Change-Id: I245663a8aecf763604424d2936a5fb0e233ea5d1
2020-09-11[automerger skipped] Merge "Merge Android R" am: 739338354e -s ours am: ↵Xin Li
cf4ce693c3 -s ours am: e6da4c3c1a -s ours am: 9c6a882caa -s ours am: 8da8c8e97f -s ours am skip reason: Change-Id Ib391ecc430a25955b3b35df957a96640fed9a70c with SHA-1 9ac0f46277 is in history Original change: https://android-review.googlesource.com/c/platform/frameworks/ex/+/1422366 Change-Id: If4d0fceee52e6b78a8976cbc0de0d8909dd3eee8
2020-09-11[automerger skipped] Merge "Merge Android R" am: 739338354e -s ours am: ↵Xin Li
cf4ce693c3 -s ours am: e6da4c3c1a -s ours am: 9c6a882caa -s ours am skip reason: Change-Id Ib391ecc430a25955b3b35df957a96640fed9a70c with SHA-1 9ac0f46277 is in history Original change: https://android-review.googlesource.com/c/platform/frameworks/ex/+/1422366 Change-Id: I93588f74c53bd3b6ce21e21f7820fe70ab321474
2020-09-11[automerger skipped] Merge "Merge Android R" am: 739338354e -s ours am: ↵Xin Li
cf4ce693c3 -s ours am: e6da4c3c1a -s ours am skip reason: Change-Id Ib391ecc430a25955b3b35df957a96640fed9a70c with SHA-1 9ac0f46277 is in history Original change: https://android-review.googlesource.com/c/platform/frameworks/ex/+/1422366 Change-Id: I3bc85fa0734f9ce66699dbe690382b3630e158f2
2020-09-11[automerger skipped] Merge "Merge Android R" am: 739338354e -s ours am: ↵Xin Li
cf4ce693c3 -s ours am skip reason: Change-Id Ib391ecc430a25955b3b35df957a96640fed9a70c with SHA-1 9ac0f46277 is in history Original change: https://android-review.googlesource.com/c/platform/frameworks/ex/+/1422366 Change-Id: Id9252353daaada058fa9c8b61cea259959a70d77
2020-09-11[automerger skipped] Merge "Merge Android R" am: 739338354e -s oursXin Li
am skip reason: Change-Id Ib391ecc430a25955b3b35df957a96640fed9a70c with SHA-1 9ac0f46277 is in history Original change: https://android-review.googlesource.com/c/platform/frameworks/ex/+/1422366 Change-Id: I2c7f44e18d60c4074bd569755bfb4af7fe04b349
2020-09-10Merge "Merge Android R"Xin Li
2020-09-08Merge Android RXin Li
Bug: 168057903 Merged-In: Ib391ecc430a25955b3b35df957a96640fed9a70c Change-Id: Iad1d7a0795160c153061a5112b608856797bd18c
2020-09-03Snap for 6809790 from a9e039242f3366aca7a8d14b17e623e5d43084c9 to sc-releaseandroid-build-team Robot
Change-Id: I9f21133f95ef7bd2ba477e400411224e1f90a5d0
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-09 13:33:25 +0000