summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* camera: Add thermal throttle callbackandroid-mainline-10.0.0_r9android-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 Chen2019-08-191-0/+4
* [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 Li2019-02-240-0/+0
|\
| * DO NOT MERGE - Merge pi-dev@5234907 into stage-aosp-masterandroid-o-mr1-iot-release-1.0.14android-o-mr1-iot-release-1.0.13Xin Li2019-02-200-0/+0
| |\
* | \ [automerger skipped] DO NOT MERGE am: d0e7fcebc4 -s ours am: 1fcf622c1d -s ...Xin Li2018-12-100-0/+0
|\ \ \ | | |/ | |/|
| * | [automerger skipped] DO NOT MERGE am: d0e7fcebc4 -s oursXin Li2018-12-100-0/+0
| |\|
| | * [automerger skipped] DO NOT MERGEXin Li2018-12-100-0/+0
| | |\
| | | * DO 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 Li2018-12-070-0/+0
| | |/|
| | | * Snap 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_r3android-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_r14android-vts-9.0_r13android-vts-9.0_r12android-vts-9.0_r11android-vts-9.0_r10android-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_r2android-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_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 Robot2017-12-281-0/+4
| | | |\
| | | * \ Snap for 4517567 from ac8e04c57938d8eaed6c2d965472375b1501063e to pi-releaseandroid-build-team Robot2017-12-2411-2/+28
| | | |\ \
| | | * \ \ Snap for 4496165 from 6688893a460dec6ccc8de0dab097433a88cf2127 to pi-releaseandroid-build-team Robot2017-12-110-0/+0
| | | |\ \ \
| | | * \ \ \ Snap for 4481641 from f8ea581a5c3a8951c2a35506fa1557b8b6cb04e4 to pi-releaseandroid-build-team Robot2017-12-030-0/+0
| | | |\ \ \ \
| | | * \ \ \ \ Snap for 4453288 from 0d842aa24dc61770a02270876e4835310edf01e2 to pi-releaseandroid-build-team Robot2017-11-150-0/+0
| | | |\ \ \ \ \
| | | * \ \ \ \ \ Snap for 4428213 from 72865869512448012c5691889acd741bfef5c574 to pi-releaseandroid-build-team Robot2017-11-011-0/+6
| | | |\ \ \ \ \ \
| | | * \ \ \ \ \ \ Snap for 4415813 from 85dc41f47f7674ef00b0dc86415dfdff4b3d2133 to pi-releaseandroid-build-team Robot2017-10-250-0/+0
| | | |\ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ Snap for 4402171 from f7dc0d14bf95e51c0106c758dd94dc1984bc42ed to pi-releaseandroid-build-team Robot2017-10-181-0/+1
| | | |\ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ Snap for 4386413 from e1769f8ee154e1917d6f116a827ca2d2cb0255c3 to pi-releaseandroid-build-team Robot2017-10-101-0/+1
| | | |\ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ Snap for 4375922 from 427c6082d910848aeae1d060d62bebee5187aca6 to pi-releaseandroid-build-team Robot2017-10-041-66/+21
| | | |\ \ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ \ release-request-ed8626b9-4479-4c76-9207-5f511f136606-for-git_pi-release-43547...android-build-team Robot2017-09-221-0/+4
| | | |\ \ \ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ \ \ release-request-e2e4ef47-6e2d-4fd3-aa91-845ba8826fbc-for-git_pi-release-43492...android-build-team Robot2017-09-201-7/+4
| | | |\ \ \ \ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ \ \ \ release-request-cacfaf25-4304-4e6b-ab4e-089367c7ed39-for-git_pi-release-43265...android-build-team Robot2017-09-101-0/+5
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ \ \ \ \ release-request-f7e8a600-b041-4cd7-94a0-d043d188195c-for-git_pi-release-43185...android-build-team Robot2017-09-062-3/+6
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ release-request-b4448e78-a682-4bc1-b691-b70e74fef19f-for-git_pi-release-43144...android-build-team Robot2017-09-031-1/+10
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ release-request-48587b2e-b0d9-4e33-ae5f-05bd16bc9d6f-for-git_pi-release-43088...android-build-team Robot2017-08-313-2/+27
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ release-request-d9d65d1a-80f5-45e5-a00f-5a3915c3d445-for-git_pi-release-43039...android-build-team Robot2017-08-291-0/+9
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ release-request-c3d19af8-7ed9-4d42-9f37-c34f7f76db73-for-git_pi-release-42937...android-build-team Robot2017-08-231-1/+4
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ release-request-64fc473b-7e45-48f5-b2f7-3c916e338608-for-git_pi-release-42497...android-build-team Robot2017-08-061-1/+1
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ release-request-d4f45cf4-9d73-4828-baa4-f73aa4280cd0-for-git_pi-release-42412...android-build-team Robot2017-08-031-2/+1
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
* | | | | | | | | | | | | | | | | | | | | | | | Merge Android Pie into master am: 2d88c771f9 am: 6a504415fa am: bbe5109792Xin Li2018-08-080-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | Merge Android Pie into master am: 2d88c771f9 am: 6a504415faXin Li2018-08-070-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | | Merge 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-r4android-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-fcsXin Li2018-08-070-0/+0
| |/| | | | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | | Merge Android Pie into masterXin Li2018-08-070-0/+0
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge 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 Li2018-08-0611-2/+40
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / / / / / / / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | | | | Merge pi-dev-plus-aosp-without-vendor into stage-aosp-master am: 359972c3a2Xin Li2018-06-090-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | Merge pi-dev-plus-aosp-without-vendor into stage-aosp-masterXin Li2018-06-090-0/+0
|/| | | | | | | | | | | | | | | | | | | | | | | | |/ / / / / / / / / / / / / / / / / / / / / /
| * | | | | | | | | | | | | | | | | | | | | | Merge pi-dev-plus-aosp-without-vendor into stage-aosp-masterXin Li2018-06-0811-2/+40
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | | Do 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 Luo2017-12-221-0/+4
| |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | Add libhdrplusclient_headersChenjie Luo2017-12-211-0/+26
* | | | | | | | | | | | | | | | | | | | | | hardware: Migrate hardware/google/easel to hardwre/google/easel/amberChenjie Luo2017-12-2010-2/+2
| |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | Manually merge changes from giant AOSP topicStephen Li2017-12-070-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | DO NOT MERGE: Merge Oreo MR1 into master am: 5edc9cd6a1 -s oursXin Li2017-12-070-0/+0
| |\| | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | DO NOT MERGE: Merge Oreo MR1 into masterXin Li2017-12-070-0/+0
| | |\| | | | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | | | DO 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 Li2017-12-068-66/+208
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / / / / / / / / | | |/| | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | pbcamera: Add nofityEaselFatalError am: c13b534706Chien-Yu Chen2017-12-030-0/+0
|\| | | | | | | | | | | | | | | | | | | | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | pbcamera: Add nofityEaselFatalErrorChien-Yu Chen2017-12-031-0/+6
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | | | | | | pbcamera: Add nofityEaselFatalErrorChien-Yu Chen2017-11-301-0/+6
* | | | | | | | | | | | | | | | | | | | | Merge remote-tracking branch 'goog/stage-aosp-master' into HEADXin Li2017-11-150-0/+0
|\| | | | | | | | | | | | | | | | | | | | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | Merge remote-tracking branch 'goog/stage-aosp-master' into HEADXin Li2017-11-140-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / / / / / / / | | |/| | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | Merge commit 'f2cccfc32c7f686c13beee507e21387dfb47680a' into HEADXin Li2017-11-138-66/+208
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
* | | | | | | | | | | | | | | | | | | | | pbcamera: Add nofityEaselFatalErrorChien-Yu Chen2017-10-301-0/+6
| |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | Merge remote-tracking branch 'goog/stage-aosp-master' into HEAD am: 2b2bfd44f...Bill Yi2017-10-240-0/+0
|\| | | | | | | | | | | | | | | | | | | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | |