Commit Graph

67710 Commits

Author SHA1 Message Date
TreeHugger Robot
1c7ae21c92 Merge "Send metrics log of card dismiss event to SI instantly" into rvc-dev am: f5056a03e3 am: db19d8ffd0 am: 4d64c02c02
Change-Id: I83bff6dc02371e7bb9665a0b2030d15872814e06
2020-05-28 11:53:12 +00:00
TreeHugger Robot
f31dedc48b Merge "Send metrics log of card dismiss event to SI instantly" into rvc-dev am: f5056a03e3 am: db19d8ffd0 am: 36d8289420
Change-Id: I36a25ac523a0fd43abf343c272c6ae4062ae619b
2020-05-28 11:53:01 +00:00
TreeHugger Robot
36d8289420 Merge "Send metrics log of card dismiss event to SI instantly" into rvc-dev am: f5056a03e3 am: db19d8ffd0
Change-Id: I6d5f9b4c3ec723243039df217b7a03bb3af3ff5c
2020-05-28 11:35:52 +00:00
TreeHugger Robot
4d64c02c02 Merge "Send metrics log of card dismiss event to SI instantly" into rvc-dev am: f5056a03e3 am: db19d8ffd0
Change-Id: Ie01c24aed0ef2988e9815779193afffd7fd792d8
2020-05-28 11:35:46 +00:00
TreeHugger Robot
db19d8ffd0 Merge "Send metrics log of card dismiss event to SI instantly" into rvc-dev am: f5056a03e3
Change-Id: I6cf54fdbb02d84367f3311f697499de00fbf6ced
2020-05-28 11:29:32 +00:00
TreeHugger Robot
f5056a03e3 Merge "Send metrics log of card dismiss event to SI instantly" into rvc-dev 2020-05-28 11:14:49 +00:00
Jason Chiu
2ec9aee1e1 Send metrics log of card dismiss event to SI instantly
The 1 minute send delay of the original log writer makes the dismissed
card list in SI is not up to date, which causes some dismissed card
reappears.

