Commit Graph

62845 Commits

Author SHA1 Message Date
TreeHugger Robot
56fb482acf Merge "Fix Passpoint network details privacy and ssid" into rvc-dev 2020-03-25 01:04:47 +00:00
Philip P. Moltmann
429c4417db Merge "Send attributionTag to notification APIs" into rvc-dev am: 7443e3de6e am: 64d9d6eb15 am: e2774bdaab am: 954e45fc00 am: be73ba7af7
Change-Id: I4c1206ea8509be038bf2b8ef0fa3d69e11dd3890
2020-03-25 00:56:02 +00:00
TreeHugger Robot
634ec2523b Merge "[Settings] Avoid from Settings crash" into rvc-dev am: d227755be8 am: 558095e583 am: d6b3dae0a6 am: 51e405d39c am: 735d8d80cb
Change-Id: I38c09c8ecfb35f334b4b033397a0add4cc5ddfa2
2020-03-25 00:44:37 +00:00
Philip P. Moltmann
51e38187a8 Merge "Send attributionTag to notification APIs" into rvc-dev am: 7443e3de6e am: 64d9d6eb15 am: e59daf3ef3 am: 06470d595e
Change-Id: I540ba04371129b5db16bebb49bbe77f1626e3172
2020-03-25 00:42:14 +00:00
Philip P. Moltmann
125d06a311 Merge "Send attributionTag to notification APIs" into rvc-dev am: 7443e3de6e am: 74be567166 am: 6f8310ec88 am: 8a6b846051
Change-Id: I120903751c891abe36f32b55dc04ebaa2f8db8bb
2020-03-25 00:40:47 +00:00
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
Philip P. Moltmann
be73ba7af7 Merge "Send attributionTag to notification APIs" into rvc-dev am: 7443e3de6e am: 64d9d6eb15 am: e2774bdaab am: 954e45fc00
Change-Id: Ibb2b201cf0e4786cf29992d2444e6cbf82195d21
2020-03-25 00:37:03 +00:00
TreeHugger Robot
735d8d80cb Merge "[Settings] Avoid from Settings crash" into rvc-dev am: d227755be8 am: 558095e583 am: d6b3dae0a6 am: 51e405d39c
Change-Id: I483fbed6e30062f35bfb35d5d9d842f8815faf26
2020-03-25 00:36:45 +00:00
Philip P. Moltmann
954e45fc00 Merge "Send attributionTag to notification APIs" into rvc-dev am: 7443e3de6e am: 64d9d6eb15 am: e2774bdaab
Change-Id: I01d383b8eb03df787a359eebb814ca3531bd780b
2020-03-25 00:21:54 +00:00
Philip P. Moltmann
06470d595e Merge "Send attributionTag to notification APIs" into rvc-dev am: 7443e3de6e am: 64d9d6eb15 am: e59daf3ef3
Change-Id: I7b8ee43cd8ef4c633174d42040523fb21db20869
2020-03-25 00:21:42 +00:00
TreeHugger Robot
51e405d39c Merge "[Settings] Avoid from Settings crash" into rvc-dev am: d227755be8 am: 558095e583 am: d6b3dae0a6
Change-Id: I3481d092a29c9270d5c941ec1205cee631e7ef5f
2020-03-25 00:21:36 +00:00
Philip P. Moltmann
8a6b846051 Merge "Send attributionTag to notification APIs" into rvc-dev am: 7443e3de6e am: 74be567166 am: 6f8310ec88
Change-Id: Iedb585d9cea2e8563bfb256c09ca5c4c77e420b4
2020-03-25 00:21:34 +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
Philip P. Moltmann
e59daf3ef3 Merge "Send attributionTag to notification APIs" into rvc-dev am: 7443e3de6e am: 64d9d6eb15
Change-Id: Id581c03843fdad4d3c083ffa59cd4b7e5e732582
2020-03-25 00:08:36 +00:00
Philip P. Moltmann
e2774bdaab Merge "Send attributionTag to notification APIs" into rvc-dev am: 7443e3de6e am: 64d9d6eb15
Change-Id: I78726af3d1eeba7a083149d3233d6eba3649fce5
2020-03-25 00:08:20 +00:00
Philip P. Moltmann
6f8310ec88 Merge "Send attributionTag to notification APIs" into rvc-dev am: 7443e3de6e am: 74be567166
Change-Id: I53cef5fcbde7e24b00f94831350357050ce01103
2020-03-25 00:08:20 +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
d6b3dae0a6 Merge "[Settings] Avoid from Settings crash" into rvc-dev am: d227755be8 am: 558095e583
Change-Id: Ia8fdd87b57d002382abf5be635d30ec40eee4895
2020-03-25 00:07:58 +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
Philip P. Moltmann
64d9d6eb15 Merge "Send attributionTag to notification APIs" into rvc-dev am: 7443e3de6e
Change-Id: I978b101a36a251d9428dd2d17711d30511c6f2b9
2020-03-25 00:01:04 +00:00
Philip P. Moltmann
74be567166 Merge "Send attributionTag to notification APIs" into rvc-dev am: 7443e3de6e
Change-Id: I1c30cfefbcdaa08e715b17b262e42a9c7448b3b8
2020-03-25 00:01:04 +00:00
Philip P. Moltmann
7443e3de6e Merge "Send attributionTag to notification APIs" into rvc-dev 2020-03-24 23:53:51 +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