aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2020-02-26TestingCamera1/2: Minor bandaids to keep storage workingandroid-mainline-12.0.0_r112android-mainline-11.0.0_r44android-mainline-11.0.0_r43android-mainline-11.0.0_r42android-mainline-11.0.0_r41android-mainline-11.0.0_r40android-mainline-11.0.0_r39android-mainline-11.0.0_r38android-mainline-11.0.0_r37android-mainline-11.0.0_r36android-mainline-11.0.0_r35android-mainline-11.0.0_r34android-mainline-11.0.0_r32android-mainline-11.0.0_r31android-mainline-11.0.0_r30android-mainline-11.0.0_r28android-mainline-11.0.0_r27android-mainline-11.0.0_r26android-mainline-11.0.0_r25android-mainline-11.0.0_r24android-mainline-11.0.0_r23android-mainline-11.0.0_r22android-mainline-11.0.0_r21android-mainline-11.0.0_r20android-mainline-11.0.0_r18android-mainline-11.0.0_r17android-mainline-11.0.0_r16android-mainline-11.0.0_r15android-mainline-11.0.0_r14android-mainline-11.0.0_r13android-mainline-11.0.0_r12aml_tz2_305400500aml_tz2_305400300aml_tz2_305400100aml_tz2_304500300aml_tz2_303900110aml_tz2_303900102aml_tz2_303800002aml_tz2_303800001aml_tz2_303200001android12-mainline-tzdata2-releaseandroid11-mainline-tethering-releaseandroid11-mainline-permission-releaseandroid11-mainline-os-statsd-releaseandroid11-mainline-networkstack-releaseandroid11-mainline-media-swcodec-releaseandroid11-mainline-media-releaseandroid11-mainline-extservices-releaseandroid11-mainline-documentsui-releaseandroid11-mainline-conscrypt-releaseandroid11-mainline-cellbroadcast-releaseandroid11-mainline-captiveportallogin-releaseandroid11-devaml_tz2_305400100Eino-Ville Talvala
Target API level 28 for now to ensure saving to sdcard continues to work. Bug: 150294644 Test: Both apps can save to sdcard instead of crashing/erroring Change-Id: I083b34b60b9dd481d2332e54fb172a1b4865c178
2019-10-30[automerger skipped] DO NOT MERGE - ↵Xin Li
qt-qpr1-dev-plus-aosp-without-vendor@5915889 into stage-aosp-master am: e6b849a6b9 am: 59deedc9c4 -s ours am skip reason: subject contains skip directive Change-Id: Ie97a31ce98b2ffd433c670c7a642586dbb3f4008
2019-10-30DO NOT MERGE - qt-qpr1-dev-plus-aosp-without-vendor@5915889 into ↵android-r-preview-4android-r-preview-3android-r-preview-2android-r-beta-3android-r-beta-2Xin Li
stage-aosp-master am: e6b849a6b9 Change-Id: If74e9d0ff6820cf1476071b93fd9fdcd02847e38
2019-10-30DO NOT MERGE - qt-qpr1-dev-plus-aosp-without-vendor@5915889 into ↵android-r-preview-1Xin Li
stage-aosp-master Bug: 142003500 Change-Id: I350fd7dceb8166c6493ad8e5837fb926f33f7760
2019-09-11[automerger skipped] Merge qt-r1-dev-plus-aosp-without-vendor (5817612) into ↵Xin Li
stage-aosp-master am: fbfcdaf2a5 -s ours am: 275b056832 -s ours am: 53c08c1607 -s ours am skip reason: change_id I67a7040a90c369abf5a0c3e7cf0e16f351addb99 with SHA1 874516b3a8 is in history Change-Id: Ia4f9dafb3b3135c6239579adc710d83d558ea5b0
2019-09-08[automerger skipped] Merge qt-r1-dev-plus-aosp-without-vendor (5817612) into ↵Xin Li
stage-aosp-master am: fbfcdaf2a5 -s ours am: 275b056832 -s ours am skip reason: change_id I67a7040a90c369abf5a0c3e7cf0e16f351addb99 with SHA1 874516b3a8 is in history Change-Id: Ic750a648952125ba32ce669bfbbd30ade953d1b2
2019-09-08[automerger skipped] Merge qt-r1-dev-plus-aosp-without-vendor (5817612) into ↵Xin Li
stage-aosp-master am: fbfcdaf2a5 -s ours am skip reason: change_id I67a7040a90c369abf5a0c3e7cf0e16f351addb99 with SHA1 874516b3a8 is in history Change-Id: I3a95dd033a101043e98776001aa9ab6268bc2c43
2019-09-08Merge qt-r1-dev-plus-aosp-without-vendor (5817612) into stage-aosp-masterXin Li
No content change. Bug: 135460123 Change-Id: Ib2e87af5313daca7e0c79843f0d7000eb95390a5 Merged-In: I67a7040a90c369abf5a0c3e7cf0e16f351addb99
2019-09-05[automerger skipped] Merge "DO NOT MERGE - Merge Android 10 into master" am: ↵Xin Li
e9a785696b -s ours am: 83b8f3bda9 am: a01deedf19 am: 602edce415 -s ours am skip reason: subject contains skip directive Change-Id: I0c2a8d5ab9f7b1e23a934823eeaadd4bd4dafa81
2019-09-05[automerger skipped] Merge "DO NOT MERGE - Merge Android 10 into master" am: ↵Xin Li
e9a785696b -s ours am: 83b8f3bda9 am: a01deedf19 Change-Id: I597d942a110b769b675efc95afc08620e1513369
2019-09-05[automerger skipped] Merge "DO NOT MERGE - Merge Android 10 into master" am: ↵Xin Li
e9a785696b -s ours am: 83b8f3bda9 Change-Id: Ia6445649c2547d960eec2c451a6bc71df7ea78a9
2019-09-05[automerger skipped] Merge "DO NOT MERGE - Merge Android 10 into master"Xin Li
am: e9a785696b -s ours am skip reason: subject contains skip directive Change-Id: I80016c4382468ea9835e739c76eb1fcd4b4ec534
2019-09-05Merge "DO NOT MERGE - Merge Android 10 into master"ndk-sysroot-r21Xin Li
2019-09-04DO NOT MERGE - Merge Android 10 into masterXin Li
Bug: 139893257 Change-Id: I67a7040a90c369abf5a0c3e7cf0e16f351addb99
2019-07-18[automerger skipped] Merge "Renderscript: rename .rs extension to .rscript" ↵Jeffrey Vander Stoep
am: 8272e7ad1e -s ours am: 8200882f62 -s ours am: a0b46290db -s ours am: 3ad90a45c5 -s ours am skip reason: change_id I6e454f3c28c3014d0ac11a1cc3dd054e5ad2e98c with SHA1 642dbf7eb9 is in history Change-Id: I1758749fd73e54c55a8200ea880453358684fab6
2019-07-18[automerger skipped] Merge "Renderscript: rename .rs extension to .rscript" ↵Jeffrey Vander Stoep
am: 8272e7ad1e -s ours am: 8200882f62 -s ours am: a0b46290db -s ours am skip reason: change_id I6e454f3c28c3014d0ac11a1cc3dd054e5ad2e98c with SHA1 642dbf7eb9 is in history Change-Id: Icbb711da3e0c47ac2f7ff92b88a48b8dce0c9ed1
2019-07-18[automerger skipped] Merge "Renderscript: rename .rs extension to .rscript" ↵Jeffrey Vander Stoep
am: 8272e7ad1e -s ours am: 8200882f62 -s ours am skip reason: change_id I6e454f3c28c3014d0ac11a1cc3dd054e5ad2e98c with SHA1 642dbf7eb9 is in history Change-Id: I21d0ef96b5f61ce1c3535d4e1df830db752643f5
2019-07-18[automerger skipped] Merge "Renderscript: rename .rs extension to .rscript"temp_140451723Jeffrey Vander Stoep
am: 8272e7ad1e -s ours am skip reason: change_id I6e454f3c28c3014d0ac11a1cc3dd054e5ad2e98c with SHA1 642dbf7eb9 is in history Change-Id: Ib1b774d19aa7d21a9f9390738a262dfca336bcab
2019-07-17[automerger skipped] Renderscript: rename .rs extension to .rscript am: ↵Jeff Vander Stoep
642dbf7eb9 -s ours am: 46bbbc6618 -s ours am: 0034906abb -s ours am skip reason: change_id I6e454f3c28c3014d0ac11a1cc3dd054e5ad2e98c with SHA1 0b7e33a329 is in history Change-Id: Id022c250ed92215e9d0c6bf2fcd38cc7b84fe2f0
2019-07-17[automerger skipped] Renderscript: rename .rs extension to .rscript am: ↵Jeff Vander Stoep
642dbf7eb9 -s ours am: 46bbbc6618 -s ours am skip reason: change_id I6e454f3c28c3014d0ac11a1cc3dd054e5ad2e98c with SHA1 0b7e33a329 is in history Change-Id: Iaafd8a3dcc638c139a9a85c41a3da647f462e039
2019-07-17[automerger skipped] Renderscript: rename .rs extension to .rscriptJeff Vander Stoep
am: 642dbf7eb9 -s ours am skip reason: change_id I6e454f3c28c3014d0ac11a1cc3dd054e5ad2e98c with SHA1 0b7e33a329 is in history Change-Id: Ic93fd75ab68891a9e3ff726f4dff1cbe657a5b76
2019-07-18Renderscript: rename .rs extension to .rscriptJeff Vander Stoep
Reserve .rs extension for Rust. Bug: 137365032 Test: make checkbuild Test: cd frameworks/compile/slang/tests ./slang_tests.py Test: atest CtsRenderscriptTestCases Test: CtsRsCppTestCases Exempt-From-Owner-Approval: Clean CP Change-Id: I6e454f3c28c3014d0ac11a1cc3dd054e5ad2e98c Merged-In: I6e454f3c28c3014d0ac11a1cc3dd054e5ad2e98c (cherry picked from commit 81abf78dcfa140ea767f8c0b68072649d3c65bb9) (cherry picked from commit 0b7e33a329a4919416824f8aded244d1ca628a05)
2019-07-18Merge "Renderscript: rename .rs extension to .rscript"Jeffrey Vander Stoep
2019-07-17[automerger skipped] Renderscript: rename .rs extension to .rscript am: ↵Jeff Vander Stoep
0b7e33a329 am: bdff5a6a9a -s ours am skip reason: change_id I6e454f3c28c3014d0ac11a1cc3dd054e5ad2e98c with SHA1 81abf78dcf is in history Change-Id: Id2f399ccdddc9fb119a7100a216849e2d87e74da
2019-07-17Renderscript: rename .rs extension to .rscriptJeff Vander Stoep
am: 0b7e33a329 Change-Id: I29520f14d66d5f045bfc45aa1b032f333e28322f
2019-07-17Renderscript: rename .rs extension to .rscriptJeff Vander Stoep
Reserve .rs extension for Rust. Bug: 137365032 Test: make checkbuild Test: cd frameworks/compile/slang/tests ./slang_tests.py Test: atest CtsRenderscriptTestCases Test: CtsRsCppTestCases Exempt-From-Owner-Approval: Clean CP Change-Id: I6e454f3c28c3014d0ac11a1cc3dd054e5ad2e98c Merged-In: I6e454f3c28c3014d0ac11a1cc3dd054e5ad2e98c (cherry picked from commit 81abf78dcfa140ea767f8c0b68072649d3c65bb9)
2019-07-17Renderscript: rename .rs extension to .rscriptJeff Vander Stoep
Reserve .rs extension for Rust. Bug: 137365032 Test: make checkbuild Test: cd frameworks/compile/slang/tests ./slang_tests.py Test: atest CtsRenderscriptTestCases Test: CtsRsCppTestCases Change-Id: I6e454f3c28c3014d0ac11a1cc3dd054e5ad2e98c Merged-In: I6e454f3c28c3014d0ac11a1cc3dd054e5ad2e98c
2019-07-15Renderscript: rename .rs extension to .rscriptJeff Vander Stoep
Reserve .rs extension for Rust. Bug: 137365032 Test: make checkbuild Test: cd frameworks/compile/slang/tests ./slang_tests.py Test: atest CtsRenderscriptTestCases Test: CtsRsCppTestCases Change-Id: I6e454f3c28c3014d0ac11a1cc3dd054e5ad2e98c
2019-07-02[automerger skipped] DO NOT MERGE - Merge qt-dev-plus-aosp-without-vendor ↵Xin Li
(5699924) into stage-aosp-master am: 902b271cd8 am: 3860706b15 -s ours am skip reason: subject contains skip directive Change-Id: I7aff3599da9f0b2485319ba16dd680a894b2938b
2019-07-02DO NOT MERGE - Merge qt-dev-plus-aosp-without-vendor (5699924) into ↵Xin Li
stage-aosp-master am: 902b271cd8 Change-Id: Ie80fe332f9ac54368291cda58e3fac6d069eed32
2019-07-01DO NOT MERGE - Merge qt-dev-plus-aosp-without-vendor (5699924) into ↵Xin Li
stage-aosp-master Bug: 134405016 Change-Id: I957dece5494b3fbd07dcad69de87db586ab9e5fe
2019-04-09TestingCamera: Add support for 'resizeable' mode am: 8112961f0cEmilian Peev
am: d9a85df8a3 Change-Id: Id6678d1c6b44ba08e8a034247d89b352144a7bff
2019-04-09TestingCamera: Add support for 'resizeable' modeEmilian Peev
am: 8112961f0c Change-Id: Ib7d2d124699fce29af6b6829289b7c1b69c130d3
2019-04-04TestingCamera: Add support for 'resizeable' modeandroid-mainline-10.0.0_r9android-mainline-10.0.0_r7android-mainline-10.0.0_r5android-mainline-10.0.0_r4android-10.0.0_r9android-10.0.0_r8android-10.0.0_r7android-10.0.0_r45android-10.0.0_r44android-10.0.0_r43android-10.0.0_r42android-10.0.0_r41android-10.0.0_r40android-10.0.0_r39android-10.0.0_r38android-10.0.0_r37android-10.0.0_r36android-10.0.0_r35android-10.0.0_r34android-10.0.0_r33android-10.0.0_r32android-10.0.0_r31android-10.0.0_r30android-10.0.0_r29android-10.0.0_r28android-10.0.0_r27android-10.0.0_r26android-10.0.0_r25android-10.0.0_r24android-10.0.0_r23android-10.0.0_r22android-10.0.0_r21android-10.0.0_r20android-10.0.0_r19android-10.0.0_r18android-10.0.0_r16android-10.0.0_r15android-10.0.0_r14android-10.0.0_r13android-10.0.0_r12android10-qpr3-s1-releaseandroid10-qpr3-releaseandroid10-qpr2-s4-releaseandroid10-qpr2-s3-releaseandroid10-qpr2-s2-releaseandroid10-qpr2-s1-releaseandroid10-qpr2-releaseandroid10-qpr1-releaseandroid10-qpr1-mainline-releaseandroid10-qpr1-d-releaseandroid10-qpr1-c-s1-releaseandroid10-qpr1-c-releaseandroid10-qpr1-b-s1-releaseandroid10-qpr1-b-releaseandroid10-mainline-media-releaseandroid10-devandroid10-d4-s1-releaseandroid10-d4-releaseandroid10-c2f2-s2-releaseandroid10-c2f2-s1-releaseandroid10-c2f2-releaseEmilian Peev
Currently 'android:resizeable' is enabled by default. Support multi-window mode as much as possible by aligning the viewfinder long edge with the screen long edge on each orientation change. Additionally check whether camera is initialized during configuration in the surface change callback. Bug: 129418648 Test: Manual using application Change-Id: Icafbd3777f5ceda178df7fddaeffbfe7dc6a70b3
2019-03-06TestingCamera2: Remove external storage permissionEmilian Peev
The application should default to the sandboxed storage "/sdcard/Android/sandbox/com.android.testingcamera2". Bug: 124384600 Test: Manual using application Change-Id: I02014b0dc042772f00f8ba147d0451a8d7e34d1d
2019-02-24[automerger skipped] DO NOT MERGE - Merge pi-dev@5234907 into stage-aosp-masterXin Li
am: 7c6a092125 -s ours am skip reason: subject contains skip directive Change-Id: I318386091d6ba9ee0eeff66788230e6d209f1f42
2019-02-20DO NOT MERGE - Merge pi-dev@5234907 into stage-aosp-masterandroid-o-mr1-iot-release-1.0.14android-o-mr1-iot-release-1.0.13Xin Li
Bug: 120848293 Change-Id: Ieb6e733eaa6f2e996a9add0a1d3c05d217eddf88
2019-02-11TestingCamera2: Add HEIC image capture supportShuzhen Wang
Test: Take a HEIC picture using the app Bug: 124071759 Change-Id: I0965037f9cddd40bb471effe0234a2d4aca230b0
2018-12-10[automerger skipped] Merge "DO NOT MERGE" am: f33e0cd09e -s ours am: ↵Xin Li
6f4e962129 -s ours am: 3ebd7dc23b -s ours Change-Id: I9ec0f720483e7a5c98b2a73f051b66a2d6a46af9
2018-12-10[automerger skipped] Merge "DO NOT MERGE" am: f33e0cd09e -s oursXin Li
am: 6f4e962129 -s ours Change-Id: Iab6562dc23fd9c3e9f0af88ae3ff3fe821a1a2ad
2018-12-10[automerger skipped] Merge "DO NOT MERGE"Xin Li
am: f33e0cd09e -s ours Change-Id: I8f41518e3d33d7da5bceb061fd5b409b5abc289f
2018-12-10Merge "DO NOT MERGE"android-q-preview-6android-q-preview-5android-q-preview-4android-q-preview-2.5android-q-preview-1android-o-mr1-iot-release-1.0.8android-o-mr1-iot-release-1.0.7android-o-mr1-iot-release-1.0.12android-o-mr1-iot-release-1.0.10oreo-mr1-iot-releaseTreehugger Robot
2018-12-07DO NOT MERGEXin Li
Merge pie-platform-release (PPRL.181205.001, history only) into master Bug: 120502534 Change-Id: Iea7ab7445e2469e27d182f4ca3512d4c7d24cc44
2018-10-17TestingCamera2.1: Fix request pane for multi-camera casesEino-Ville Talvala
The pane was not updating the list of targets for a given camera, when the camera spinner was used to select a different camera. Test: Switching cameras for a request changes the listed targets Change-Id: I085034f3afb3f97152a24550d5f49721e0e1900e
2018-08-08Merge "Merge Android Pie into master" am: a4ebf6d13f am: 0eb56f829f am: ↵Xin Li
366ad3dcd6 am: 4e456c30df Change-Id: Iaf15dfef7d6c1af778d9a75c82a315be1b58b9b1
2018-08-07Merge "Merge Android Pie into master" am: a4ebf6d13f am: 0eb56f829fXin Li
am: 366ad3dcd6 Change-Id: I2b4771b0f67bacd41f28ac381d258ab2d3684c98
2018-08-07Merge "Merge Android Pie into master" am: a4ebf6d13fandroid-wear-8.0.0_r2android-o-mr1-iot-release-smart-display-r9android-o-mr1-iot-release-smart-display-r8android-o-mr1-iot-release-smart-display-r5android-o-mr1-iot-release-smart-display-r40.1Jandroid-o-mr1-iot-release-smart-display-r4android-o-mr1-iot-release-smart-display-r39android-o-mr1-iot-release-smart-display-r30android-o-mr1-iot-release-smart-display-r22android-o-mr1-iot-release-smart-display-r14android-o-mr1-iot-release-smart-clock-r6android-o-mr1-iot-release-smart-clock-r2android-o-mr1-iot-release-smart-clock-fsiandroid-o-mr1-iot-release-smart-clock-fcsandroid-o-mr1-iot-release-cube_r2android-o-mr1-iot-release-cube-fsiandroid-o-mr1-iot-release-cube-fcsandroid-n-iot-release-ihome-igv1nougat-iot-releaseXin Li
am: 0eb56f829f Change-Id: Ifaf2d0b43d7bda56438fba421e12964af32eba2a
2018-08-07Merge "Merge Android Pie into master"Xin Li
am: a4ebf6d13f Change-Id: Iacd3ee221a53b18596593ead6f8e83265ec55fef
2018-08-07Merge "Merge Android Pie into master"android-o-mr1-iot-release-smart-display-r3android-o-mr1-iot-release-1.0.5android-o-mr1-iot-release-1.0.4android-o-mr1-iot-release-1.0.3oreo-mr1-1.2-iot-releasemaster-cuttlefish-testing-releaseXin Li
2018-08-06Merge Android Pie into masterXin Li
Bug: 112104996 Change-Id: Ib6e84646a1e588730e0ec3e77bee853f927e1e52
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-27 22:21:52 +0000