aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
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
2018-02-26Merge "frameworks/opt/calendar: Set LOCAL_SDK_VERSION where possible." am: ↵android-o-mr1-iot-release-1.0.3android-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-devAnton Hansson
03dbebcdc8 am: 7d5a0a9ef7 am: a45e03ffb6 -s ours Change-Id: I1cea3d77a7d392480ced11cc7ec84015e6ad2cf1
2018-02-26Merge "frameworks/opt/calendar: Set LOCAL_SDK_VERSION where possible." am: ↵Anton Hansson
03dbebcdc8 am: 7d5a0a9ef7 Change-Id: I456a55497b102a8fce0296f9d6fa9a93845f4dba
2018-02-26Merge "frameworks/opt/calendar: Set LOCAL_SDK_VERSION where possible."Anton Hansson
am: 03dbebcdc8 Change-Id: I10185d7b82588ff5fdcc916dacb3a20abfa9615a
2018-02-26Merge "frameworks/opt/calendar: Set LOCAL_SDK_VERSION where possible."android-wear-p-preview-2android-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-7android-n-iot-release-smart-display-r2android-n-iot-release-smart-displayandroid-n-iot-release-polk-at1android-n-iot-release-lg-thinq-wk7o-mr1-iot-preview-8o-mr1-iot-preview-7Anton Hansson
2018-02-26frameworks/opt/calendar: Set LOCAL_SDK_VERSION where possible.Anton Hansson
This change sets LOCAL_SDK_VERSION for all packages where this is possible without breaking the build, and LOCAL_PRIVATE_PLATFORM_APIS := true otherwise. Setting one of these two will be made required soon, and this is a change in preparation for that. Not setting LOCAL_SDK_VERSION makes the app implicitly depend on the bootclasspath, which is often not required. This change effectively makes depending on private apis opt-in rather than opt-out. Test: make relevant packages Bug: 73535841 Change-Id: Icec5c913512e2cffbba52353d84559ca4793437b Merged-In: I6b6411cb008ddaf9f1aac419bf7432b3215f100a
2018-02-22frameworks/opt/calendar: Set LOCAL_SDK_VERSION where possible.Anton Hansson
This change sets LOCAL_SDK_VERSION for all packages where this is possible without breaking the build, and LOCAL_PRIVATE_PLATFORM_APIS := true otherwise. Setting one of these two will be made required soon, and this is a change in preparation for that. Not setting LOCAL_SDK_VERSION makes the app implicitly depend on the bootclasspath, which is often not required. This change effectively makes depending on private apis opt-in rather than opt-out. Test: make relevant packages Bug: 73535841 Change-Id: I6b6411cb008ddaf9f1aac419bf7432b3215f100a
2017-12-11Snap for 4496165 from 5151af823c9c03bedd30b41caaa01e53e3324c76 to pi-releaseandroid-build-team Robot
Change-Id: I1764100fb8e0461783507b339c6bdf652516d515
2017-12-08Stop statically including legacy-android-testPaul Duffin
Statically including legacy-android-test leads to duplicate classes which causes build time problems (with Proguard) and runtime problems on older SDK versions. This change: * Stops statically including legacy-android-test. * Adds compile time dependencies on andoid.test.base, android.test.mock and android.test.runner where necessary. * Adds <uses-library android:name="android.test.runner"/> to any affected package to ensure that the classes that were included by legacy-android-test are still available at runtime. That also adds a dependency on android.test.base and android.test.mock. The following change descriptions were generated automatically and so may be a little repetitive. They are provided to give the reviewer enough information to check the comments match what has actually been changed and check the reasoning behind the changes. * tests/Android.mk Added 'android.test.base' to LOCAL_JAVA_LIBRARIES because CalendarCommonTests's source depends on its classes and because of these changes they are no longer present on the compilation path. Removed legacy-android-test from LOCAL_STATIC_JAVA_LIBRARIES because statically including the classes in CalendarCommonTests results in duplicate classes which leads to build time and compile time issues. Bug: 30188076 Test: make checkbuild Change-Id: Iadc6b967caaf8d5ce5b8a348ad33e1407da8470f
2017-01-18Merge "Prepare for removal of legacy-test from default targets" am: ↵android-wear-8.1.0_r1android-wear-8.0.0_r1android-vts-8.1_r9android-vts-8.1_r8android-vts-8.1_r7android-vts-8.1_r6android-vts-8.1_r5android-vts-8.1_r4android-vts-8.1_r3android-vts-8.1_r14android-vts-8.1_r13android-vts-8.1_r12android-vts-8.1_r11android-vts-8.1_r10android-vts-8.0_r9android-vts-8.0_r8android-vts-8.0_r7android-vts-8.0_r6android-vts-8.0_r2android-vts-8.0_r13android-vts-8.0_r12android-vts-8.0_r11android-vts-8.0_r10android-vts-8.0_r1android-security-8.1.0_r93android-security-8.1.0_r92android-security-8.1.0_r91android-security-8.1.0_r90android-security-8.1.0_r89android-security-8.1.0_r88android-security-8.1.0_r87android-security-8.1.0_r86android-security-8.1.0_r85android-security-8.1.0_r84android-security-8.1.0_r83android-security-8.1.0_r82android-security-8.0.0_r54android-security-8.0.0_r53android-security-8.0.0_r52android-o-mr1-preview-2android-o-mr1-preview-1android-o-mr1-iot-preview-6android-cts-8.1_r9android-cts-8.1_r8android-cts-8.1_r7android-cts-8.1_r6android-cts-8.1_r5android-cts-8.1_r4android-cts-8.1_r3android-cts-8.1_r25android-cts-8.1_r24android-cts-8.1_r23android-cts-8.1_r22android-cts-8.1_r21android-cts-8.1_r20android-cts-8.1_r2android-cts-8.1_r19android-cts-8.1_r18android-cts-8.1_r17android-cts-8.1_r16android-cts-8.1_r15android-cts-8.1_r14android-cts-8.1_r13android-cts-8.1_r12android-cts-8.1_r11android-cts-8.1_r10android-cts-8.1_r1android-cts-8.0_r9android-cts-8.0_r8android-cts-8.0_r7android-cts-8.0_r6android-cts-8.0_r5android-cts-8.0_r4android-cts-8.0_r3android-cts-8.0_r26android-cts-8.0_r25android-cts-8.0_r24android-cts-8.0_r23android-cts-8.0_r22android-cts-8.0_r21android-cts-8.0_r20android-cts-8.0_r2android-cts-8.0_r19android-cts-8.0_r18android-cts-8.0_r17android-cts-8.0_r16android-cts-8.0_r15android-cts-8.0_r14android-cts-8.0_r13android-cts-8.0_r12android-cts-8.0_r11android-cts-8.0_r10android-cts-8.0_r1android-8.1.0_r9android-8.1.0_r81android-8.1.0_r80android-8.1.0_r8android-8.1.0_r79android-8.1.0_r78android-8.1.0_r77android-8.1.0_r76android-8.1.0_r75android-8.1.0_r74android-8.1.0_r73android-8.1.0_r72android-8.1.0_r71android-8.1.0_r70android-8.1.0_r7android-8.1.0_r69android-8.1.0_r68android-8.1.0_r67android-8.1.0_r66android-8.1.0_r65android-8.1.0_r64android-8.1.0_r63android-8.1.0_r62android-8.1.0_r61android-8.1.0_r60android-8.1.0_r6android-8.1.0_r53android-8.1.0_r52android-8.1.0_r51android-8.1.0_r50android-8.1.0_r5android-8.1.0_r48android-8.1.0_r47android-8.1.0_r46android-8.1.0_r45android-8.1.0_r43android-8.1.0_r42android-8.1.0_r41android-8.1.0_r40android-8.1.0_r4android-8.1.0_r39android-8.1.0_r38android-8.1.0_r37android-8.1.0_r36android-8.1.0_r35android-8.1.0_r33android-8.1.0_r32android-8.1.0_r31android-8.1.0_r30android-8.1.0_r3android-8.1.0_r29android-8.1.0_r28android-8.1.0_r27android-8.1.0_r26android-8.1.0_r25android-8.1.0_r23android-8.1.0_r22android-8.1.0_r21android-8.1.0_r20android-8.1.0_r2android-8.1.0_r19android-8.1.0_r18android-8.1.0_r17android-8.1.0_r16android-8.1.0_r15android-8.1.0_r14android-8.1.0_r13android-8.1.0_r12android-8.1.0_r11android-8.1.0_r10android-8.1.0_r1android-8.0.0_r9android-8.0.0_r7android-8.0.0_r51android-8.0.0_r50android-8.0.0_r49android-8.0.0_r48android-8.0.0_r47android-8.0.0_r46android-8.0.0_r45android-8.0.0_r44android-8.0.0_r43android-8.0.0_r42android-8.0.0_r41android-8.0.0_r40android-8.0.0_r4android-8.0.0_r39android-8.0.0_r38android-8.0.0_r37android-8.0.0_r36android-8.0.0_r35android-8.0.0_r34android-8.0.0_r33android-8.0.0_r32android-8.0.0_r31android-8.0.0_r30android-8.0.0_r3android-8.0.0_r29android-8.0.0_r28android-8.0.0_r27android-8.0.0_r26android-8.0.0_r25android-8.0.0_r24android-8.0.0_r23android-8.0.0_r22android-8.0.0_r21android-8.0.0_r2android-8.0.0_r17android-8.0.0_r16android-8.0.0_r15android-8.0.0_r13android-8.0.0_r12android-8.0.0_r11android-8.0.0_r10android-8.0.0_r1security-oc-releasesecurity-oc-mr1-releaseoreo-vts-releaseoreo-security-releaseoreo-releaseoreo-r6-releaseoreo-r5-releaseoreo-r4-releaseoreo-r3-releaseoreo-r2-releaseoreo-mr1-wear-releaseoreo-mr1-vts-releaseoreo-mr1-security-releaseoreo-mr1-s1-releaseoreo-mr1-releaseoreo-mr1-devoreo-mr1-cuttlefish-testingoreo-mr1-cts-releaseoreo-m8-releaseoreo-m7-releaseoreo-m6-s4-releaseoreo-m6-s3-releaseoreo-m6-s2-releaseoreo-m5-releaseoreo-m4-s9-releaseoreo-m4-s8-releaseoreo-m4-s7-releaseoreo-m4-s6-releaseoreo-m4-s5-releaseoreo-m4-s4-releaseoreo-m4-s3-releaseoreo-m4-s2-releaseoreo-m4-s12-releaseoreo-m4-s11-releaseoreo-m4-s10-releaseoreo-m4-s1-releaseoreo-m3-releaseoreo-m2-s5-releaseoreo-m2-s4-releaseoreo-m2-s3-releaseoreo-m2-s2-releaseoreo-m2-s1-releaseoreo-m2-releaseoreo-dr3-releaseoreo-dr2-releaseoreo-dr1-releaseoreo-dr1-devoreo-devoreo-cts-releaseo-mr1-iot-preview-6Paul Duffin
524cce0089 am: f40b38da25 am: 6db7eaee89 am: 886d7d1277 Change-Id: I9fc9b526e1ce01ecf07c04d2f12e6f5c59c732f4
2017-01-18Merge "Prepare for removal of legacy-test from default targets" am: ↵android-wear-o-preview-4android-wear-o-preview-3android-o-preview-4android-o-preview-3android-o-preview-2android-o-iot-preview-5android-n-iot-preview-4o-iot-preview-5n-iot-preview-4Paul Duffin
524cce0089 am: f40b38da25 am: 6db7eaee89 Change-Id: Ic239177bae70d78b29eb16acf3cc42e8f31983c3
2017-01-18Merge "Prepare for removal of legacy-test from default targets" am: 524cce0089Paul Duffin
am: f40b38da25 Change-Id: I2f3eee0caeb944a5b7962ab86e74ad2bb009caa9
2017-01-18Merge "Prepare for removal of legacy-test from default targets"Paul Duffin
am: 524cce0089 Change-Id: I3345eaf0c2d4c7cdfcf46258919cc450252e7bc7
2017-01-18Merge "Prepare for removal of legacy-test from default targets"android-o-preview-1android-n-mr2-preview-2o-previewTreehugger Robot
2017-01-17Prepare for removal of legacy-test from default targetsPaul Duffin
In preparation for removing junit classes from the Android API the legacy-test target will be removed from the TARGET_DEFAULT_JAVA_LIBRARIES. This change adds explicit dependencies on junit and/or legacy-android-test to ensure that modules will compile properly once it is removed. Bug: 30188076 Test: make checkbuild Change-Id: Ic37712e161ed1daeff800fb10e21c9f59682efe7
2016-09-19Fix inconsistencies in RecurrenceSet.Sudheer Shanka
- Handle multi-line EXRULE and RDATE. - Fix existing tests. - Add more tests. Fixes: 31054618 Test: adb shell am instrument -w com.android.calendarcommon2.tests/android.test.InstrumentationTestRunner Change-Id: I73eb8dc876adb253e093d68685deefcc9b02953e