Bug: 157211258
Test: manual
Change-Id: I0780a444e10a60c0cc7006b3bd65d37b33707134
2020-05-28 18:04:21 +08:00
Edgar Wang
757e453581 Merge "Fix NPE if default supervisor is not defined" am: 9bc3b6a207 am: 4d93ad694b am: 3cb8e75d85 am: 60a3d7d01d
Change-Id: Iee36cea988dc59e880ff1deb14e17e96dd3f9dce
2020-05-28 07:25:09 +00:00
Edgar Wang
60a3d7d01d Merge "Fix NPE if default supervisor is not defined" am: 9bc3b6a207 am: 4d93ad694b am: 3cb8e75d85
Change-Id: I6fd5b20fc63513e939ff30091bd8f7815e5618bc
2020-05-28 07:07:25 +00:00
Edgar Wang
3cb8e75d85 Merge "Fix NPE if default supervisor is not defined" am: 9bc3b6a207 am: 4d93ad694b
Change-Id: Ibb53d7709aab6f98d61045a5745fd0d52d108346
2020-05-28 06:59:05 +00:00
Edgar Wang
4d93ad694b Merge "Fix NPE if default supervisor is not defined" am: 9bc3b6a207
Change-Id: I74e93eca610194d7251c596bb854446bbc3dc129
2020-05-28 06:45:04 +00:00
Edgar Wang
9bc3b6a207 Merge "Fix NPE if default supervisor is not defined" 2020-05-28 06:30:46 +00:00
Automerger Merge Worker
8ef2ebfb52 Merge "Merge "[a11y] Fix Talkback speak "Edit box, Nickname" for "Select photo" button." into rvc-dev am: 1821ab5e5b am: 786f69266b" into rvc-d1-dev-plus-aosp am: 46e37f0930
Change-Id: Ia8b29dafb03faa136f2ebdb5e50e90d9c9cacfae
2020-05-28 05:20:28 +00:00
Edgar Wang
38a1b4b91b Merge "[a11y] Fix Talkback speak "Edit box, Nickname" for "Select photo" button." into rvc-dev am: 1821ab5e5b am: 869e287894 am: 669f7d9002
Change-Id: Ibf6d65064c8ca723fed00abcee18076bdc1a4047
2020-05-28 05:20:13 +00:00
Edgar Wang
d1d962af5c Merge "[a11y] Fix Talkback speak "Edit box, Nickname" for "Select photo" button." into rvc-dev am: 1821ab5e5b am: 869e287894 am: 6052f50c35
Change-Id: I58a2b33d25baf3033bdfaddd8982b32917878f1e
2020-05-28 05:19:57 +00:00
Automerger Merge Worker
46e37f0930 Merge "Merge "[a11y] Fix Talkback speak "Edit box, Nickname" for "Select photo" button." into rvc-dev am: 1821ab5e5b am: 786f69266b" into rvc-d1-dev-plus-aosp 2020-05-28 05:09:38 +00:00
Edgar Wang
60b7f5acb0 Merge "[a11y] Fix Talkback speak "Edit box, Nickname" for "Select photo" button." into rvc-dev am: 1821ab5e5b am: 786f69266b
Change-Id: Ibb277107f5c4c9c59099305b5dbe21613a719ee0
2020-05-28 05:09:33 +00:00
Edgar Wang
6052f50c35 Merge "[a11y] Fix Talkback speak "Edit box, Nickname" for "Select photo" button." into rvc-dev am: 1821ab5e5b am: 869e287894
Change-Id: If6a453d2116adf0d179713cb2d3f46f7ca2505b0
2020-05-28 05:09:28 +00:00
Edgar Wang
669f7d9002 Merge "[a11y] Fix Talkback speak "Edit box, Nickname" for "Select photo" button." into rvc-dev am: 1821ab5e5b am: 869e287894
Change-Id: I26cad15058d9706f17a08e20dbbf9531c9ef1ccf
2020-05-28 05:09:13 +00:00
Edgar Wang
786f69266b Merge "[a11y] Fix Talkback speak "Edit box, Nickname" for "Select photo" button." into rvc-dev am: 1821ab5e5b
Change-Id: I71eda01d338e6c1e424dbb30c016a1919fb4ac55
2020-05-28 04:54:43 +00:00
Edgar Wang
869e287894 Merge "[a11y] Fix Talkback speak "Edit box, Nickname" for "Select photo" button." into rvc-dev am: 1821ab5e5b
Change-Id: If04ac5a8a6da67d3755400afc306f955e358d865
2020-05-28 04:54:41 +00:00
Edgar Wang
1821ab5e5b Merge "[a11y] Fix Talkback speak "Edit box, Nickname" for "Select photo" button." into rvc-dev 2020-05-28 04:43:17 +00:00
TreeHugger Robot
4251bdcce9 Merge "Enable the filterTouchesWhenObscured in Special app access" into rvc-dev am: 01338915d8 am: aae8734076 am: 269d3529bd
Change-Id: I3a9e8c8fc3a68008114c838b4ed3d486015e6c94
2020-05-28 03:35:29 +00:00
TreeHugger Robot
b058ab4b9f Merge "Enable the filterTouchesWhenObscured in Special app access" into rvc-dev am: 01338915d8 am: aae8734076 am: a159271ce4
Change-Id: I91362ad7de388264f02cafa5ab8a92049ee167d0
2020-05-28 03:34:58 +00:00
TreeHugger Robot
b5a0ab2830 Merge "Enable the filterTouchesWhenObscured in Special app access" into rvc-dev am: 01338915d8 am: d078f8e326 am: da614c603f
Change-Id: I6dde38a47074dc2fc95d24589bf61346397fc646
2020-05-28 03:34:44 +00:00
TreeHugger Robot
a159271ce4 Merge "Enable the filterTouchesWhenObscured in Special app access" into rvc-dev am: 01338915d8 am: aae8734076
Change-Id: Id0aacce3979e957be319c760c5df96a5df2c714a
2020-05-28 03:22:45 +00:00
TreeHugger Robot
269d3529bd Merge "Enable the filterTouchesWhenObscured in Special app access" into rvc-dev am: 01338915d8 am: aae8734076
Change-Id: Ia7e868b3754b96a0ae4ea0de66307eb8876ceec4
2020-05-28 03:22:43 +00:00
TreeHugger Robot
da614c603f Merge "Enable the filterTouchesWhenObscured in Special app access" into rvc-dev am: 01338915d8 am: d078f8e326
Change-Id: I90a02cd29e01764568066bef01f73442c779a0cf
2020-05-28 03:22:38 +00:00
TreeHugger Robot
d078f8e326 Merge "Enable the filterTouchesWhenObscured in Special app access" into rvc-dev am: 01338915d8
Change-Id: Ia4845ed6f59769cbd763e2137a807afa54696e62
2020-05-28 03:07:04 +00:00
TreeHugger Robot
aae8734076 Merge "Enable the filterTouchesWhenObscured in Special app access" into rvc-dev am: 01338915d8
Change-Id: Ia7dc3014b9dd92c787b692395f359f5bedc51ea5
2020-05-28 03:06:59 +00:00
TreeHugger Robot
01338915d8 Merge "Enable the filterTouchesWhenObscured in Special app access" into rvc-dev 2020-05-28 02:58:23 +00:00
Chen Xu
8544e130a9 [automerger skipped] Merge "AOSP Cellbroadcast renaming" into rvc-dev am: e7d1c822fc am: 76f2b27e3b -s ours am: 78c75b1d10 -s ours
am skip reason: Change-Id Ic38372d96918c17d3cd61832ff668fcfc61f0686 with SHA-1 c2ee364f6f is in history

Change-Id: I818ce65335912c6b8bebc6b18ed0df18c723cdb5
2020-05-28 02:28:04 +00:00
Chen Xu
357505c6aa [automerger skipped] Merge "AOSP Cellbroadcast renaming" into rvc-dev am: e7d1c822fc am: f4d1912123 am: 31c0f50065 -s ours
am skip reason: Change-Id Ic38372d96918c17d3cd61832ff668fcfc61f0686 with SHA-1 c2ee364f6f is in history

