aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2021-10-08[automerger skipped] Merge "Merge Android 12" am: 2d9cb9aa92 -s ours am: ↵t_frc_tz4_330443010t_frc_swc_330443040t_frc_swc_330443010t_frc_sta_330443010t_frc_sch_330443040t_frc_sch_330443010t_frc_res_330443000t_frc_per_330444010t_frc_odp_330442040t_frc_odp_330442000t_frc_neu_330443030t_frc_neu_330443000t_frc_net_330443000t_frc_med_330443030t_frc_ips_330443010t_frc_ext_330443000t_frc_doc_330543000t_frc_doc_330443060t_frc_doc_330443000t_frc_con_330443020t_frc_cbr_330443000t_frc_ase_330444010t_frc_art_330443060t_frc_adb_330444000frc_340821000frc_340819280frc_340819220frc_340819190frc_340819030frc_340819020frc_340819010frc_340818170frc_340818110android-vts-14.0_r4android-vts-14.0_r3android-vts-14.0_r2android-vts-14.0_r1android-u-beta-1-gplandroid-security-14.0.0_r8android-security-14.0.0_r7android-security-14.0.0_r6android-security-14.0.0_r5android-security-14.0.0_r4android-security-14.0.0_r3android-security-14.0.0_r2android-security-14.0.0_r1android-platform-14.0.0_r7android-platform-14.0.0_r6android-platform-14.0.0_r5android-platform-14.0.0_r4android-platform-14.0.0_r3android-platform-14.0.0_r2android-platform-14.0.0_r1android-cts-14.0_r4android-cts-14.0_r3android-cts-14.0_r2android-cts-14.0_r1android-14.0.0_r9android-14.0.0_r8android-14.0.0_r7android-14.0.0_r6android-14.0.0_r5android-14.0.0_r45android-14.0.0_r44android-14.0.0_r43android-14.0.0_r42android-14.0.0_r41android-14.0.0_r40android-14.0.0_r4android-14.0.0_r39android-14.0.0_r38android-14.0.0_r37android-14.0.0_r36android-14.0.0_r35android-14.0.0_r34android-14.0.0_r33android-14.0.0_r32android-14.0.0_r31android-14.0.0_r30android-14.0.0_r3android-14.0.0_r29android-14.0.0_r28android-14.0.0_r27android-14.0.0_r26android-14.0.0_r25android-14.0.0_r24android-14.0.0_r23android-14.0.0_r22android-14.0.0_r21android-14.0.0_r20android-14.0.0_r2android-14.0.0_r19android-14.0.0_r18android-14.0.0_r17android-14.0.0_r16android-14.0.0_r15android-14.0.0_r14android-14.0.0_r13android-14.0.0_r12android-14.0.0_r11android-14.0.0_r10android-14.0.0_r1android-13.0.0_r83android-13.0.0_r82android-13.0.0_r81android-13.0.0_r80android-13.0.0_r79android-13.0.0_r78android-13.0.0_r77android-13.0.0_r76android-13.0.0_r75android-13.0.0_r74android-13.0.0_r73android-13.0.0_r72android-13.0.0_r71android-13.0.0_r70android-13.0.0_r69android-13.0.0_r68android-13.0.0_r67android-13.0.0_r66android-13.0.0_r65android-13.0.0_r64android-13.0.0_r63android-13.0.0_r62android-13.0.0_r61android-13.0.0_r60android-13.0.0_r59android-13.0.0_r58android-13.0.0_r57android-13.0.0_r56android-13.0.0_r55android-13.0.0_r54android-13.0.0_r53android-13.0.0_r52android-13.0.0_r51android-13.0.0_r50android-13.0.0_r49android-13.0.0_r48android-13.0.0_r47android-13.0.0_r46android-13.0.0_r45android-13.0.0_r44android-13.0.0_r43android-13.0.0_r42android-13.0.0_r41android-13.0.0_r40android-13.0.0_r39android-13.0.0_r38android-13.0.0_r37android-13.0.0_r36android-13.0.0_r35android-13.0.0_r34android-13.0.0_r33android-13.0.0_r32android-13.0.0_r30android-13.0.0_r29android-13.0.0_r28android-13.0.0_r27android-13.0.0_r24android-13.0.0_r23android-13.0.0_r22android-13.0.0_r21android-13.0.0_r20android-13.0.0_r19android-13.0.0_r18android-13.0.0_r17android-13.0.0_r16aml_uwb_341513070aml_uwb_341511050aml_uwb_341310300aml_uwb_341310030aml_uwb_341111010aml_uwb_341011000aml_uwb_331910010aml_uwb_331820070aml_uwb_331613010aml_uwb_331611010aml_uwb_331410010aml_uwb_331310030aml_uwb_331115000aml_uwb_331015040aml_uwb_330810010aml_tz5_341510070aml_tz5_341510050aml_tz5_341510010aml_tz4_332714070aml_tz4_332714050aml_tz4_332714010aml_tz4_331910000aml_tz4_331314030aml_tz4_331314020aml_tz4_331314010aml_tz4_331012050aml_tz4_331012040aml_tz4_331012000aml_rkp_341510000aml_rkp_341311000aml_rkp_341114000aml_rkp_341015010aml_rkp_341012000aml_odp_341610000aml_hef_341613000aml_hef_341512030aml_hef_341415040aml_hef_341311010aml_hef_341114030aml_go_wif_330911000aml_go_uwb_330912000aml_go_tz4_330912000aml_go_tet_330914010aml_go_swc_330913000aml_go_sta_330911000aml_go_sdk_330810000aml_go_sch_330911000aml_go_res_330912000aml_go_per_330912000aml_go_odp_330913000aml_go_odp_330912000aml_go_neu_330912000aml_go_net_330913000aml_go_mpr_330912000aml_go_med_330913000aml_go_ips_330911000aml_go_ext_330912000aml_go_doc_330912000aml_go_con_330913000aml_go_cbr_330912000aml_go_ase_330913000aml_go_art_330913000aml_go_ads_330915100aml_go_ads_330915000aml_go_ads_330913000aml_go_adb_330913000aml_cfg_341510000aml_ase_341510000aml_ase_341410000aml_ase_341310010aml_ase_341113000aml_ase_340913000aml_ase_331311020aml_ase_331112000aml_ase_331011020aml_ads_341615050aml_ads_341517040aml_ads_341413000aml_ads_341316030aml_ads_341131050aml_ads_341027030aml_ads_340915050aml_ads_331920180aml_ads_331814200aml_ads_331710270aml_ads_331611190aml_ads_331511020aml_ads_331418080aml_ads_331131000main-16k-with-phonesmain-16kandroid14-tests-releaseandroid14-security-releaseandroid14-s2-releaseandroid14-s1-releaseandroid14-releaseandroid14-qpr2-s5-releaseandroid14-qpr2-s4-releaseandroid14-qpr2-s3-releaseandroid14-qpr2-s2-releaseandroid14-qpr2-s1-releaseandroid14-qpr2-releaseandroid14-qpr1-s2-releaseandroid14-qpr1-releaseandroid14-platform-releaseandroid14-mainline-uwb-releaseandroid14-mainline-healthfitness-releaseandroid14-mainline-appsearch-releaseandroid14-mainline-adservices-releaseandroid14-gsiandroid14-devandroid14-d2-s5-releaseandroid14-d2-s4-releaseandroid14-d2-s3-releaseandroid14-d2-s2-releaseandroid14-d2-s1-releaseandroid14-d2-releaseandroid14-d1-s7-releaseandroid14-d1-s6-releaseandroid14-d1-s5-releaseandroid14-d1-s4-releaseandroid14-d1-s3-releaseandroid14-d1-s2-releaseandroid14-d1-s1-releaseandroid14-d1-releaseandroid13-qpr3-s9-releaseandroid13-qpr3-s8-releaseandroid13-qpr3-s7-releaseandroid13-qpr3-s6-releaseandroid13-qpr3-s5-releaseandroid13-qpr3-s4-releaseandroid13-qpr3-s3-releaseandroid13-qpr3-s2-releaseandroid13-qpr3-s14-releaseandroid13-qpr3-s13-releaseandroid13-qpr3-s12-releaseandroid13-qpr3-s11-releaseandroid13-qpr3-s10-releaseandroid13-qpr3-s1-releaseandroid13-qpr3-releaseandroid13-qpr3-c-s8-releaseandroid13-qpr3-c-s7-releaseandroid13-qpr3-c-s6-releaseandroid13-qpr3-c-s5-releaseandroid13-qpr3-c-s4-releaseandroid13-qpr3-c-s3-releaseandroid13-qpr3-c-s2-releaseandroid13-qpr3-c-s12-releaseandroid13-qpr3-c-s11-releaseandroid13-qpr3-c-s10-releaseandroid13-qpr3-c-s1-releaseandroid13-qpr2-s9-releaseandroid13-qpr2-s8-releaseandroid13-qpr2-s7-releaseandroid13-qpr2-s6-releaseandroid13-qpr2-s5-releaseandroid13-qpr2-s3-releaseandroid13-qpr2-s2-releaseandroid13-qpr2-s12-releaseandroid13-qpr2-s11-releaseandroid13-qpr2-s10-releaseandroid13-qpr2-s1-releaseandroid13-qpr2-releaseandroid13-qpr2-b-s1-releaseandroid13-qpr1-s8-releaseandroid13-qpr1-s7-releaseandroid13-qpr1-s6-releaseandroid13-qpr1-s5-releaseandroid13-qpr1-s4-releaseandroid13-qpr1-s3-releaseandroid13-qpr1-s2-releaseandroid13-qpr1-s1-releaseandroid13-qpr1-releaseandroid13-mainline-uwb-releaseandroid13-mainline-tzdata4-releaseandroid13-mainline-go-wifi-releaseandroid13-mainline-go-uwb-releaseandroid13-mainline-go-tzdata4-releaseandroid13-mainline-go-tethering-releaseandroid13-mainline-go-sdkext-releaseandroid13-mainline-go-scheduling-releaseandroid13-mainline-go-resolv-releaseandroid13-mainline-go-permission-releaseandroid13-mainline-go-os-statsd-releaseandroid13-mainline-go-odp-releaseandroid13-mainline-go-neuralnetworks-releaseandroid13-mainline-go-networking-releaseandroid13-mainline-go-mediaprovider-releaseandroid13-mainline-go-media-swcodec-releaseandroid13-mainline-go-media-releaseandroid13-mainline-go-ipsec-releaseandroid13-mainline-go-extservices-releaseandroid13-mainline-go-documentsui-releaseandroid13-mainline-go-conscrypt-releaseandroid13-mainline-go-cellbroadcast-releaseandroid13-mainline-go-art-releaseandroid13-mainline-go-appsearch-releaseandroid13-mainline-go-adservices-releaseandroid13-mainline-go-adbd-releaseandroid13-mainline-appsearch-releaseandroid13-mainline-adservices-releaseandroid13-frc-scheduling-releaseandroid13-frc-resolv-releaseandroid13-frc-permission-releaseandroid13-frc-os-statsd-releaseandroid13-frc-odp-releaseandroid13-frc-neuralnetworks-releaseandroid13-frc-networking-releaseandroid13-frc-media-swcodec-releaseandroid13-frc-media-releaseandroid13-frc-ipsec-releaseandroid13-frc-extservices-releaseandroid13-frc-documentsui-releaseandroid13-frc-conscrypt-releaseandroid13-frc-cellbroadcast-releaseandroid13-frc-art-releaseandroid13-frc-adbd-releaseandroid13-devandroid13-d4-s2-releaseandroid13-d4-s1-releaseandroid13-d4-releaseandroid13-d3-s1-releaseandroid13-d2-releaseaml_tz5_341510010aml_tz4_332714010Xin Li
f8ff433f29 -s ours am: 84975a4332 -s ours am: e154e7e6c6 -s ours am: 07c476ae6d -s ours am skip reason: Merged-In If0b691fb263ee2717844e8bda388310d2360ffd6 with SHA-1 43f6eccdbe is already in history Original change: https://android-review.googlesource.com/c/platform/frameworks/opt/calendar/+/1847440 Change-Id: I017dabf6708f923301bd6bc7944c3e0e4d537612
2021-10-08[automerger skipped] Merge "Merge Android 12" am: 2d9cb9aa92 -s ours am: ↵Xin Li
f8ff433f29 -s ours am: 84975a4332 -s ours am: e154e7e6c6 -s ours am skip reason: Merged-In If0b691fb263ee2717844e8bda388310d2360ffd6 with SHA-1 43f6eccdbe is already in history Original change: https://android-review.googlesource.com/c/platform/frameworks/opt/calendar/+/1847440 Change-Id: Ibd320641fffe7d4fde996a5be882f52ce59d9893
2021-10-08[automerger skipped] Merge "Merge Android 12" am: 2d9cb9aa92 -s ours am: ↵android-t-preview-2android-t-preview-1android-t-beta-3android-s-v2-beta-3android-s-qpr3-beta-1android-t-preview-1android-s-v2-beta-3android-s-qpr3-beta-1Xin Li
f8ff433f29 -s ours am: 84975a4332 -s ours am skip reason: Merged-In If0b691fb263ee2717844e8bda388310d2360ffd6 with SHA-1 43f6eccdbe is already in history Original change: https://android-review.googlesource.com/c/platform/frameworks/opt/calendar/+/1847440 Change-Id: Ia694a96ca1e10688a9dc425c75c204333cd3f2ae
2021-10-08[automerger skipped] Merge "Merge Android 12" am: 2d9cb9aa92 -s ours am: ↵Xin Li
f8ff433f29 -s ours am skip reason: Merged-In If0b691fb263ee2717844e8bda388310d2360ffd6 with SHA-1 43f6eccdbe is already in history Original change: https://android-review.googlesource.com/c/platform/frameworks/opt/calendar/+/1847440 Change-Id: Ia0afb405553cd7bcf5ee2ef1282081a37e09c408
2021-10-08[automerger skipped] Merge "Merge Android 12" am: 2d9cb9aa92 -s oursXin Li
am skip reason: Merged-In If0b691fb263ee2717844e8bda388310d2360ffd6 with SHA-1 43f6eccdbe is already in history Original change: https://android-review.googlesource.com/c/platform/frameworks/opt/calendar/+/1847440 Change-Id: I97f979111e1cd992f53019aacfc3ec7317392296
2021-10-07Merge "Merge Android 12"android-s-v2-preview-2android-s-v2-preview-1android-s-v2-beta-2android-s-v2-preview-1Xin Li
2021-10-06Merge Android 12Xin Li
Bug: 202323961 Merged-In: If0b691fb263ee2717844e8bda388310d2360ffd6 Change-Id: I9de23217a0b002a577a47086e1d6a9794a8b657f
2021-08-18[automerger skipped] Merge sc-dev-plus-aosp-without-vendor@7634622 am: ↵Xin Li
43f6eccdbe -s ours am: 8bf0918045 -s ours am: 17b8a3cb2f -s ours am: 4553997a71 -s ours am skip reason: Merged-In I3187fe574f21977fa8006ab92072636f2ee110ce with SHA-1 e195d494a5 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/opt/calendar/+/15571660 Change-Id: I18c380950111007dcaaaaa67d894b822bf0885c2
2021-08-17[automerger skipped] Merge sc-dev-plus-aosp-without-vendor@7634622 am: ↵Xin Li
43f6eccdbe -s ours am: 8bf0918045 -s ours am: 17b8a3cb2f -s ours am skip reason: Merged-In I3187fe574f21977fa8006ab92072636f2ee110ce with SHA-1 e195d494a5 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/opt/calendar/+/15571660 Change-Id: Ic2cfc8e9e72fac0043dc3d0176af7a205ba260d3
2021-08-17[automerger skipped] Merge sc-dev-plus-aosp-without-vendor@7634622 am: ↵Xin Li
43f6eccdbe -s ours am: 8bf0918045 -s ours am skip reason: Merged-In I3187fe574f21977fa8006ab92072636f2ee110ce with SHA-1 e195d494a5 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/opt/calendar/+/15571660 Change-Id: I2901f53bf8a2102e736976e5e7e9f91152a7c7d8
2021-08-17[automerger skipped] Merge sc-dev-plus-aosp-without-vendor@7634622 am: ↵Xin Li
43f6eccdbe -s ours am skip reason: Merged-In I3187fe574f21977fa8006ab92072636f2ee110ce with SHA-1 e195d494a5 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/opt/calendar/+/15571660 Change-Id: If9caba63fe75186282bf57e7d6dffe4071ceb447
2021-08-14Merge sc-dev-plus-aosp-without-vendor@7634622temp_sam_202323961Xin Li
Merged-In: I3187fe574f21977fa8006ab92072636f2ee110ce Change-Id: If0b691fb263ee2717844e8bda388310d2360ffd6
2021-06-02Merge sc-mainline-prodXin Li
Bug: 189946434 Change-Id: I34e65f1765371755a217703e4345230e4feb0ac4
2021-02-16Merge "[LSC] Add LOCAL_LICENSE_KINDS to frameworks/opt/calendar" am: ↵android-mainline-12.0.0_r99android-mainline-12.0.0_r98android-mainline-12.0.0_r77android-mainline-12.0.0_r70android-mainline-12.0.0_r69android-mainline-12.0.0_r63android-mainline-12.0.0_r59android-mainline-12.0.0_r56android-mainline-12.0.0_r5android-mainline-12.0.0_r49android-mainline-12.0.0_r42android-mainline-12.0.0_r39android-mainline-12.0.0_r22android-mainline-12.0.0_r19android-mainline-12.0.0_r122android-mainline-12.0.0_r115android-mainline-12.0.0_r113android-mainline-12.0.0_r100aml_tz3_311312010android12-mainline-networkstack-releaseandroid12-mainline-art-releaseTreehugger Robot
a097a2b9dd am: 907ed0923b am: 038e536f26 am: e195d494a5 Original change: https://android-review.googlesource.com/c/platform/frameworks/opt/calendar/+/1589004 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I472612ac46893a09f4270547c0e65682fa4c691c
2021-02-16Merge "[LSC] Add LOCAL_LICENSE_KINDS to frameworks/opt/calendar" am: ↵Treehugger Robot
a097a2b9dd am: 907ed0923b am: 038e536f26 am: e195d494a5 Original change: https://android-review.googlesource.com/c/platform/frameworks/opt/calendar/+/1589004 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Iee3a920859a037fa58edea894200c776db0c10b3
2021-02-16Merge "[LSC] Add LOCAL_LICENSE_KINDS to frameworks/opt/calendar" am: ↵android-mainline-12.0.0_r4android-mainline-12.0.0_r36android-12.1.0_r9android-12.1.0_r8android-12.1.0_r7android-12.1.0_r26android-12.1.0_r25android-12.1.0_r24android-12.1.0_r23android-12.1.0_r22android-12.1.0_r21android-12.1.0_r20android-12.1.0_r19android-12.1.0_r18android-12.1.0_r17android-12.1.0_r16android-12.1.0_r15android-12.1.0_r14android-12.1.0_r13android-12.1.0_r12android-12.1.0_r11android-12.1.0_r10android-12.0.0_r32android-12.0.0_r29android-12.0.0_r28android-12.0.0_r27android-12.0.0_r26android-12.0.0_r21android-12.0.0_r20android-12.0.0_r19android-12.0.0_r18android-12.0.0_r16android12L-devandroid12L-d2-s8-releaseandroid12L-d2-s7-releaseandroid12L-d2-s6-releaseandroid12L-d2-s5-releaseandroid12L-d2-s4-releaseandroid12L-d2-s3-releaseandroid12L-d2-s2-releaseandroid12L-d2-s1-releaseandroid12L-d2-releaseandroid12-qpr3-s7-releaseandroid12-qpr3-s6-releaseandroid12-qpr3-s5-releaseandroid12-qpr3-s4-releaseandroid12-qpr3-s3-releaseandroid12-qpr3-s2-releaseandroid12-qpr3-s1-releaseandroid12-qpr3-releaseandroid12-qpr1-releaseandroid12-qpr1-d-s3-releaseandroid12-qpr1-d-s2-releaseandroid12-qpr1-d-s1-releaseandroid12-qpr1-d-releaseandroid12-devandroid12--mainline-releaseTreehugger Robot
a097a2b9dd am: 907ed0923b am: 038e536f26 Original change: https://android-review.googlesource.com/c/platform/frameworks/opt/calendar/+/1589004 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I3187fe574f21977fa8006ab92072636f2ee110ce
2021-02-16Merge "[LSC] Add LOCAL_LICENSE_KINDS to frameworks/opt/calendar" am: ↵Treehugger Robot
a097a2b9dd am: 907ed0923b Original change: https://android-review.googlesource.com/c/platform/frameworks/opt/calendar/+/1589004 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I4ef46562282f2182de813e9215e399ff3d73a707
2021-02-16Merge "[LSC] Add LOCAL_LICENSE_KINDS to frameworks/opt/calendar" am: a097a2b9ddandroid-s-beta-5android-s-beta-4android-s-beta-3android-s-beta-2android-s-beta-1android-s-beta-5android-s-beta-4Treehugger Robot
Original change: https://android-review.googlesource.com/c/platform/frameworks/opt/calendar/+/1589004 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Ifbdc1f4043f13b48ddd75e3cb3d66f23d7dc2d3e
2021-02-16Merge "[LSC] Add LOCAL_LICENSE_KINDS to frameworks/opt/calendar"android-s-preview-1Treehugger Robot
2021-02-12[LSC] Add LOCAL_LICENSE_KINDS to frameworks/opt/calendarBob Badour
Added SPDX-license-identifier-Apache-2.0 to: Android.bp tests/Android.bp Bug: 68860345 Bug: 151177513 Bug: 151953481 Test: m all Exempt-From-Owner-Approval: janitorial work Change-Id: I2713f82308d47e18ff4a53d6566e9812bc1c587f
2020-10-26Migrate Time class to use Calendar APIs.Varun Shah
Migrate the internal Time class from using the android.text.format.Time APIs to using the java.util.Calendar APIs. Note: The dst flag was removed in this CL because all member variables were made private and can only be accessed by getters and setters. This prevents unexpected behavior to occur around the dst transition border with the current usages of #normalize and #toMillis. See APPLY_DST_CHANGE_LOGIC flag documentation for more information. Bug: 159019762 Test: atest TimeTest Test: atest CalendarCommonTests Test: atest CalendarProviderTests Test: atest CtsCalendarProviderTestCases Test: atest CtsCalendarcommon2TestCases Change-Id: I31562d335a23b1f96888c121937b12daf0af3325
2020-09-11[automerger skipped] Merge "Merge Android R" am: f1445a64e7 -s ours am: ↵Xin Li
cca67f2933 -s ours am: b7230439a5 -s ours am: b64a28155a -s ours am: 082969a5b2 -s ours am skip reason: Change-Id I89c5b4a70013ab98ec5428794ec301c5ef191af3 with SHA-1 dc37d34d50 is in history Original change: https://android-review.googlesource.com/c/platform/frameworks/opt/calendar/+/1422396 Change-Id: I715fb8999e05f0ec8ecd48909a06c762dc35ff72
2020-09-11[automerger skipped] Merge "Merge Android R" am: f1445a64e7 -s ours am: ↵Xin Li
cca67f2933 -s ours am: b7230439a5 -s ours am: b64a28155a -s ours am skip reason: Change-Id I89c5b4a70013ab98ec5428794ec301c5ef191af3 with SHA-1 dc37d34d50 is in history Original change: https://android-review.googlesource.com/c/platform/frameworks/opt/calendar/+/1422396 Change-Id: I8c570e3fbe169c231341f52fbb65a13296df5b30
2020-09-11[automerger skipped] Merge "Merge Android R" am: f1445a64e7 -s ours am: ↵Xin Li
cca67f2933 -s ours am: b7230439a5 -s ours am skip reason: Change-Id I89c5b4a70013ab98ec5428794ec301c5ef191af3 with SHA-1 dc37d34d50 is in history Original change: https://android-review.googlesource.com/c/platform/frameworks/opt/calendar/+/1422396 Change-Id: I5f7ba8c1ad60ac1e1baf3bbb0a73be68b2e79db4
2020-09-11[automerger skipped] Merge "Merge Android R" am: f1445a64e7 -s ours am: ↵Xin Li
cca67f2933 -s ours am skip reason: Change-Id I89c5b4a70013ab98ec5428794ec301c5ef191af3 with SHA-1 dc37d34d50 is in history Original change: https://android-review.googlesource.com/c/platform/frameworks/opt/calendar/+/1422396 Change-Id: I408242631d648790b12e921bf79fb215f39b3eb6
2020-09-11[automerger skipped] Merge "Merge Android R" am: f1445a64e7 -s oursXin Li
am skip reason: Change-Id I89c5b4a70013ab98ec5428794ec301c5ef191af3 with SHA-1 dc37d34d50 is in history Original change: https://android-review.googlesource.com/c/platform/frameworks/opt/calendar/+/1422396 Change-Id: I5c1e2a5249889ab9cd45837683fce7a7d87ad7f6
2020-09-10Merge "Merge Android R"Xin Li
2020-09-08Merge Android RXin Li
Bug: 168057903 Merged-In: I89c5b4a70013ab98ec5428794ec301c5ef191af3 Change-Id: I080df3a9ab84136296895e9e83e9b05090c6bc87
2020-09-02[automerger skipped] Merge Android R ↵Xin Li
(rvc-dev-plus-aosp-without-vendor@6692709) am: dc37d34d50 -s ours am: 27056d6fac -s ours am: 6fcf6b2995 -s ours am: 52c9843fa0 -s ours am skip reason: Change-Id If468db15d0f66ca059460fbf09d360360cfe8cdd with SHA-1 6e29ad1dfe is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/opt/calendar/+/12470128 Change-Id: I94d34a7b35130870e755c354c882dc49d035fb83
2020-09-01[automerger skipped] Merge Android R ↵Xin Li
(rvc-dev-plus-aosp-without-vendor@6692709) am: dc37d34d50 -s ours am: 27056d6fac -s ours am: 6fcf6b2995 -s ours am skip reason: Change-Id If468db15d0f66ca059460fbf09d360360cfe8cdd with SHA-1 6e29ad1dfe is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/opt/calendar/+/12470128 Change-Id: I3e2428840a58ab3ea386cbc4111be2d174fe8bbf
2020-09-01[automerger skipped] Merge Android R ↵Xin Li
(rvc-dev-plus-aosp-without-vendor@6692709) am: dc37d34d50 -s ours am: 27056d6fac -s ours am skip reason: Change-Id If468db15d0f66ca059460fbf09d360360cfe8cdd with SHA-1 6e29ad1dfe is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/opt/calendar/+/12470128 Change-Id: Ib3261d314ac9139f68f041b85621f8399dbfbe0c
2020-09-01[automerger skipped] Merge Android R ↵Xin Li
(rvc-dev-plus-aosp-without-vendor@6692709) am: dc37d34d50 -s ours am skip reason: Change-Id If468db15d0f66ca059460fbf09d360360cfe8cdd with SHA-1 6e29ad1dfe is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/opt/calendar/+/12470128 Change-Id: If8288b87c773f99ff77307a057acd92bda0176dd
2020-08-27Merge Android R (rvc-dev-plus-aosp-without-vendor@6692709)temp_sam_168057903Xin Li
Bug: 166295507 Merged-In: If468db15d0f66ca059460fbf09d360360cfe8cdd Change-Id: I89c5b4a70013ab98ec5428794ec301c5ef191af3
2020-08-14Introduce Time class to help with migration.Varun Shah
This class will help migrate from android.text.format.Time. Currently, it has the same API so that no friction is caused in the inital transition. Unit tests have been added to ensure future changes don't cause regressions when transitioning to a more robust Time API. Bug: 159019762 Test: atest TimeTest Test: atest CalendarCommonTests Test: atest CalendarProviderTests Change-Id: Ic640712cd48f0f4f7abfd8111bdac7d9a430574d
2019-11-21Fix day of year value in RecurrenceProcessor.r_aml_301500702android-mainline-12.0.0_r55android-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_r10android11-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-releaseVarun Shah
RecurrenceProcessor#yearDay was returning incorrectly for July 1st due to a wrong hard-coded value. Updating it to the correct value and adding some unit tests for the function. Bug: 111972497 Test: atest com.android.calendarcommon2.RecurrenceProcessorTest#testYearDay Change-Id: If468db15d0f66ca059460fbf09d360360cfe8cdd
2019-02-24[automerger skipped] DO NOT MERGE - Merge pi-dev@5234907 into stage-aosp-masterq_tzdata_aml_297100400q_tzdata_aml_297100300q_tzdata_aml_297100000q_tzdata_aml_296200000q_tzdata_aml_295600118q_tzdata_aml_295600110q_tzdata_aml_295500002q_tzdata_aml_295500001q_tzdata_aml_294400310android-r-preview-4android-r-preview-3android-r-preview-2android-r-preview-1android-r-beta-3android-r-beta-2android-mainline-12.0.0_r54android-mainline-12.0.0_r111android-mainline-10.0.0_r9android-mainline-10.0.0_r8android-mainline-10.0.0_r7android-mainline-10.0.0_r6android-mainline-10.0.0_r5android-mainline-10.0.0_r4android-mainline-10.0.0_r13android-mainline-10.0.0_r12android-mainline-10.0.0_r11android-mainline-10.0.0_r10android-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_r12q_tzdata_aml_297100000ndk-sysroot-r21android12-mainline-tzdata-releaseandroid10-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-tzdata-releaseandroid10-mainline-resolv-releaseandroid10-mainline-networking-releaseandroid10-mainline-media-releaseandroid10-devandroid10-d4-s1-releaseandroid10-d4-releaseandroid10-c2f2-s2-releaseandroid10-c2f2-s1-releaseandroid10-c2f2-releaseandroid10-android13-mainline-tzdata-releaseXin Li
am: d04d7982c4 -s ours am skip reason: subject contains skip directive Change-Id: Ib848b07a9bdde6c6d6b83f3d2476eb4a3eeaa729
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: I508c6f48aa4ffb22aba3fcb583b8fd3f51b25b33
2018-10-24[automerger skipped] Merge pie-platform-release to aosp-master - DO NOT ↵Bill Yi
MERGE am: 72af45fd2b -s ours am: ac27038f29 -s ours am: d697cba5c2 -s ours Change-Id: I4a186e58a8f97be521b6b4f16a796bedcca6f999
2018-10-24[automerger skipped] Merge pie-platform-release to aosp-master - DO NOT ↵Bill Yi
MERGE am: 72af45fd2b -s ours am: ac27038f29 -s ours Change-Id: Iffca9dad44a31b0b57929bf8e91eaf216fcc2786
2018-10-24[automerger skipped] Merge pie-platform-release to aosp-master - DO NOT MERGEBill Yi
am: 72af45fd2b -s ours Change-Id: I1e2164a1d3f2eca423910800c25de351bdcbce86
2018-10-24Merge pie-platform-release to aosp-master - DO NOT MERGEandroid-wear-8.0.0_r2android-q-preview-6android-q-preview-5android-q-preview-4android-q-preview-2.5android-q-preview-1android-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-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.10android-n-iot-release-ihome-igv1oreo-mr1-iot-releasenougat-iot-releaseBill Yi
Change-Id: Ib298814e53f0368562347ed44e4514d55a840e55
2018-10-24[automerger skipped] Merge pi-platform-release to stage-aosp-master - DO NOT ↵Bill Yi
MERGE am: 42b0be0f8e -s ours am: 87aff5920a -s ours Change-Id: I36502ca21cb6ca63c1b9975d4df242b4193b3cb7
2018-10-24[automerger skipped] Merge pi-platform-release to stage-aosp-master - DO NOT ↵Bill Yi
MERGE am: 42b0be0f8e -s ours Change-Id: I7c04cfc0e7828d23b8cf43ef0f19fbafddf59ad7
2018-10-24Merge pi-platform-release to stage-aosp-master - DO NOT MERGEBill Yi
Change-Id: Ic08dcd0ddde7526da7ced97e3fedcc5c64fd7fe0
2018-08-17Merge "Convert frameworks/opt/calendar to Android.bp" am: 8cc927f20f am: ↵Colin Cross
2e046db8d3 am: c626121cf0 Change-Id: I5b8556d437d2c4b897b1e00769aa2c90c0d3986a
2018-08-17Merge "Convert frameworks/opt/calendar to Android.bp" am: 8cc927f20fColin Cross
am: 2e046db8d3 Change-Id: I112950aa84d545c71b2672237e4f68ec4c8edfe4
2018-08-17Merge "Convert frameworks/opt/calendar to Android.bp"Colin Cross
am: 8cc927f20f Change-Id: I1c9b9b134fcd8e36ce045a57cfb818bd70ef22d7
2018-08-17Merge "Convert frameworks/opt/calendar to Android.bp"android-o-mr1-iot-release-smart-display-r3android-o-mr1-iot-release-1.0.5android-o-mr1-iot-release-1.0.4oreo-mr1-1.2-iot-releasemaster-cuttlefish-testing-releaseTreehugger Robot
2018-08-16Convert frameworks/opt/calendar to Android.bpColin Cross
See build/soong/README.md for more information. Test: m checkbuild Test: atest CalendarCommonTests Change-Id: Ib914c5ff464240fa136306e8dde8b90507bf887d
2018-02-27Snap for 4623514 from c0246198be80c6a8185aba01707e3c6ecba21222 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: I6d1ed97ab6528f3f2060abf231c6a0feb06e4120
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-17 22:22:45 +0000