summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2020-01-29[automerger skipped] Import translations. DO NOT MERGE am: dba170b33f -s ↵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-releaseAutomerger Merge Worker
ours am: e567bc7d8f -s ours am skip reason: subject contains skip directive Change-Id: I99bdbedf071a20992f0f1f4197bfbd562d1f1334
2020-01-29[automerger skipped] Import translations. DO NOT MERGE am: dba170b33f -s oursAutomerger Merge Worker
am skip reason: subject contains skip directive Change-Id: I62fa74b8b36f13e48b3e2f3739e6d092ed419885
2020-01-28Import translations. DO NOT MERGEandroid-r-preview-4android-r-preview-3android-r-preview-2Bill Yi
BUG:148403740 TEST: m Calendar Change-Id: Id53d0a1fd07d0a506c39ac1d78c70971c80456d0 Auto-generated-cl: translation import
2020-01-28[automerger skipped] Merge "Import translations. DO NOT MERGE" am: ↵Automerger Merge Worker
f2678d3bc1 -s ours am: 1543741a0e -s ours am: 5aebd88581 -s ours am skip reason: subject contains skip directive Change-Id: Ibc2ac4e0d68212697fb5e5937e1a0fb4ce1662c4
2020-01-28[automerger skipped] Merge "Import translations. DO NOT MERGE" am: ↵Automerger Merge Worker
f2678d3bc1 -s ours am: 1543741a0e -s ours am skip reason: subject contains skip directive Change-Id: Ib26ddfe65985cf321941383edaf5227dcd3f0c57
2020-01-27[automerger skipped] Merge "Import translations. DO NOT MERGE"Bill Yi
am: f2678d3bc1 -s ours am skip reason: subject contains skip directive Change-Id: I0e0c522bc7dd2c6ac74bc2ae6e6b2269c01282ba
2020-01-28Merge "Import translations. DO NOT MERGE"android-r-preview-1Treehugger Robot
2020-01-27Import translations. DO NOT MERGEBill Yi
BUG:148403740 TEST: m Calendar Change-Id: Id53d0a1fd07d0a506c39ac1d78c70971c80456d0 Auto-generated-cl: translation import
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 am: 39a9ebe5c5 Change-Id: I790e8b8704684aba4c0e14851c4744188017c326
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-30[automerger skipped] DO NOT MERGE - ↵Xin Li
qt-qpr1-dev-plus-aosp-without-vendor@5915889 into stage-aosp-master am: 09da3b2ba1 am: be5b1d193c -s ours am skip reason: subject contains skip directive Change-Id: I20034dc2c3be9bbef355fd5cfca8eb2477b56d6f
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 am: 3c88150d90 Change-Id: If73a96bae39de75d91f13176d6b8a82cf698cd5a
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 am: f581e07882 Change-Id: I902c90ad5b81a23751226b82dc85b73b66264783
2019-10-21Merge "Calendar: Don't optimize out no-arg Fragment constructors" am: ↵LuK1337
21f47ae45b am: 2669c5bc8b am: 961ba90d00 am: 38c3bdb8ab Change-Id: Id16344b7d7e9945abfa61dd45e2c3df7eede93b4
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: ↵Raman Tenneti
c4557ae4e1 am: 3f6d3ea03b am: 70a948283a Change-Id: I45ff0705a8eed5202c25efcbdcd779c8a527ccc9
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 am: d46b406421 Change-Id: Icee7d5e38fa0c5b542c145418c6447703c645980
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 am: f0bb2c8083 -s ours am skip reason: subject contains skip directive Change-Id: I8eb8188262105be4f080427bf80dce40fe4aa6f3
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
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-28 06:10:05 +0000