Automerger Merge Worker
0b32437916
Merge "Merge "[Settings] Avoid from Settings crash" into rvc-dev am: d227755be8 am: 558095e583" into rvc-d1-dev-plus-aosp am: 4ee8a227a1 am: 53d73451b3
...
Change-Id: I5d2715b0223a344e8c076fca93d7893bf7eaa4f8
2020-03-25 00:40:35 +00:00
TreeHugger Robot
715687986f
Merge "[Settings] Avoid from Settings crash" into rvc-dev am: d227755be8 am: d169749e7d am: adce5a2ec1 am: e7a6a2c302
...
Change-Id: Ic1b13d094291cf06644533f59b5195183904b5a4
2020-03-25 00:37:49 +00:00
Automerger Merge Worker
53d73451b3
Merge "Merge "[Settings] Avoid from Settings crash" into rvc-dev am: d227755be8 am: 558095e583" into rvc-d1-dev-plus-aosp am: 4ee8a227a1
...
Change-Id: Ib735fb26fc1370a6c03774c4ffd4f3f952e61876
2020-03-25 00:21:29 +00:00
TreeHugger Robot
e7a6a2c302
Merge "[Settings] Avoid from Settings crash" into rvc-dev am: d227755be8 am: d169749e7d am: adce5a2ec1
...
Change-Id: I0ec4049b249fa122ed4d7b7bcdc3180c10e006c1
2020-03-25 00:21:03 +00:00
Automerger Merge Worker
4ee8a227a1
Merge "Merge "[Settings] Avoid from Settings crash" into rvc-dev am: d227755be8 am: 558095e583" into rvc-d1-dev-plus-aosp
2020-03-25 00:08:10 +00:00
TreeHugger Robot
a3848257dd
Merge "[Settings] Avoid from Settings crash" into rvc-dev am: d227755be8 am: 558095e583
...
Change-Id: I641d1a2119f6e4748515774d57d0a2f1cfa01be5
2020-03-25 00:07:59 +00:00
TreeHugger Robot
adce5a2ec1
Merge "[Settings] Avoid from Settings crash" into rvc-dev am: d227755be8 am: d169749e7d
...
Change-Id: I2478aacd60522ad19983c023d37965bc2cb71116
2020-03-25 00:07:58 +00:00
TreeHugger Robot
558095e583
Merge "[Settings] Avoid from Settings crash" into rvc-dev am: d227755be8
...
Change-Id: I4a4e9d0ef55b07cee0207e73dba1b577d8aa1bc9
2020-03-24 23:48:40 +00:00
TreeHugger Robot
d169749e7d
Merge "[Settings] Avoid from Settings crash" into rvc-dev am: d227755be8
...
Change-Id: I2fb1ee5ab5f737660676b27062b89329e9cedf81
2020-03-24 23:47:44 +00:00
TreeHugger Robot
d227755be8
Merge "[Settings] Avoid from Settings crash" into rvc-dev
2020-03-24 23:32:34 +00:00
Julia Reynolds
2829bfbc5c
Merge "Update all conversations screen" into rvc-dev am: 79fd5811cd am: b5d726003f am: 46b8b3b4d2 am: a9b755c116 am: 08d8254ae0
...
Change-Id: I652e51a3919c89186ca87d6db8e0a6d6c75d23ae
2020-03-24 22:29:53 +00:00
Julia Reynolds
08d8254ae0
Merge "Update all conversations screen" into rvc-dev am: 79fd5811cd am: b5d726003f am: 46b8b3b4d2 am: a9b755c116
...
Change-Id: I846795e7be8cea40f26307015d1354aa4dbad23b
2020-03-24 22:29:14 +00:00
Julia Reynolds
6f4e9992c0
Merge "Update all conversations screen" into rvc-dev am: 79fd5811cd am: b5d726003f am: 2c0fbbde8c am: 558d2759db
...
Change-Id: I7922717762114c61f49856507bf08262150d5473
2020-03-24 22:29:00 +00:00
Julia Reynolds
558d2759db
Merge "Update all conversations screen" into rvc-dev am: 79fd5811cd am: b5d726003f am: 2c0fbbde8c
...
Change-Id: Iad1d485ebd2ea63d845aea48eb8599e1f81b268b
2020-03-24 22:14:11 +00:00
Julia Reynolds
a9b755c116
Merge "Update all conversations screen" into rvc-dev am: 79fd5811cd am: b5d726003f am: 46b8b3b4d2
...
Change-Id: Id8e3f577e73d5e3bcd813cf9a9c13ed0c672d109
2020-03-24 22:14:05 +00:00
Julia Reynolds
ea9d98cd65
Merge "Notification history updates" into rvc-dev am: 8d3741fbca am: 31f9705a60 am: 575b3e8aaf am: 1063516bd2 am: b28c536b89
...
Change-Id: Iedbc24fefef6b062c8c3942d3eddfc7167c56924
2020-03-24 22:00:47 +00:00
Julia Reynolds
46b8b3b4d2
Merge "Update all conversations screen" into rvc-dev am: 79fd5811cd am: b5d726003f
...
Change-Id: Ib7c68ea80f4fa61b03de5cd72def8cd7b8c499a6
2020-03-24 22:00:27 +00:00
Julia Reynolds
aaa0cc5238
Merge "Update all conversations screen" into rvc-dev am: 79fd5811cd am: 941d437df6 am: cff74feef2 am: 03c0421dc4
...
Change-Id: I23c953ca75db72ecbbe754d59a83cdb9b6e90441
2020-03-24 22:00:27 +00:00
Julia Reynolds
b28c536b89
Merge "Notification history updates" into rvc-dev am: 8d3741fbca am: 31f9705a60 am: 575b3e8aaf am: 1063516bd2
...
Change-Id: Ied0f1d3989ae33c9656cf3e8ae1bcba919163912
2020-03-24 22:00:18 +00:00
Julia Reynolds
a0ea8fb683
Merge "Notification history updates" into rvc-dev am: 8d3741fbca am: f611025053 am: 6104923f21 am: 3ce7f90453
...
Change-Id: I14a1f1d97e5122ab3093163ae7c4077621a37714
2020-03-24 22:00:01 +00:00
Julia Reynolds
2c0fbbde8c
Merge "Update all conversations screen" into rvc-dev am: 79fd5811cd am: b5d726003f
...
Change-Id: Id63a9f0dae4739a0464e00881e1fd4cea9c1ebb6
2020-03-24 21:59:41 +00:00
Julia Reynolds
e23b91a9b3
Merge "Notification history updates" into rvc-dev am: 8d3741fbca am: 31f9705a60 am: 7cad4c67df am: 465b7a2c95
...
Change-Id: I39da1000218400d1c1253f5f42e88ba981fb8d04
2020-03-24 21:59:32 +00:00
Julia Reynolds
03c0421dc4
Merge "Update all conversations screen" into rvc-dev am: 79fd5811cd am: 941d437df6 am: cff74feef2
...
Change-Id: I7b561688720aa6927096096da72bca418665a909
2020-03-24 21:52:41 +00:00
Julia Reynolds
3ce7f90453
Merge "Notification history updates" into rvc-dev am: 8d3741fbca am: f611025053 am: 6104923f21
...
Change-Id: I513245de8ad89f8daff684ff6297e0bfc57926c5
2020-03-24 21:52:34 +00:00
Bonian Chen
dcf701efc3
[Settings] Avoid from Settings crash
...
Avoid from crash when null pointer.
Bug: 152336444
Test: m RunSettingsRoboTests -j ROBOTEST_FILTER=MobileNetworkActivityTest
Change-Id: I77314f697d8a99d77b9f5fe0a48ddbae69634743
2020-03-25 05:48:37 +08:00
Julia Reynolds
cff74feef2
Merge "Update all conversations screen" into rvc-dev am: 79fd5811cd am: 941d437df6
...
Change-Id: I94ef7a1ea9ab9742f2dadd5c057a82e866cb8f10
2020-03-24 21:43:34 +00:00
Julia Reynolds
6104923f21
Merge "Notification history updates" into rvc-dev am: 8d3741fbca am: f611025053
...
Change-Id: If414a68d3c1f058d2e208534c74906bad47556e2
2020-03-24 21:43:15 +00:00
Julia Reynolds
941d437df6
Merge "Update all conversations screen" into rvc-dev am: 79fd5811cd
...
Change-Id: I065eb16003c13ed562242e1d9d2eb5deb6870415
2020-03-24 21:42:44 +00:00
Julia Reynolds
b5d726003f
Merge "Update all conversations screen" into rvc-dev am: 79fd5811cd
...
Change-Id: Icf2ce73480b62fb1853e0798b890cfbcbccc0191
2020-03-24 21:42:03 +00:00
Julia Reynolds
1063516bd2
Merge "Notification history updates" into rvc-dev am: 8d3741fbca am: 31f9705a60 am: 575b3e8aaf
...
Change-Id: I31f18a7bddbfa6f48f27e002e9aedfd57baa64d6
2020-03-24 21:41:45 +00:00
Julia Reynolds
465b7a2c95
Merge "Notification history updates" into rvc-dev am: 8d3741fbca am: 31f9705a60 am: 7cad4c67df
...
Change-Id: I8babab360e43c5b28fd307ea3478510fa3d2d298
2020-03-24 21:41:35 +00:00
Julia Reynolds
79fd5811cd
Merge "Update all conversations screen" into rvc-dev
2020-03-24 21:33:53 +00:00
Julia Reynolds
575b3e8aaf
Merge "Notification history updates" into rvc-dev am: 8d3741fbca am: 31f9705a60
...
Change-Id: Ie8b990fbc370db99e26097612b5d760e51614b75
2020-03-24 21:26:34 +00:00
Julia Reynolds
7cad4c67df
Merge "Notification history updates" into rvc-dev am: 8d3741fbca am: 31f9705a60
...
Change-Id: Iddede304e44b2526287d15a56acda47420855532
2020-03-24 21:25:51 +00:00
Julia Reynolds
f611025053
Merge "Notification history updates" into rvc-dev am: 8d3741fbca
...
Change-Id: Ia281dc883825831c64e9f12b2b5c82e42333e047
2020-03-24 21:17:27 +00:00
Julia Reynolds
31f9705a60
Merge "Notification history updates" into rvc-dev am: 8d3741fbca
...
Change-Id: If1386c89f4e0e90c84d57950351509c2b9a4173f
2020-03-24 21:16:41 +00:00
Julia Reynolds
8d3741fbca
Merge "Notification history updates" into rvc-dev
2020-03-24 21:07:35 +00:00
Julia Reynolds
2f0bd6552c
Update all conversations screen
...
Update text, and filter the lower section to match the new
header
Test: atest
Fixes: 151765526
Change-Id: I5bc052813745908df8602bf397434a76b294ba6c
2020-03-24 19:37:13 +00:00
Julia Reynolds
8222a9a650
Notification history updates
...
- New strings
- Fix a crash
Test: manual
Fixes: 151833727
Change-Id: I3b0ef5cd9b221be917c71043e5217a43bc5891d0
2020-03-24 09:25:58 -04:00
TreeHugger Robot
2a29ae13c2
Merge "Re-enable ignored tests" into rvc-dev am: 87c0179c01 am: 875b0df3dd am: ed3f4c9d98 am: bc63cbf00b am: da46a71e30
...
Change-Id: I57e227c75c59bbb173ed6e3ddc5f5b159cc54309
2020-03-24 13:23:49 +00:00
Automerger Merge Worker
f966c9616e
Merge "Merge "Re-enable ignored tests" into rvc-dev am: 87c0179c01 am: 168fe82aa5" into rvc-d1-dev-plus-aosp am: 0aec76e8ef am: 67cefa4b86
...
Change-Id: I53bed3f4e036e04cb28dc927bab5640432509a99
2020-03-24 13:23:33 +00:00
TreeHugger Robot
da46a71e30
Merge "Re-enable ignored tests" into rvc-dev am: 87c0179c01 am: 875b0df3dd am: ed3f4c9d98 am: bc63cbf00b
...
Change-Id: I66284bc3fb8652aa233781b32be77778792121f2
2020-03-24 13:23:28 +00:00
TreeHugger Robot
d18f4d248a
Merge "Re-enable ignored tests" into rvc-dev am: 87c0179c01 am: 875b0df3dd am: 8247c93340 am: a76db9ae4c
...
Change-Id: I57140ea1858a0b35d7c1f04031947eb99bbdc8a0
2020-03-24 13:23:22 +00:00
Automerger Merge Worker
67cefa4b86
Merge "Merge "Re-enable ignored tests" into rvc-dev am: 87c0179c01 am: 168fe82aa5" into rvc-d1-dev-plus-aosp am: 0aec76e8ef
...
Change-Id: Ic51e107ede190eab18b52672db751322ec445e3d
2020-03-24 13:11:49 +00:00
TreeHugger Robot
bc63cbf00b
Merge "Re-enable ignored tests" into rvc-dev am: 87c0179c01 am: 875b0df3dd am: ed3f4c9d98
...
Change-Id: I5341052f7220a84b802fa800aeb86e7195e7e8f0
2020-03-24 13:11:31 +00:00
TreeHugger Robot
a76db9ae4c
Merge "Re-enable ignored tests" into rvc-dev am: 87c0179c01 am: 875b0df3dd am: 8247c93340
...
Change-Id: Ia544421a79194d127311eb73e55960257862e137
2020-03-24 13:11:30 +00:00
Automerger Merge Worker
0aec76e8ef
Merge "Merge "Re-enable ignored tests" into rvc-dev am: 87c0179c01 am: 168fe82aa5" into rvc-d1-dev-plus-aosp
2020-03-24 12:49:51 +00:00
TreeHugger Robot
ed3f4c9d98
Merge "Re-enable ignored tests" into rvc-dev am: 87c0179c01 am: 875b0df3dd
...
Change-Id: I79a8ebd1fd0fe103749fdbc7047b6ce9c7202b4a
2020-03-24 12:49:48 +00:00
TreeHugger Robot
59f6f58fb5
Merge "Re-enable ignored tests" into rvc-dev am: 87c0179c01 am: 168fe82aa5
...
Change-Id: Id7bf4ef08d686fac188855f200b361ce5b86f0d0
2020-03-24 12:49:47 +00:00
TreeHugger Robot
8247c93340
Merge "Re-enable ignored tests" into rvc-dev am: 87c0179c01 am: 875b0df3dd
...
Change-Id: I3f58f0252146a954d4d14a9b40e5cd12b50c496b
2020-03-24 12:49:41 +00:00
