summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* CalendarProvider: adaptive iconlineage-17.0Asher Simonds2019-09-1115-1/+21
| | | | | Change-Id: Ie04adc9e759820bb0d813ffb0efdca687b0a1fe4 Signed-off-by: Joey <joey@lineageos.org>
* Snap for 5540187 from 9437165cf6415d07d3933bb9638ec43fa55a565b to qt-releaseandroid-build-team Robot2019-05-082-10/+17
|\ | | | | | | Change-Id: I9800c12096612e870f1a60fd55cfe999001604c7
| * Throw exception when work profile doesn't exist or disabled or calendar app ↵Yasmin2019-05-032-10/+17
| | | | | | | | | | | | | | | | | | | | is not whitelisted or setting for calendar integration is disabled. Test: atest ManagedProfileTest#testCrossProfileCalendar atest CalendarProvider2Test Bug: 130284827 Change-Id: I3f5d2794c801b7a379893962eb815e89cc7da6b4
* | Snap for 5533229 from 74359b568fba67f75f8c0050731624f4e187fccd to qt-releaseandroid-build-team Robot2019-05-042-3/+9
|\| | | | | | | Change-Id: Ie099748b4c6c62a55eadfc81517c2491c3944340
| * Make sure calendar alarms can dispatch in doze mode.Hui Yu2019-04-262-3/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | By calling AlarmManager's setExactAndAllowWhileIdle() and setAndAllowWhileIdle() methods to allow alarms to be executed in doze mode. Alarms added by set() and setExact() do not execute in doze mode. Fix: 111286997 Test: "adb shell dumpsys deviceidle force-idle" to put device in doze mode, "adb shell settings put global alarm_manager_constants.allow_while_idle_long_time 1000" to change ALLOW_WHILE_IDLE_LONG_TIME to 1 second. In Calendar app, add a event that is 3 minutes in the future, observe the alarm of this event can go off. Change-Id: I58182a22a2ca2dffc5ad1fba811baa2b98109405
* | Snap for 5430508 from 232ac2b689eb2531a75f707635233809910c5999 to qt-releaseandroid-build-team Robot2019-04-031-2/+0
|\| | | | | | | Change-Id: Ifb927c25e00c5a5f1e40be209bbe0214e151682c
| * Merge "Remove log with sensitive info in CalendarProvider2."TreeHugger Robot2019-04-021-2/+0
| |\
| | * Remove log with sensitive info in CalendarProvider2.Varun Shah2019-04-021-2/+0
| | | | | | | | | | | | | | | | | | Bug: 129378636 Test: n/a (builds) Change-Id: I08dc81886e84b73528131ad07bef7c7fc9185b8c
* | | Snap for 5426495 from b034f7ffaf16c64e90b7ab21e2e29387e893cd3a to qt-releaseandroid-build-team Robot2019-04-021-1/+6
|\| | | | | | | | | | | Change-Id: Ifc98fda11744433e6b6fccd78987d1d4f6cacc64
| * | Re-create view_events to account for isPrimary.Jonathan Scott2019-04-011-1/+6
| |/ | | | | | | | | | | Fixes: 129462613 Test: Manually verified that this fixes known bad state. Change-Id: If0af3a83676d54001500decf498d8809ad3f65c3
* | Snap for 5406228 from 055d5522343dc810dad67011225802a15dd07243 to qt-releaseandroid-build-team Robot2019-03-262-2/+25
|\| | | | | | | Change-Id: I98c7b2d36db1bf7f9a8ea5635c16120997de4a6c
| * Merge "Block non-primary calendars from being shared to personal profile."Alex Kershaw2019-03-252-2/+25
| |\
| | * Block non-primary calendars from being shared to personal profile.Alex Kershaw2019-03-252-2/+25
| | | | | | | | | | | | | | | | | | | | | Fixes: 125764413 Test: atest CalendarProvider2Test Test: atest ManagedProfileTest#testCrossProfileCalendar Change-Id: I4a4d65e5065010b4ebbf846ee1aa6897dbc0eddf
* | | Snap for 5386257 from 6603377c7a61b4135bce771ea667575ef30d25c8 to qt-releaseandroid-build-team Robot2019-03-191-1/+0
|\| | | | | | | | | | | Change-Id: I0e04cbce1b95f833d8c984fc0079dc112562ec41
| * | Merge "CalendarProvider: Remove unused string resource" am: 88dbaae618 am: ↵Michael Bestas2019-03-181-1/+0
| |\ \ | | |/ | |/| | | | | | | | | | | | | | | | 49003cfd28 am: 11eeff6e14 Change-Id: If8de0b96e928834445ca924a43ca374e9cc59e88
| | * Merge "CalendarProvider: Remove unused string resource" am: 88dbaae618Michael Bestas2019-03-181-1/+0
| | |\ | | | | | | | | | | | | | | | | | | | | am: 49003cfd28 Change-Id: I80bb65b61b87579de6eba27872bdb1d5206d1780
| | | * Merge "CalendarProvider: Remove unused string resource"Michael Bestas2019-03-181-1/+0
| | |/| | | | | | | | | | | | | | | | | | | | | am: 88dbaae618 Change-Id: I76bd55ddf580337aedf84fd2a5165f80bdfbabfb
| | | * Merge "CalendarProvider: Remove unused string resource"Treehugger Robot2019-03-181-1/+0
| | | |\
| | | | * CalendarProvider: Remove unused string resourceMichael Bestas2019-03-031-1/+0
| | | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The original string was removed in commit a48a040eaad1bc32d79b31d36fb68003f768ba6e but translations for this locale were never updated Fixes: warning: string 'upgrade_msg' has no default translation. warning: string 'upgrade_msg' is missing 87 required localizations: af_ZA am_ET ar_EG as_IN ast_ES be_BY bg_BG bn_BD bs_BA ca_ES cs_CZ cy_GB da_DK de_DE el_GR en_AU en_CA en_GB en_IN en_US en_XC es_ES es_US et_EE eu_ES fa_IR fi_FI fr_CA fr_FR gd_GB gl_ES gu_IN hi_IN hr_HR hu_HU hy_AM in_ID is_IS it_IT iw_IL ja_JP ka_GE kk_KZ km_KH kn_IN ko_KR ky_KG lo_LA lt_LT lv_LV mk_MK ml_IN mn_MN mr_IN ms_MY my_MM nb_NO ne_NP nl_NL or_IN pa_IN pl_PL pt_BR pt_PT ro_RO ru_RU si_LK sk_SK sl_SI sq_AL sr_Latn_RS sr_RS sv_SE sw_TZ ta_IN te_IN th_TH tl_PH tr_TR uk_UA ur_PK uz_UZ vi_VN zh_CN zh_HK zh_TW zu_ZA Change-Id: Ie8272c9697febfc24b4dabc5ec6fb3759d3bcffb
* | | | Snap for 5357520 from dc1022a58a68e3427eedf9686572137d644859d7 to qt-releaseandroid-build-team Robot2019-03-074-20/+111
|\| | | | | | | | | | | | | | | Change-Id: I0d9ed908f78664a77603b45b94734679444df511
| * | | Add is_primary into event view and tweak allowed columns.yuemingw2019-03-014-20/+111
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 120537027 Bug: 126904569 Bug: 126172154 Test: atest CalendarProvider2Test Change-Id: I7a516c9a3ecf90700eef30c1d45f3387b8ee2111
* | | | Snap for 5348557 from 7a96a9b3013009a4491ba16633bdb55511349a8a to qt-releaseandroid-build-team Robot2019-03-032-0/+33
|\| | | | | | | | | | | | | | | Change-Id: I537d694f016232589f53f0b254e636a9cdc8554d
| * | | Allow personal calendar app to listen to work calendar change.yuemingw2019-02-282-0/+33
| | | | | | | | | | | | | | | | | | | | | | | | Test: atest CalendarProvider2Test Bug: 123631240 Change-Id: I9bbdedab5d890f403f057d0a8aa4d60071fe289a
* | | | Snap for 5342135 from 0f5c3ace687e104d4333807c057936dbd2a4298e to qt-releaseandroid-build-team Robot2019-02-281-5/+8
|\| | | | | | | | | | | | | | | Change-Id: I35c012c16e0d0b503d831a64cf6c826c3e9c5f4d
| * | | Return empty cursor when work profile is disabled.yuemingw2019-02-271-5/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Currently we return empty cursor for cross-profile calendar uris if: 1. work profile does not exist 2. user turned setting off 3. calling package not allowed by admin But we return null if: work profile exists but is disabled. This is somehow inconsistent with the other behavior and could potentially cause crashes for apps that are not careful with the implementation. Bug: 126370740 Test: atest ManagedProfileTest#testCrossProfileCalendar Change-Id: I9a4a4a287296e7c51c6635ac99c42da558dc0ccc
* | | | Snap for 5333170 from 8c6817e1c67b557aef6d9df3e4f5eb22b456aff2 to qt-releaseandroid-build-team Robot2019-02-250-0/+0
|\| | | | | | | | | | | | | | | Change-Id: I9c29d01a661856833adb081bf28db0f915e08cac
| * | | [automerger skipped] DO NOT MERGE - Merge pi-dev@5234907 into stage-aosp-masterXin Li2019-02-240-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | am: 704a157eba -s ours am skip reason: subject contains skip directive Change-Id: I8abb787d2ae5f2a6b714b144a2247620241eb6e4
| | * | DO NOT MERGE - Merge pi-dev@5234907 into stage-aosp-masterXin Li2019-02-200-0/+0
| | |\ \ | | | | | | | | | | | | | | | | | | | | Bug: 120848293 Change-Id: I8787b0bf197b53a79114204a5293a4a74ec1e145
* | | | | Snap for 5280121 from 692be0200aaddabfb32e38560fe3947045132429 to qt-releaseandroid-build-team Robot2019-02-034-99/+29
|\| | | | | | | | | | | | | | | | | | | Change-Id: I7abc19240654c18b2c2f8f4329b2351303fc157a
| * | | | Enforce cross profile calendar policies in one place.yuemingw2019-01-314-99/+29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Instead of checking dpm policy in primary user and settings value in managed profile user, we'd better check them all in primary user. Calendar provider will need INTERACT_ACROSS_USER_FULL to access settings provider and this permission is not granted to any app in privapp-permissions-platform.xml. So I think it's safer to change isPackageAllowedToAccessCalendar to check both admin policy & settings value. Bug: 123629973 Test: atest CalendarProvider2Test Change-Id: I632204290454c2a00a2348333064e79a02557d9a
* | | | | Snap for 5231632 from fc5267e6a3d5a5a55474699dd0189687baa00a1d to qt-releaseandroid-build-team Robot2019-01-154-69/+57
|\| | | | | | | | | | | | | | | | | | | Change-Id: I2eaf5a2168f5573d09262e44e9d7ec7156cbd352
| * | | | Merge "Convert Android.mk file to Android.bp" am: 8dddb7086d am: 8414dcc9abSasha Smundak2019-01-144-69/+57
| |\ \ \ \ | | | |/ / | | |/| | | | | | | | | | | | | | | | | am: cc7dc6d20b Change-Id: I68351cb8df69da083bfa29cdd8a43afd6ba1f219
| | * | | Merge "Convert Android.mk file to Android.bp" am: 8dddb7086dSasha Smundak2019-01-144-69/+57
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | am: 8414dcc9ab Change-Id: I5d4ce2782411b21a78487bdd3831514fc68d2a05
| | | * | Merge "Convert Android.mk file to Android.bp"Sasha Smundak2019-01-144-69/+57
| | | |\| | | | | | | | | | | | | | | | | | | | | | | | | | am: 8dddb7086d Change-Id: I351348ffec738150d74f1d00cb4ccc0eed3c6e1b
| | | | * Merge "Convert Android.mk file to Android.bp"Treehugger Robot2019-01-144-69/+57
| | | | |\
| | | | | * Convert Android.mk file to Android.bpSasha Smundak2019-01-094-69/+57
| | | | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | See build/soong/README.md for more information. Fixes: 122333236 Test: treehugger Change-Id: I8b9362bdd0fb0948f60e5b9a47e42014381b3c56
* | | | | Snap for 5179425 from 745820947996c055f238da1ff8331062b4cc6695 to qt-releaseandroid-build-team Robot2018-12-136-3/+946
|\| | | | | | | | | | | | | | | | | | | Change-Id: I3c543ee8d6973323883c635671e0ad7fc9795db5
| * | | | Add cross profile uri for Events and Calendars table.yuemingw2018-12-126-3/+946
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 118455064 Test: runtest -x packages/providers/CalendarProvider/tests/src/com/android/providers/calendar/CalendarProvider2Test.java atest ManagedProfileTest#testCrossProfileCalendar Change-Id: Ia40afd71f7b9c8f9d60425458b1abc5df0d009c9 atest ManagedProfileTest#testCrossProfileCalendar
* | | | | Snap for 5174203 from 4b2f539806d3ed1135d78f84562874501743b711 to qt-releaseandroid-build-team Robot2018-12-110-0/+0
|\| | | | | | | | | | | | | | | | | | | Change-Id: I46cfa26895906af29fb03219dd64f4fedbf048ec
| * | | | [automerger skipped] Merge "DO NOT MERGE" am: abe740b6ee -s ours am: ↵Xin Li2018-12-100-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 96b4a6b655 -s ours am: 33b93edf16 -s ours Change-Id: I193bf9447b0e679a557ea9bcc465c425459da60b
| | * | | [automerger skipped] Merge "DO NOT MERGE" am: abe740b6ee -s oursXin Li2018-12-100-0/+0
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | am: 96b4a6b655 -s ours Change-Id: I2a86c569dc84e31e8b0ec85c1ed1cf845950e929
| | | * | [automerger skipped] Merge "DO NOT MERGE"Xin Li2018-12-100-0/+0
| | | |\| | | | | | | | | | | | | | | | | | | | | | | | | | am: abe740b6ee -s ours Change-Id: I0625f6c3fddfa8cafab5bdc3c2c8299ab42376c9
| | | | * Merge "DO NOT MERGE"Treehugger Robot2018-12-100-0/+0
| | | |/|
| | | | * DO NOT MERGEXin Li2018-12-070-0/+0
| | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge pie-platform-release (PPRL.181205.001, history only) into master Bug: 120502534 Change-Id: I31f314435e9641931d8eabcd1c5cdf0208776305
| | | | * Snap for 4781566 from 92afb2f26633de583662cdb22b04423c6affb2dd to pi-releaseandroid-build-team Robot2018-05-153-80/+54
| | | | |\ | | | | | | | | | | | | | | | | | | Change-Id: Ibb7c88a0eccf5fb866f20ca92315ca8805f0e55c
| | | | * \ Snap for 4754571 from 484cf8543ca37c370544ed98be8b9236c878be89 to pi-releaseandroid-build-team Robot2018-05-011-2/+0
| | | | |\ \ | | | | | | | | | | | | | | | | | | | | | Change-Id: Idede882b4a42a5ac47b8346b92af2fa7059b38da
| | | | * \ \ Snap for 4710485 from 5b337893375f30259e30e9dade8006cb0d3aad12 to pi-releaseandroid-build-team Robot2018-04-101-0/+1
| | | | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I944903868a661c7264a54e46e3fbfb78ccb74115
| | | | * \ \ \ Snap for 4677756 from 82e75ccd0dbf44b110c0ced77fc318678a8532a0 to pi-releaseandroid-build-team Robot2018-03-252-1/+109
| | | | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I6ab5a202c25df34dce45e20b45a22979b77d2612
| | | | * \ \ \ \ Snap for 4620899 from 703fb7521f3fa18aed3c7e60cf56a9be5991e64e to pi-releaseandroid-build-team Robot2018-02-252-0/+2
| | | | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I3d0223eac6595cffa4fd7c31f0424f4c75855245
| | | | * \ \ \ \ \ merge in pi-release history after reset to mastergitbuildkicker2018-01-290-0/+0
| | | | |\ \ \ \ \ \