Change-Id: If6901e36b5441b048d57514a390b25b7deed1cfe
2020-05-28 02:27:57 +00:00
Chen Xu
1e7a1e6838 Merge "AOSP Cellbroadcast renaming" into rvc-dev am: e7d1c822fc am: f4d1912123 am: eb7d35e2c7
Change-Id: I4d6c79aa5ef0fc4afe17058b3840aa5d697871ac
2020-05-28 02:27:36 +00:00
Chen Xu
78c75b1d10 [automerger skipped] Merge "AOSP Cellbroadcast renaming" into rvc-dev am: e7d1c822fc am: 76f2b27e3b -s ours
am skip reason: Change-Id Ic38372d96918c17d3cd61832ff668fcfc61f0686 with SHA-1 c2ee364f6f is in history

Change-Id: I374df5fd34ccfea75a04955a232a6f36f48cb904
2020-05-28 02:16:08 +00:00
Chen Xu
eb7d35e2c7 Merge "AOSP Cellbroadcast renaming" into rvc-dev am: e7d1c822fc am: f4d1912123
Change-Id: I5c3253a8ff1b6065da1673363c7f970078b1b823
2020-05-28 02:15:51 +00:00
Chen Xu
31c0f50065 Merge "AOSP Cellbroadcast renaming" into rvc-dev am: e7d1c822fc am: f4d1912123
Change-Id: Id6af021c26a12fb714addb4c14cbe647e3841603
2020-05-28 02:15:36 +00:00
Chen Xu
76f2b27e3b Merge "AOSP Cellbroadcast renaming" into rvc-dev am: e7d1c822fc
Change-Id: I7e2ba395848723900c4596243bb51f75abf915f5
2020-05-28 02:00:05 +00:00
Chen Xu
f4d1912123 Merge "AOSP Cellbroadcast renaming" into rvc-dev am: e7d1c822fc
Change-Id: I25cfd0ef5a3b39c3c9e0d66c08912a7ab82902e1
2020-05-28 02:00:03 +00:00
Chen Xu
e7d1c822fc Merge "AOSP Cellbroadcast renaming" into rvc-dev 2020-05-28 01:46:10 +00:00
TreeHugger Robot
539e7e1fb4 Merge "Some notification history fixes" into rvc-dev am: 69d210c7df am: 256f070ed0 am: 33beacef89
Change-Id: I20a01ccfe1c7d9cfd8ce0dc1ca44669fb68448d1
2020-05-27 21:09:35 +00:00
TreeHugger Robot
644c916bb1 Merge "Some notification history fixes" into rvc-dev am: 69d210c7df am: 39507de82b am: 5910536ffe
Change-Id: Ieb20d22d3d983ef2a0471cb04e88742db298a99d
2020-05-27 21:09:27 +00:00
TreeHugger Robot
2fbf0c12a1 Merge "Some notification history fixes" into rvc-dev am: 69d210c7df am: 39507de82b am: 3e6e83faf9
Change-Id: I8312e5776282257c7c2f09e297bcf04da5dca67a
2020-05-27 21:09:15 +00:00
TreeHugger Robot
33beacef89 Merge "Some notification history fixes" into rvc-dev am: 69d210c7df am: 256f070ed0
Change-Id: I480c7cc7e8123c6f83573842e1e8970c79aba7f8
2020-05-27 20:53:49 +00:00
TreeHugger Robot
5910536ffe Merge "Some notification history fixes" into rvc-dev am: 69d210c7df am: 39507de82b
Change-Id: Id2097ac899c051e44ebf465cc90dcdee5da1247f
2020-05-27 20:53:41 +00:00
TreeHugger Robot
3e6e83faf9 Merge "Some notification history fixes" into rvc-dev am: 69d210c7df am: 39507de82b
Change-Id: Ie27e5abc2b79b89ea77d0308703b5fcbade2a98a
2020-05-27 20:53:26 +00:00
TreeHugger Robot
256f070ed0 Merge "Some notification history fixes" into rvc-dev am: 69d210c7df
Change-Id: I7b7eecab337ba84983d37d4a909f5cc1b89c9dad
2020-05-27 20:35:55 +00:00
TreeHugger Robot
39507de82b Merge "Some notification history fixes" into rvc-dev am: 69d210c7df
Change-Id: I122252be30db11ea6030d5d23c353d36b617b059
2020-05-27 20:35:46 +00:00
Chen Xu
c2ee364f6f AOSP Cellbroadcast renaming
As part of mainline effort, AOSP cellbroadcast package name was changed
from com.android.cellbroadcast to com.android.cellbroadcast.module

Bug: 155844209
Test: Manual test
Change-Id: Ic38372d96918c17d3cd61832ff668fcfc61f0686
Merged-in: Ic38372d96918c17d3cd61832ff668fcfc61f0686
2020-05-27 20:25:43 +00:00
TreeHugger Robot
69d210c7df Merge "Some notification history fixes" into rvc-dev 2020-05-27 20:25:36 +00:00