summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Mark ab/7061308 as merged in stage.HEADandroid-s-beta-5android-s-beta-4android-s-beta-3android-s-beta-2android-s-beta-1mastermain-cg-testing-releaseandroid-s-beta-5android-s-beta-4Xin Li2021-02-200-0/+0
|\
| * Mark ab/6881855 as merged am: 62c10a1adbXin Li2020-11-250-0/+0
| |\
| * \ Cleanup references to system/core/base -> system/libbase am: 4a80f1f3dd am: e...Baligh Uddin2020-10-241-1/+1
| |\ \
| | * \ Cleanup references to system/core/base -> system/libbase am: 4a80f1f3dd am: e...Baligh Uddin2020-10-241-1/+1
| | |\ \
| * | | | [automerger skipped] Skip ab/6749736 in stage. am: 598ede6bae -s ours am: dbb...Xin Li2020-10-090-0/+0
| |\| | |
| | * | | [automerger skipped] Skip ab/6749736 in stage. am: 598ede6bae -s oursXin Li2020-10-090-0/+0
| | |\ \ \
* | | \ \ \ [LSC] Add LOCAL_LICENSE_KINDS to hardware/qcom/sdm845/display am: ab675870b7Bob Badour2021-02-1915-0/+86
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | |
| * | | | | [LSC] Add LOCAL_LICENSE_KINDS to hardware/qcom/sdm845/displayBob Badour2021-02-1215-0/+86
|/ / / / /
* | | | / Mark ab/6881855 as mergedandroid-s-preview-1Xin Li2020-11-230-0/+0
|\| | | | | |_|_|/ |/| | |
| * | | [automerger skipped] Merge Android R am: 661e643aac -s ours am: 0fa4074050 -s...Xin Li2020-09-110-0/+0
| |\| |
| | * | [automerger skipped] Merge Android R am: 661e643aac -s ours am: 0fa4074050 -s...Xin Li2020-09-110-0/+0
| | |\ \
| | | * \ [automerger skipped] Merge Android R am: 661e643aac -s ours am: 0fa4074050 -s...Xin Li2020-09-110-0/+0
| | | |\ \
| * | | | | [automerger skipped] Merge Android R (rvc-dev-plus-aosp-without-vendor@669270...Xin Li2020-09-010-0/+0
| |\| | | |
| | * | | | [automerger skipped] Merge Android R (rvc-dev-plus-aosp-without-vendor@669270...Xin Li2020-09-010-0/+0
| | |\| | |
| | | * | | [automerger skipped] Merge Android R (rvc-dev-plus-aosp-without-vendor@669270...Xin Li2020-09-010-0/+0
| | | |\ \ \
| * | | \ \ \ Merge "[automerger skipped] hwc2: add locks for callback functions am: f0360a...Automerger Merge Worker2020-07-020-0/+0
| |\ \ \ \ \ \
| | * \ \ \ \ \ [automerger skipped] hwc2: add locks for callback functions am: f0360a1db2 -s...Chris Lu2020-07-020-0/+0
| | |\ \ \ \ \ \
| | | * \ \ \ \ \ [automerger skipped] hwc2: add locks for callback functions am: f0360a1db2 -s...android-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_r30android11-qpr3-s1-releaseandroid11-qpr3-releaseandroid11-qpr2-releaseandroid11-qpr1-c-releaseandroid11-d2-releaseChris Lu2020-07-020-0/+0
| | | |\ \ \ \ \ \
| * | | \ \ \ \ \ \ [automerger skipped] hwc2: add locks for callback functions am: f0360a1db2 -s...Chris Lu2020-07-020-0/+0
| |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | |/| | | / / / / / | | | |_|/ / / / / | | |/| | | | | |
| * | | | | | | | [automerger skipped] hwc2: add locks for callback functions am: f0360a1db2 -s...Chris Lu2020-07-020-0/+0
| |\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge "hwc2: add locks for callback functions" into rvc-dev am: fbed8adaff am...Harrison Lingren2020-07-010-0/+0
| |\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ Merge "Merge "hwc2: add locks for callback functions" into rvc-dev am: fbed8a...Automerger Merge Worker2020-07-010-0/+0
| |\ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ Merge "hwc2: add locks for callback functions" into rvc-dev am: fbed8adaff am...Harrison Lingren2020-07-012-6/+18
| | |\ \ \ \ \ \ \ \ \ \
| * | \ \ \ \ \ \ \ \ \ \ Merge "hwc2: add locks for callback functions" into rvc-dev am: fbed8adaff am...Harrison Lingren2020-07-012-6/+18
| |\ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / | |/| | | | | / / / / / / | | | |_|_|_|/ / / / / / | | |/| | | | | | | | |
| | * | | | | | | | | | Merge "hwc2: add locks for callback functions" into rvc-dev am: fbed8adaff am...Harrison Lingren2020-07-012-6/+18
| | |\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | [automerger skipped] gralloc: Additional buffer validation in getTransportSiz...raylinhsu2020-06-120-0/+0
| |\| | | | | | | | | | |
| | * | | | | | | | | | | [automerger skipped] gralloc: Additional buffer validation in getTransportSiz...raylinhsu2020-06-120-0/+0
| | |\ \ \ \ \ \ \ \ \ \ \
| * | \ \ \ \ \ \ \ \ \ \ \ [automerger skipped] gralloc: Additional buffer validation in getTransportSiz...raylinhsu2020-06-120-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ [automerger skipped] gralloc: Additional buffer validation in getTransportSiz...raylinhsu2020-06-120-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ [automerger skipped] Merge QQ3A.200605.002 into master am: f671eefd76 -s ours...Xin Li2020-06-080-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ fix -Wunreachable-code-loop-increment am: e51ddb3fb6 am: 8dacc4102d am: 6c25c...George Burgess IV2020-05-191-34/+23
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Add METADATA to display: BSD+Apache2=NOTICE am: 2ab57c49df am: cb4680c563 am:...Bob Badour2020-05-021-0/+3
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ gralloc: Additional buffer validation in getTransportSize am: 9c248775d3 am: ...raylinhsu2020-04-220-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ gralloc: Additional buffer validation in getTransportSize am: 9c248775d3 am: ...raylinhsu2020-04-221-2/+4
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|/ / / / / / / / / / / / | | | |/| | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | | gralloc: Additional buffer validation in getTransportSize am: 9c248775d3 am: ...raylinhsu2020-04-221-2/+4
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ gralloc: Additional buffer validation in getTransportSize am: 9c248775d3 am: ...raylinhsu2020-04-220-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ gralloc: Additional buffer validation in getTransportSize am: 9c248775d3 am: ...raylinhsu2020-04-221-2/+4
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ sdm: Allow skip validate after idle power collapse am: 5b0da005fb am: a3cc957...Yichi Chen2020-04-200-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|/ / / / / / / / / / / / / / / / / / / | | |/| | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | sdm: Allow skip validate after idle power collapse am: 5b0da005fb am: a3cc957...Yichi Chen2020-04-201-1/+2
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|/ / / / / / / / / / / / / / / / / / | | | |/| | | | | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | | | | | sdm: Allow skip validate after idle power collapse am: 5b0da005fb am: a3cc9570b1Yichi Chen2020-04-201-1/+2
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ sdm: Allow skip validate after idle power collapse am: 5b0da005fb am: fa07da0...Yichi Chen2020-04-200-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ sdm: Allow skip validate after idle power collapse am: 5b0da005fb am: a3cc957...Yichi Chen2020-04-201-1/+2
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ [automerger skipped] DO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp into st...Xin Li2020-04-100-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge remote-tracking branch 'goog/qcom/release/LA.UM.7.8.9.C2.08.00.00.618.0...Alex Hong2020-03-230-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|/ / / / / / / / / / / / / / / / / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | | | | | Merge remote-tracking branch 'goog/qcom/release/LA.UM.7.8.9.C2.08.00.00.618.0...Alex Hong2020-03-234-4/+16
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|_|/ / / / / / / / / / / / / / / / / / / / / | | | |/| | | | | | | | | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | | | | | | | | | Merge remote-tracking branch 'goog/qcom/release/LA.UM.7.8.9.C2.08.00.00.618.0...Alex Hong2020-03-234-4/+16
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge "Merge remote-tracking branch 'goog/qcom/release/LA.UM.7.8.9.C2.08.00.0...Automerger Merge Worker2020-03-230-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge remote-tracking branch 'goog/qcom/release/LA.UM.7.8.9.C2.08.00.00.618.0...Alex Hong2020-03-234-4/+16
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ [automerger skipped] DO NOT MERGE - Merge qt-qpr1-dev-plus-aosp@6304901 into ...Xin Li2020-03-200-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge "sdm: Add HAL_PIXEL_FORMAT_NV21_ZSL support in GetSDMFormat" into rvc-d...TreeHugger Robot2020-03-200-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|/ / / / / / / / / / / / / / / / / / / / / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | |