summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2020-02-03vendor/google_easel has been removed in downstream branches am: 04a9552904 ↵r_aml_301500702android-mainline-12.0.0_r55android-mainline-12.0.0_r112android-mainline-11.0.0_r9android-mainline-11.0.0_r8android-mainline-11.0.0_r7android-mainline-11.0.0_r6android-mainline-11.0.0_r5android-mainline-11.0.0_r45android-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_r4android-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_r33android-mainline-11.0.0_r32android-mainline-11.0.0_r31android-mainline-11.0.0_r30android-mainline-11.0.0_r3android-mainline-11.0.0_r29android-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_r2android-mainline-11.0.0_r19android-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_r12android-mainline-11.0.0_r10android-mainline-11.0.0_r1android-11.0.0_r9android-11.0.0_r8android-11.0.0_r7android-11.0.0_r48android-11.0.0_r47android-11.0.0_r46android-11.0.0_r45android-11.0.0_r44android-11.0.0_r43android-11.0.0_r42android-11.0.0_r41android-11.0.0_r40android-11.0.0_r39android-11.0.0_r38android-11.0.0_r37android-11.0.0_r36android-11.0.0_r35android-11.0.0_r34android-11.0.0_r33android-11.0.0_r32android-11.0.0_r31android-11.0.0_r30android-11.0.0_r29android-11.0.0_r28android-11.0.0_r27android-11.0.0_r26android-11.0.0_r24android-11.0.0_r23android-11.0.0_r22android-11.0.0_r21android-11.0.0_r20android-11.0.0_r19android-11.0.0_r18android-11.0.0_r16android-11.0.0_r15android-11.0.0_r14android-11.0.0_r13android-11.0.0_r12android-11.0.0_r11android-11.0.0_r10aml_tz2_305400500aml_tz2_305400300aml_tz2_305400100aml_tz2_304500300aml_tz2_303900110aml_tz2_303900102aml_tz2_303800002aml_tz2_303800001aml_tz2_303200001android12-mainline-tzdata2-releaseandroid11-qpr3-s1-releaseandroid11-qpr3-releaseandroid11-qpr2-releaseandroid11-qpr1-s2-releaseandroid11-qpr1-s1-releaseandroid11-qpr1-releaseandroid11-qpr1-d-s1-releaseandroid11-qpr1-d-releaseandroid11-qpr1-c-releaseandroid11-mainline-tethering-releaseandroid11-mainline-sparse-2021-jan-releaseandroid11-mainline-sparse-2020-dec-releaseandroid11-mainline-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-devandroid11-d2-releaseandroid11-d1-s7-releaseandroid11-d1-s6-releaseandroid11-d1-s5-releaseandroid11-d1-s1-releaseandroid11-d1-releaseandroid11-d1-b-releaseaml_tz2_305400100Automerger Merge Worker
am: c0289b1ada am: 097a7710c9 Change-Id: I3fdc6a07425c604530a208bcf08e8a9b09f708cb
2020-02-03vendor/google_easel has been removed in downstream branches am: 04a9552904 ↵Automerger Merge Worker
am: c0289b1ada Change-Id: Ibd63a20da1a3c07e900b4a5317ae9a92e50ab112
2020-02-03vendor/google_easel has been removed in downstream branches am: 04a9552904android-r-preview-4android-r-preview-3android-r-preview-2Automerger Merge Worker
Change-Id: I1c30be84791f554d95a9bc7eeaaef15d0fef28ca
2020-02-03vendor/google_easel has been removed in downstream branchesandroid-r-preview-1Dan Willemsen
Fixes: 148658703 Test: m libhdrplusclient on aosp and internal master Change-Id: Ic6b62c3f83d54204faa2f063ecec0e7cce9912fc
2019-12-04Merge Android10 QPR1 into AOSP master am: af8a319569 am: 9a65750022Automerger Merge Worker
Change-Id: Idfd7b25987e6e1df2323b0141f08e8fb0e9a3768
2019-12-04Merge Android10 QPR1 into AOSP master am: af8a319569Xin Li
am: 13b6f89e32 Change-Id: I33975f17640c1089ece7da38d2832f2d798056fe
2019-12-03Merge Android10 QPR1 into AOSP masterXin Li
am: af8a319569 Change-Id: I008f460e64dbdf21397e393cb52c619b1e55f686
2019-12-02Merge Android10 QPR1 into AOSP masterXin Li
Bug: 145570283 Change-Id: I6672a23d4785ea876e0e2b74979c34883477344f
2019-10-31[automerger skipped] DO NOT MERGE - ↵Xin Li
qt-qpr1-dev-plus-aosp-without-vendor@5915889 into stage-aosp-master am: 42b79fa5bd am: aa4c4659d0 -s ours am skip reason: subject contains skip directive Change-Id: Ifaaa3d4316ceef7e569f84af9acb016066afb016
2019-10-31DO NOT MERGE - qt-qpr1-dev-plus-aosp-without-vendor@5915889 into ↵Xin Li
stage-aosp-master am: 42b79fa5bd Change-Id: Ie88a7772bbb04399e4a72f692403de38c3c71639
2019-10-30DO NOT MERGE - qt-qpr1-dev-plus-aosp-without-vendor@5915889 into ↵temp_b_145570283Xin Li
stage-aosp-master Bug: 142003500 Change-Id: Ic8505c810f7711f882c7b4bc21632f391508a9ba
2019-08-21camera: Add thermal throttle callback am: 09df16c703Chien-Yu Chen
am: 0f11d42de3 Change-Id: I7cc54f2cfe235f91b2c8584322be45fda597472e
2019-08-21camera: Add thermal throttle callbackChien-Yu Chen
am: 09df16c703 Change-Id: Ie85ab101253d041cab07e53a558bbac8a6161558
2019-08-19camera: Add thermal throttle callbackandroid-mainline-10.0.0_r9android-mainline-10.0.0_r7android-mainline-10.0.0_r5android-mainline-10.0.0_r4android-mainline-10.0.0_r10android-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_r30android10-qpr3-s1-releaseandroid10-qpr3-releaseandroid10-qpr2-s4-releaseandroid10-qpr2-s3-releaseandroid10-qpr2-s2-releaseandroid10-qpr2-s1-releaseandroid10-qpr2-releaseandroid10-qpr1-mainline-releaseandroid10-mainline-media-releaseandroid10-d4-s1-releaseandroid10-d4-releaseChien-Yu Chen
Test: Camera CTS Bug: 119872767 Change-Id: I9ab1fdc311f08dff28cf806b9556d2cdd2d2ead6
2019-02-24[automerger skipped] DO NOT MERGE - Merge pi-dev@5234907 into stage-aosp-masterandroid-10.0.0_r9android-10.0.0_r8android-10.0.0_r7android-10.0.0_r14android-10.0.0_r13android-10.0.0_r12ndk-sysroot-r21android10-devandroid10-c2f2-s2-releaseandroid10-c2f2-s1-releaseandroid10-c2f2-releaseXin Li
am: 814643f017 -s ours am skip reason: subject contains skip directive Change-Id: I36a5430deda8eb80e24a0c6e6327b3699d908010
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: I17fbf82f23fe647c3b062f05d93c9bfd75ea5616
2018-12-10[automerger skipped] DO NOT MERGE am: d0e7fcebc4 -s ours am: 1fcf622c1d -s ↵Xin Li
ours am: ff05e0bc95 -s ours Change-Id: If12d366fc2da490391712f1408830c836f6e0946
2018-12-10[automerger skipped] DO NOT MERGE am: d0e7fcebc4 -s oursXin Li
am: 1fcf622c1d -s ours Change-Id: I6f2c158dc98303bd5ced350a8fa840cfdde82397
2018-12-10[automerger skipped] DO NOT MERGEXin Li
am: d0e7fcebc4 -s ours Change-Id: Id23a360e3d432a40fcd6275fb1f7230532c2f642
2018-12-07DO NOT MERGEandroid-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-releaseXin Li
Merge pie-platform-release (PPRL.181205.001, history only) into master Bug: 120502534 Change-Id: I87ba88f1d2475a9b517c7d1dbf8892db9274f9f9
2018-08-08Merge Android Pie into master am: 2d88c771f9 am: 6a504415fa am: bbe5109792Xin Li
am: e2418bbf07 Change-Id: I27aaa6ac136f3eb6a894dda53874e7a23d62f8c9
2018-08-07Merge Android Pie into master am: 2d88c771f9 am: 6a504415faXin Li
am: bbe5109792 Change-Id: Ic8eecee58d423024486f3eacd4bebaec8c5c8eda
2018-08-07Merge Android Pie into master am: 2d88c771f9android-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-fcsXin Li
am: 6a504415fa Change-Id: Ieb093b0affb286d7a9fe14c31a54e610c799c415
2018-08-07Merge Android Pie into masterXin Li
am: 2d88c771f9 Change-Id: I5d327a0305b3df3cea991d90ea8b6c00b5ba6be5
2018-08-06Merge Android Pie into masterandroid-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
Bug: 112104996 Change-Id: I61757fda78b0f72d99bac9e54aa0c7d5b7ea3a60
2018-06-09Merge pi-dev-plus-aosp-without-vendor into stage-aosp-master am: 359972c3a2Xin Li
am: 440b970648 Change-Id: Ie39c14b5229e1084bfd2a7046341c48a5962fbff
2018-06-09Merge pi-dev-plus-aosp-without-vendor into stage-aosp-masterXin Li
am: 359972c3a2 Change-Id: Idbe95e5266fea4989e9b98d42b0606099563808f
2018-06-08Merge pi-dev-plus-aosp-without-vendor into stage-aosp-mastertemp_p_mergeXin Li
Bug: 79597307 Change-Id: If170c6fcc0469583a326fcd4d92836fec281427e
2017-12-28Snap for 4519870 from a08a6a4202e546361a9334f803de7427a87de9c7 to pi-releaseandroid-wear-9.0.0_r9android-wear-9.0.0_r8android-wear-9.0.0_r7android-wear-9.0.0_r6android-wear-9.0.0_r5android-wear-9.0.0_r4android-wear-9.0.0_r34android-wear-9.0.0_r33android-wear-9.0.0_r32android-wear-9.0.0_r31android-wear-9.0.0_r30android-wear-9.0.0_r3android-wear-9.0.0_r29android-wear-9.0.0_r28android-wear-9.0.0_r27android-wear-9.0.0_r26android-wear-9.0.0_r25android-wear-9.0.0_r24android-wear-9.0.0_r23android-wear-9.0.0_r22android-wear-9.0.0_r21android-wear-9.0.0_r20android-wear-9.0.0_r2android-wear-9.0.0_r19android-wear-9.0.0_r18android-wear-9.0.0_r17android-wear-9.0.0_r16android-wear-9.0.0_r15android-wear-9.0.0_r14android-wear-9.0.0_r13android-wear-9.0.0_r12android-wear-9.0.0_r11android-wear-9.0.0_r10android-wear-9.0.0_r1android-vts-9.0_r9android-vts-9.0_r8android-vts-9.0_r7android-vts-9.0_r6android-vts-9.0_r5android-vts-9.0_r4android-vts-9.0_r19android-vts-9.0_r18android-vts-9.0_r17android-vts-9.0_r16android-vts-9.0_r15android-vts-9.0_r14android-vts-9.0_r13android-vts-9.0_r12android-vts-9.0_r11android-vts-9.0_r10android-security-9.0.0_r76android-security-9.0.0_r75android-security-9.0.0_r74android-security-9.0.0_r73android-security-9.0.0_r72android-security-9.0.0_r71android-security-9.0.0_r70android-security-9.0.0_r69android-security-9.0.0_r68android-security-9.0.0_r67android-security-9.0.0_r66android-security-9.0.0_r65android-security-9.0.0_r64android-security-9.0.0_r63android-security-9.0.0_r62android-cts-9.0_r9android-cts-9.0_r8android-cts-9.0_r7android-cts-9.0_r6android-cts-9.0_r5android-cts-9.0_r4android-cts-9.0_r3android-cts-9.0_r20android-cts-9.0_r2android-cts-9.0_r19android-cts-9.0_r18android-cts-9.0_r17android-cts-9.0_r16android-cts-9.0_r15android-cts-9.0_r14android-cts-9.0_r13android-cts-9.0_r12android-cts-9.0_r11android-cts-9.0_r10android-cts-9.0_r1android-9.0.0_r9android-9.0.0_r8android-9.0.0_r7android-9.0.0_r61android-9.0.0_r60android-9.0.0_r6android-9.0.0_r59android-9.0.0_r58android-9.0.0_r57android-9.0.0_r56android-9.0.0_r55android-9.0.0_r54android-9.0.0_r53android-9.0.0_r52android-9.0.0_r51android-9.0.0_r50android-9.0.0_r5android-9.0.0_r49android-9.0.0_r48android-9.0.0_r3android-9.0.0_r2android-9.0.0_r18android-9.0.0_r17android-9.0.0_r10android-9.0.0_r1security-pi-releasepie-vts-releasepie-security-releasepie-s2-releasepie-release-2pie-releasepie-r2-s2-releasepie-r2-s1-releasepie-r2-releasepie-platform-releasepie-gsipie-cuttlefish-testingpie-cts-releaseandroid-build-team Robot
Change-Id: I6a4d9af9dabf9f3be7cccb6ffb005c3478ea8857
2017-12-24Snap for 4517567 from ac8e04c57938d8eaed6c2d965472375b1501063e to pi-releaseandroid-build-team Robot
Change-Id: Ic9668af8f31afa3ffefb0104e2b8bd98dd10d69d
2017-12-22Do not enable HDR+ other than Pixel 2017android-9.0.0_r47android-9.0.0_r46android-9.0.0_r45android-9.0.0_r44android-9.0.0_r43android-9.0.0_r42android-9.0.0_r41android-9.0.0_r40android-9.0.0_r39android-9.0.0_r38android-9.0.0_r37android-9.0.0_r36android-9.0.0_r35android-9.0.0_r34android-9.0.0_r33android-9.0.0_r32android-9.0.0_r31android-9.0.0_r30android-9.0.0_r22android-9.0.0_r21android-9.0.0_r20android-9.0.0_r19android-9.0.0_r16android-9.0.0_r12android-9.0.0_r11pie-qpr3-s1-releasepie-qpr3-releasepie-qpr3-b-releasepie-qpr2-releasepie-qpr1-s3-releasepie-qpr1-s2-releasepie-qpr1-s1-releasepie-qpr1-releasepie-dr1-releasepie-dr1-devpie-devpie-b4s4-releasepie-b4s4-devChenjie Luo
Bug: 70639754 Test: Build pass Change-Id: Ie438ac704a7631ab8a32a1efdfea7c72692e6882
2017-12-21Add libhdrplusclient_headersChenjie Luo
Bug: 70639754 Test: Build pass Change-Id: Ibf81567e34d05c222a973fec2d345242fc878bde
2017-12-20hardware: Migrate hardware/google/easel to hardwre/google/easel/amberChenjie Luo
amber is our code name for 2017 easel software. blue is our code name for 2018 easel software. Bug: 70639754 Test: Build pass Change-Id: I92aa5da8d0364c969104ae8f0bb6fccdd782a723
2017-12-11Snap for 4496165 from 6688893a460dec6ccc8de0dab097433a88cf2127 to pi-releaseandroid-build-team Robot
Change-Id: I5228dc828b133edd477a283638a18276f1f83461
2017-12-07Manually merge changes from giant AOSP topicStephen Li
Change-Id: I964109a006b9a2e80e1b48615eea89d822277657
2017-12-07DO NOT MERGE: Merge Oreo MR1 into master am: 5edc9cd6a1 -s oursXin Li
am: 0caeb3ca28 Change-Id: I1d42cb402b77e55861a18d2a6a8e7f51a4318726
2017-12-07DO NOT MERGE: Merge Oreo MR1 into masterXin Li
am: 5edc9cd6a1 -s ours Change-Id: I1783d00546ce69c6cb4b7b87f61c3d5dc87cab4f
2017-12-06DO NOT MERGE: Merge Oreo MR1 into masterandroid-wear-p-preview-2android-wear-8.0.0_r1android-p-preview-5android-p-preview-4android-p-preview-3android-p-preview-2android-p-preview-1android-o-mr1-iot-release-1.0.2android-o-mr1-iot-release-1.0.1android-o-mr1-iot-release-1.0.0android-o-mr1-iot-preview-8android-o-mr1-iot-preview-7o-mr1-iot-preview-8o-mr1-iot-preview-7Xin Li
Exempt-From-Owner-Approval: Changes already landed internally Change-Id: I539da7898a79de815d734f2f74e71e2f263c7496
2017-12-03Snap for 4481641 from f8ea581a5c3a8951c2a35506fa1557b8b6cb04e4 to pi-releaseandroid-build-team Robot
Change-Id: Iae5b1557d9c74df5cb92164fc5bb92df4aee84c7
2017-12-03pbcamera: Add nofityEaselFatalError am: c13b534706Chien-Yu Chen
am: c2472849b6 Change-Id: Idfb149e82dad55e08e068367ab9e2ebfdd25b0b4
2017-12-03pbcamera: Add nofityEaselFatalErrorChien-Yu Chen
am: c13b534706 Change-Id: I6ec6841a989e3a6b928160c2cf5b10e7910509fd
2017-11-30pbcamera: Add nofityEaselFatalErrorChien-Yu Chen
Add a function to notify HDR+ client when Easel encountered a fatal error. Test: CTS Bug: 67897917 Change-Id: Id43c4196dda5f145a1850f9a85ea82b13eb24b67
2017-11-15Snap for 4453288 from 0d842aa24dc61770a02270876e4835310edf01e2 to pi-releaseandroid-build-team Robot
Change-Id: I6fec8cef9f7e993c94b145510c009d898f7b21f3
2017-11-15Merge remote-tracking branch 'goog/stage-aosp-master' into HEADXin Li
am: 9635a4258e Change-Id: I733bc38739708e7cee6e4cb9ba26233e8f42d778
2017-11-14Merge remote-tracking branch 'goog/stage-aosp-master' into HEADXin Li
Change-Id: I60900b528b86c782d3838ca1096e560518fad380
2017-11-13Merge commit 'f2cccfc32c7f686c13beee507e21387dfb47680a' into HEADXin Li
Change-Id: I1794f024881aab16594f0df852bd91a7c31d2dbc
2017-11-01Snap for 4428213 from 72865869512448012c5691889acd741bfef5c574 to pi-releaseandroid-build-team Robot
Change-Id: Ic303e0e83000cda0fbe262899f61040ea71098e7
2017-10-30pbcamera: Add nofityEaselFatalErrorChien-Yu Chen
Add a function to notify HDR+ client when Easel encountered a fatal error. Test: CTS Bug: 67897917 Change-Id: Id43c4196dda5f145a1850f9a85ea82b13eb24b67
2017-10-25Snap for 4415813 from 85dc41f47f7674ef00b0dc86415dfdff4b3d2133 to pi-releaseandroid-build-team Robot
Change-Id: I755004783f04706d18ae8146194fff24e0d6540a
2017-10-24Merge remote-tracking branch 'goog/stage-aosp-master' into HEAD am: ↵Bill Yi
2b2bfd44f1 am: 3896a9d6a2 am: 8c693e31c2 Change-Id: I1a13a1ef960c7545947e8a311664f1c2613934db
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-03 04:32:05 +0000