summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2020-04-28Snap for 6439596 from 1938ad4fc2cba17bedfdb7f55760cd8132b27de3 to ↵q_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-mainline-12.0.0_r54android-mainline-12.0.0_r111android-mainline-10.0.0_r13android-mainline-10.0.0_r12android-mainline-10.0.0_r11q_tzdata_aml_297100000android12-mainline-tzdata-releaseandroid10-mainline-tzdata-releaseandroid10-android13-mainline-tzdata-releaseandroid-build-team Robot
qt-aml-tzdata-release Change-Id: I2b6ceb1dfb1f22f9d823617590d4d16100393261
2019-11-11Snap for 6001391 from 39a9ebe5c53026006fc777739ba25b067eb417a8 to ↵android-build-team Robot
qt-aml-tzdata-release Change-Id: I5d2ad9eb2a45121f621825f76bb606cf22d3ab25
2019-11-05Merge "AOSP/Calendar - Fix crash bug when null action is sent to ↵Raman Tenneti
com.android.calendar/.widget.CalendarAppWidgetProvider." am: 537758eb52 am: 161ed60830 Change-Id: I19a6e9f0eabec26c2a3aef4b8953eece3f75d56a
2019-11-05Merge "AOSP/Calendar - Fix crash bug when null action is sent to ↵Raman Tenneti
com.android.calendar/.widget.CalendarAppWidgetProvider." am: 537758eb52 Change-Id: I43754326caadc1176a262377accb280c2b0fb469
2019-11-05Merge "AOSP/Calendar - Fix crash bug when null action is sent to ↵Treehugger Robot
com.android.calendar/.widget.CalendarAppWidgetProvider."
2019-11-04AOSP/Calendar - Fix crash bug when null action is sent to ↵Raman Tenneti
com.android.calendar/.widget.CalendarAppWidgetProvider. BUG: 143601593 Test: manual - Ran the following tests on Pixel phone. Tested the calendar UI. $ make -j 40 $ make Calendar -j $ ls -l out/target/product/generic/system/product/app/Calendar/Calendar.apk out/target/product/generic/testcases/CalendarTests/arm/CalendarTests.apk $ adb install -r -d -g out/target/product/generic/system/product/app/Calendar/Calendar.apk $ adb install -r -d -g ~/Downloads/AndroidCalendarCrashPoc.apk Performing Streamed Install Success $ adb shell am broadcast -n com.android.calendar/.widget.CalendarAppWidgetProvider Broadcasting: Intent { flg=0x400000 cmp=com.android.calendar/.widget.CalendarAppWidgetProvider } Broadcast completed: result=0 Verified calendar app doesn't crash with the above (as mentioned in the above bug). Change-Id: If211a453d1633fc7d432670243cf87f35dafabb4
2019-10-30DO NOT MERGE - qt-qpr1-dev-plus-aosp-without-vendor@5915889 into ↵Xin Li
stage-aosp-master am: 09da3b2ba1 Change-Id: Ibf851636e1ccf204760247dbed3594dd7a518570
2019-10-30DO NOT MERGE - qt-qpr1-dev-plus-aosp-without-vendor@5915889 into ↵Xin Li
stage-aosp-master Bug: 142003500 Change-Id: I4dd48436bfb889804ca64a93c2043d3c5896924c
2019-10-25Merge "Revert "Calendar: Drop no longer existing activity from manifest"" ↵Raman Tenneti
am: 623f47500c am: 0ecb18d32e am: 36bf474b59 Change-Id: Ifdd77a0964961e34fdbeb7037a6fc826d1686940
2019-10-25Merge "Revert "Calendar: Drop no longer existing activity from manifest"" ↵Raman Tenneti
am: 623f47500c am: 0ecb18d32e Change-Id: Iff5261211e650418124d085bdb549802fc4809f8
2019-10-25Merge "Revert "Calendar: Drop no longer existing activity from manifest""Raman Tenneti
am: 623f47500c Change-Id: I0144e8e312587d1e7263635544359d3616e2f89f
2019-10-26Merge "Revert "Calendar: Drop no longer existing activity from manifest""Treehugger Robot
2019-10-25Revert "Calendar: Drop no longer existing activity from manifest"Raman Tenneti
This reverts commit e6258078f852250604bd60e2a84b4673bed7930b. Reason for revert: Bug 143364978 CTS tests have failed. Change-Id: I541a25e1a9cb060d195d8609432804e055ceea72
2019-10-21Merge "Calendar: Drop no longer existing activity from manifest" am: ↵LuK1337
439a6d3931 am: 9b9e59c008 am: 0ac9150d43 Change-Id: Ie07827f654d14e8723529107d0e2e2fed3224681
2019-10-21Merge "Calendar: Don't optimize out no-arg Fragment constructors" am: ↵LuK1337
21f47ae45b am: 2669c5bc8b am: 961ba90d00 Change-Id: I56d120aebd5b176990765224d91ce22519a66350
2019-10-21Merge "Calendar: Drop no longer existing activity from manifest" am: 439a6d3931LuK1337
am: 9b9e59c008 Change-Id: If66309a0055d5949fc3f5d412a0b12e06037fbae
2019-10-21Merge "Calendar: Don't optimize out no-arg Fragment constructors" am: 21f47ae45bLuK1337
am: 2669c5bc8b Change-Id: I54092b2811437a17e7a66de8ee505392e15bb6f5
2019-10-21Merge "Calendar: Drop no longer existing activity from manifest"LuK1337
am: 439a6d3931 Change-Id: I4307f5c8f659fefb4bca5bb1e1e4b9cd8f1c4e11
2019-10-21Merge "Calendar: Don't optimize out no-arg Fragment constructors"LuK1337
am: 21f47ae45b Change-Id: Ibf2ced9f04e16849a4f0ec1dd3ce247018596d96
2019-10-21Merge "Calendar: Drop no longer existing activity from manifest"Treehugger Robot
2019-10-21Merge "Calendar: Don't optimize out no-arg Fragment constructors"Treehugger Robot
2019-10-20Calendar: Drop no longer existing activity from manifestLuK1337
* It was removed in 551499e. Change-Id: If8d4cf7e7522d862e413ff5156df310b8c9f4fef
2019-10-20Calendar: Don't optimize out no-arg Fragment constructorsLuK1337
* Fixes FC after configuration changes. Test: Open app and rotate the device. Change-Id: Id5bbb3e569ec3bf13970ae9a8427ca4577b14da5
2019-10-16Merge "AOSP/Calendar - Updated to sdkVersion 29." am: 1a4712d49b am: c4557ae4e1Raman Tenneti
am: 3f6d3ea03b Change-Id: I155e4a2a187d2127d13d095cf60732408e6cad93
2019-10-16Merge "AOSP/Calendar - Updated to sdkVersion 29." am: 1a4712d49bRaman Tenneti
am: c4557ae4e1 Change-Id: I48eeee2ed9ce7f4bea08efc6479b0cd6b83c803b
2019-10-16Merge "AOSP/Calendar - Updated to sdkVersion 29."Raman Tenneti
am: 1a4712d49b Change-Id: Ic7058b575b1116873084acab569cc98e48067087
2019-10-16Merge "AOSP/Calendar - Updated to sdkVersion 29."Treehugger Robot
2019-10-15AOSP/Calendar - Updated to sdkVersion 29.Raman Tenneti
BUG: 133177396 Test: manual - Ran the following tests on Pixel phone. Tested the calendar UI. $ make -j 40 $ make Calendar -j $ make CalendarTests -j $ ls -l out/target/product/marlin/system/product/app/Calendar/Calendar.apk out/target/product/marlin/testcases/CalendarTests/arm64/CalendarTests.apk -rw-r--r-- 1 rtenneti primarygroup 1968906 Oct 14 14:42 out/target/product/marlin/system/product/app/Calendar/Calendar.apk -rw-r--r-- 1 rtenneti primarygroup 86423 Oct 15 11:18 out/target/product/marlin/testcases/CalendarTests/arm64/CalendarTests.apk $ adb install -r -d -g out/target/product/marlin/system/product/app/Calendar/Calendar.apk $ adb install -r -d -g out/target/product/marlin/testcases/CalendarTests/arm64/CalendarTests.apk $ adb shell am instrument -w com.android.calendar.tests Time: 0.18 OK (22 tests) Change-Id: I2d0493917de35373c93752cdd13561fb3a830f80
2019-08-16Merge "AOSP/Calendar - Deleted TEST_MAPPING file and ↵Raman Tenneti
LOCAL_COMPATIBILITY_SUITE to fix bug 138793948." am: e3549513e8 am: 47c095c18b am: df66205c69 am: e637bf08e8 Change-Id: I32f9ca4d55764d1ceb03f51b4dd15b5b39cde7fb
2019-08-16Merge "AOSP/Calendar - Deleted TEST_MAPPING file and ↵Raman Tenneti
LOCAL_COMPATIBILITY_SUITE to fix bug 138793948." am: e3549513e8 am: 47c095c18b am: df66205c69 Change-Id: If6efb2eba826d128ca507f4e666fbceef2ebc125
2019-08-16Merge "AOSP/Calendar - Deleted TEST_MAPPING file and ↵Raman Tenneti
LOCAL_COMPATIBILITY_SUITE to fix bug 138793948." am: e3549513e8 am: 47c095c18b Change-Id: I2f13584e7fcae038bd6d080011ec54e9b8bf61dc
2019-08-16Merge "AOSP/Calendar - Deleted TEST_MAPPING file and ↵ndk-sysroot-r21Raman Tenneti
LOCAL_COMPATIBILITY_SUITE to fix bug 138793948." am: e3549513e8 Change-Id: Icfc6f74c3e987646200c840434c59b6614a3519f
2019-08-16Merge "AOSP/Calendar - Deleted TEST_MAPPING file and ↵Treehugger Robot
LOCAL_COMPATIBILITY_SUITE to fix bug 138793948."
2019-08-16AOSP/Calendar - Deleted TEST_MAPPING file and LOCAL_COMPATIBILITY_SUITE to ↵Raman Tenneti
fix bug 138793948. BUG: 138793948 BUG: 138125109 Test: manual - Ran the following tests on Pixel phone. Tested the calendar UI. $ make -j 40 $ make Calendar -j $ make CalendarTests -j $ ls -l out/target/product/marlin/testcases/Calendar/arm64/Calendar.apk out/target/product/marlin/testcases/CalendarTests/arm64/CalendarTests.apk $ adb install -r -d -g out/target/product/marlin/testcases/Calendar/arm64/Calendar.apk $ adb install -r -d -g out/target/product/marlin/testcases/CalendarTests/arm64/CalendarTests.apk $ adb shell am instrument -w com.android.calendar.tests Time: 0.148 OK (22 tests) $ atest CalendarTests CalendarTests (22 Tests) ----------------------- [1/22] com.android.calendar.FormatDateRangeTest#testAll: PASSED (26ms) ... [22/22] com.android.calendar.widget.CalendarAppWidgetServiceTest#testGetAppWidgetModel_AllDayEventLater: PASSED (0ms) Summary ------- CalendarTests: Passed: 22, Failed: 0, Ignored: 0, Assumption Failed: 0 All tests passed! Change-Id: I4868a3bc54e8e3e026ec982f4b0b62ba413a8020
2019-08-14[automerger skipped] DO NOT MERGE - Skip qt-dev-plus-aosp-without-vendor ↵Xin Li
(5713463) in stage-aosp-master am: 31f351b15d -s ours am: ef1f276aa7 am: 1113ba112e Change-Id: I0abccef1bf96d9429ea644b70929e7815fa89034
2019-08-14[automerger skipped] DO NOT MERGE - Skip qt-dev-plus-aosp-without-vendor ↵Xin Li
(5713463) in stage-aosp-master am: 31f351b15d -s ours am: ef1f276aa7 Change-Id: If0b400ad865a9b2c85c98977e7bb26c2824e2b39
2019-08-14[automerger skipped] DO NOT MERGE - Skip qt-dev-plus-aosp-without-vendor ↵Xin Li
(5713463) in stage-aosp-master am: 31f351b15d -s ours am skip reason: subject contains skip directive Change-Id: I0093f26e42f0dccc3dbd3d065fe4df9e120a8c61
2019-08-14DO NOT MERGE - Skip qt-dev-plus-aosp-without-vendor (5713463) in ↵Xin Li
stage-aosp-master Bug: 134405016 Change-Id: I04ac94ab7d193973da237a13406b649cef38f0db
2019-07-22Merge "Remove deps on frameworks/opt/datetimepicker" am: 147e6a9613 am: ↵Neil Fuller
f2b635393c am: 9d3ed36946 Change-Id: Ib5efd61631e8fe3c37e408456394ad8be7e94280
2019-07-22Merge "Remove deps on frameworks/opt/datetimepicker" am: 147e6a9613Neil Fuller
am: f2b635393c Change-Id: I6cb59b96177d80d99871bc844c2cdf05e6a3f55c
2019-07-22Merge "Remove deps on frameworks/opt/datetimepicker"Neil Fuller
am: 147e6a9613 Change-Id: I3e07d219a5a8361fa04001c0eee292abebf51135
2019-07-22Merge "Remove deps on frameworks/opt/datetimepicker"Neil Fuller
2019-07-19Remove deps on frameworks/opt/datetimepickerNeil Fuller
Remove deps on frameworks/opt/datetimepicker, which has Y2038 issues. The few definitions that appear to be needed can be duplicated instead. Bug: 16550209 Test: build only Change-Id: I05912465308f307017991ec0548addd601d143ce
2019-07-08Merge "AOSP/Calendar - Fix improperly formatted resource string in ↵Raman Tenneti
Calendar." am: 237937c22b am: 34ca7c6672 am: 73a20e45ad Change-Id: If6eb45b0740e1b7d45386d4df9eceb914ada99f4
2019-07-08Merge "AOSP/Calendar - Fix improperly formatted resource string in ↵Raman Tenneti
Calendar." am: 237937c22b am: 34ca7c6672 Change-Id: Ibc90b19b6f7cb50411dea99b844fa4930eccdb68
2019-07-08Merge "AOSP/Calendar - Fix improperly formatted resource string in Calendar."Raman Tenneti
am: 237937c22b Change-Id: I65775b68aa8d32ad60dc4b04d00be3b951fda9b5
2019-07-09Merge "AOSP/Calendar - Fix improperly formatted resource string in Calendar."android-o-mr1-iot-release-1.0.14Treehugger Robot
2019-07-08AOSP/Calendar - Fix improperly formatted resource string in Calendar.Raman Tenneti
TODO: Need to run translation to fix across all languages. Bug: 135613806 Test: manual - Did a "make -j40" and verified that there are no warnings in strings.xml. Change-Id: Idb9666ee2153464152a25d48608a13fdc641222e
2019-06-26Merge "Pass --legacy to aapt2 compile for Calendar" am: 68770a5a74 am: ↵Colin Cross
d880f7cada am: 25f3624bc0 Change-Id: If75a492036e41295230f8c9cfbfdd133aeae3684
2019-06-26Merge "Pass --legacy to aapt2 compile for Calendar" am: 68770a5a74Colin Cross
am: d880f7cada Change-Id: I1e54cac94a1f4ddb8ea7d4e61326cd39fb012196
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-31 19:26:37 +0000