summaryrefslogtreecommitdiff
AgeCommit message (Expand)Author
2021-06-14DO NOT MERGE - Merge ab/7272582 am: 098fda2600android-s-beta-5android-s-beta-4android-s-beta-3android-s-beta-5android-s-beta-4Xin Li
2021-06-11DO NOT MERGE - Merge ab/7272582Xin Li
2021-04-21[LSC] Add LOCAL_LICENSE_KINDS to frameworks/opt/car/services am: f5e6452c26Bob Badour
2021-04-20[LSC] Add LOCAL_LICENSE_KINDS to frameworks/opt/car/servicesandroid-s-beta-2android-s-beta-1Bob Badour
2021-03-03[automerger skipped] Merge RQ2A.210305.007 am: 37fe041479 -s ours am: f960f88...temp_ab_7272582Xin Li
2021-03-03[automerger skipped] Merge RQ2A.210305.007 am: 37fe041479 -s oursXin Li
2021-03-03Merge RQ2A.210305.007Xin Li
2021-02-24Merge "Fix checkbuild." into rvc-qpr-dev-plus-aospXin Li
2021-02-24[automerger skipped] Fix checkbuild. am: 7ab562b6cf -s oursXin Li
2021-02-24Fix checkbuild.Xin Li
2021-02-23Fix checkbuild.temp_RQ2A.210305.007Xin Li
2021-02-23[automerger skipped] Merge ab/7061308 into stage. am: 375ca5eb44 -s oursXin Li
2021-02-21Merge ab/7061308 into stage.Xin Li
2021-02-16[LSC] Add LOCAL_LICENSE_KINDS to frameworks/opt/car/services am: 858168baa5 a...Bob Badour
2021-02-16[LSC] Add LOCAL_LICENSE_KINDS to frameworks/opt/car/services am: 858168baa5Bob Badour
2021-02-12[LSC] Add LOCAL_LICENSE_KINDS to frameworks/opt/car/servicesandroid-s-preview-1Bob Badour
2021-02-04DO NOT MERGE Specify version for aidl_interface explicitly am: 6f88215be9 am:...Jeongik Cha
2021-02-04DO NOT MERGE Specify version for aidl_interface explicitly am: 6f88215be9Jeongik Cha
2021-01-28DO NOT MERGE Specify version for aidl_interface explicitlyJeongik Cha
2020-12-10[automerger skipped] DO NOT MERGE - Merge Android R QPR1 am: d7c74a4489 -s ou...Xin Li
2020-12-10[automerger skipped] DO NOT MERGE - Merge Android R QPR1 am: d7c74a4489 -s oursXin Li
2020-12-08DO NOT MERGE - Merge Android R QPR1Xin Li
2020-12-04[automerger skipped] Add dependency for android.hardware.automotive.vehicle-V...Xin Li
2020-12-04Add dependency for android.hardware.automotive.vehicle-V2.0-java.temp_rvc_qpr_mergeXin Li
2020-12-03[automerger skipped] Merge rvc-qpr-dev-plus-aosp-without-vendor@6881855 am: 3...Xin Li
2020-11-23Merge rvc-qpr-dev-plus-aosp-without-vendor@6881855Xin Li
2020-11-11Disallow launching non-embedded Activity in virtual display only for new task...Yuncheol Heo
2020-11-11Disallow launching non-embedded activity on virtual display. am: 470bb47655Yuncheol Heo
2020-11-11[automerger skipped] Fix CarServicesTest. am: 9d3a0be7ec -s oursYuncheol Heo
2020-11-10Disallow launching non-embedded Activity in virtual display only for new task.android-11.0.0_r46android-11.0.0_r43android-11.0.0_r40android-11.0.0_r39android-11.0.0_r38android11-qpr3-s1-releaseandroid11-qpr3-releaseYuncheol Heo
2020-11-06Disallow launching non-embedded activity on virtual display.Yuncheol Heo
2020-11-05Fix CarServicesTest.Yuncheol Heo
2020-11-06Fix CarServicesTest.Yuncheol Heo
2020-10-09[automerger skipped] Skip ab/6749736 in stage. am: 950b8b50fe -s ours am: ff1...Xin Li
2020-10-09[automerger skipped] Skip ab/6749736 in stage. am: 950b8b50fe -s oursXin Li
2020-10-08Skip ab/6749736 in stage.Xin Li
2020-09-22[automerger skipped] Fix CtsStrictJavaPackagesTestCases am: 9131d0b918 -s oursMayank Garg
2020-09-18Fix CtsStrictJavaPackagesTestCasesandroid-11.0.0_r30android11-qpr1-c-releaseMayank Garg
2020-09-15Fix CtsStrictJavaPackagesTestCasesMayank Garg
2020-09-11[automerger skipped] Merge Android R am: b68ac114f8 -s ours am: 835efccc5e -s...Xin Li
2020-09-11[automerger skipped] Merge Android R am: b68ac114f8 -s ours am: 835efccc5e -s...Xin Li
2020-09-11[automerger skipped] Merge Android R am: b68ac114f8 -s ours am: 835efccc5e -s...Xin Li
2020-09-11[automerger skipped] Merge Android R am: b68ac114f8 -s oursXin Li
2020-09-09[automerger skipped] Remove duplicated class from boot/system class path am: ...Eric Jeong
2020-09-08Merge Android RXin Li
2020-09-02Remove duplicated class from boot/system class pathEric Jeong
2020-09-01[automerger skipped] Merge Android R (rvc-dev-plus-aosp-without-vendor@669270...Xin Li
2020-09-01[automerger skipped] Merge Android R (rvc-dev-plus-aosp-without-vendor@669270...Xin Li
2020-09-01[automerger skipped] Merge Android R (rvc-dev-plus-aosp-without-vendor@669270...Xin Li
2020-08-27Merge Android R (rvc-dev-plus-aosp-without-vendor@6692709)temp_sam_168057903Xin Li