Commit Graph

339 Commits

Author SHA1 Message Date
Wink Saville
fdd7ca76e6 am 35bd30b1: Merge "Merge commit \'bc6ecbf7\' into manualmerge" into klp-dev am: d2b36f0ae4
Original change: undetermined

Change-Id: Id8276aeebc6ab35fb6212e15671365e0cf433479
2021-05-31 06:31:49 +00:00
Vinit Deshapnde
f2b2e457fa am 48f4246a: Merge "Introduce network link quality statistics" into klp-dev am: db6c0b95f5
Original change: undetermined

Change-Id: Ie1a79feee57b699f80079e45cfa5749ff53878ea
2021-05-31 06:30:32 +00:00
Lorenzo Colitti
d37ad0aa46 am 4d3d5f1f: Merge "Modify LinkProperties address update methods." into klp-dev am: 93868bfe9b
Original change: undetermined

Change-Id: Iad7b5789e92fe81f31fb27697154ef36289fbc95
2021-05-31 06:30:19 +00:00
Lorenzo Colitti
8c89e220bc am b8aa06c7: Merge "Add a string constructor to LinkAddress." into klp-dev am: 8f90fe3f0b
Original change: undetermined

Change-Id: I10c7bc5bb270bbf5c970f2b59078263015af253c
2021-05-31 06:30:06 +00:00
Wink Saville
6016fa5b8b am 4157cb24: am 02eab434: am 3f58ba89: Merge "If in a mobile captive portal is detected enable fail fast." into jb-mr2-dev am: 78f8907ae1
Original change: undetermined

Change-Id: I9d3a8e70a6d7259e71125298a5fd0bba0b7ee9e6
2021-05-31 06:29:26 +00:00
Wink Saville
7e079f1cde am a0ffa2ed: am 55adb390: am 6db564f6: Merge "Have CaptivePortalTracker use gservices updateable provisioning urls." into jb-mr2-dev am: 0d406dffc0
Original change: undetermined

Change-Id: Id8262b90c7a05301e78334ae42badbcabe16edb0
2021-05-31 06:29:14 +00:00
Vinit Deshapnde
07b4d8fa0b Use a single socket to communicate with supplicant am: 00c193e308
Original change: undetermined

Change-Id: I18e18867545a11b9ce8ce44576517779bd0ddbab
2021-05-31 06:28:49 +00:00
Lorenzo Colitti
45df03f8a7 Merge "Simplify LinkPropertiesTest." am: e5976a0167
Original change: undetermined

Change-Id: I10a52823752353efa4351dfffef34b9523c9f01b
2021-05-31 06:28:36 +00:00
Jason Monk
fa22d4e7c1 Add PAC File support for proxy configuration am: 43324ee732
Original change: undetermined

Change-Id: Ief038751d70a9b8ee43d8c3282a25ee6321d75d7
2021-05-31 06:28:15 +00:00
Elliott Hughes
799d0a3074 am 6b67e07d: am 60ae2617: Merge "If frameworks wants ASCII casing, it should explicity ask for it." am: 7ada256efa
Original change: undetermined

Change-Id: Iea6e4afa1d13609dcd4fae872a974bb3651c931b
2021-05-31 06:27:17 +00:00
Dmitry Shmidt
2ad49c4678 dhcp: Get mtu property from dhcp results am: feb443e59d
Original change: undetermined

Change-Id: Ifd7874c05cd228e693e4ae41001c0521d93834f4
2021-05-31 06:27:04 +00:00
Lorenzo Colitti
4528dd2648 Merge "Add accessors for all addresses and clarify compare* methods" am: a5094dc770
Original change: undetermined

Change-Id: Ia5641ab72e9cf81bca7fd8253ff009565fc5c0b0
2021-05-31 06:26:25 +00:00
Wink Saville
a902d03147 Add network type TYPE_MOBILE_IA. am: 70dbdcc418
Original change: undetermined

Change-Id: I69594d2cc44151c2103cf7358c9ab09e7073e6d3
2021-05-31 06:25:37 +00:00
Geremy Condra
ea3d9c62ce Merge "Fix supplimentary network connections with VPNs" am: 2b07accdee
Original change: undetermined

Change-Id: If275fabc320d51fffc7cadd92197c8ad46f7524a
2021-05-31 06:24:42 +00:00
Geremy Condra
869f50a71f Merge "Support multiple Vpn ManageDialogs" am: 12e55c99af
Original change: undetermined

Change-Id: I738035a6c3407c7a97f2b700c1f5f1b248ddf477
2021-05-31 06:24:19 +00:00
Robert Greenwalt
ba7913f987 resolved conflicts for merge of 248d8d2c to master am: 1bf31d7571
Original change: undetermined

Change-Id: Ida8af1276fd2b3f0758fa72c8f5cf26dfd3dab75
2021-05-31 06:23:23 +00:00
Chad Brubaker
49e6b291be Move markSocketAsUser to the top of IConnectivityManager.aidl am: b24810e7f7
Original change: undetermined

Change-Id: I33b1b616052bb451627b010098e19d1eac543e42
2021-05-31 06:22:24 +00:00
Geremy Condra
73da981fad Merge "Support routing sockets as another user" am: cd7b82033d
Original change: undetermined

Change-Id: Ia99844b9e2dc9035468561a19c7e91d0c8b4cddf
2021-05-31 06:22:12 +00:00
Geremy Condra
2bac3abdf7 Merge changes Ia6646363,I94389b64 am: c4f78f6100
Original change: undetermined

Change-Id: I5ba9dd64f2b8d01925a574d0361430aabd6f7f4d
2021-05-31 06:21:50 +00:00
Wink Saville
6aee687710 Merge commit '68513498' into fix-merge-conflict am: 2e63bb7ef5
Original change: undetermined

Change-Id: If2b9f04d2bd5a0cb24a6a63f875e19c08aa17470
2021-05-31 06:18:27 +00:00
Jeff Sharkey
6cff4bbde8 Explicit locale when formatting machine strings. am: cf6e4d80e8
Original change: undetermined

Change-Id: I440be4a7292fc6001c41338b8c310e5eaf653c9b
2021-05-31 06:17:46 +00:00
Jeff Sharkey
a927525c3e Accumulate network statistics based on deltas. am: e9bda1dd68
Original change: undetermined

Change-Id: I083ce7b00e544ee3295b895ba22f52fc9d84160b
2021-05-31 06:17:33 +00:00
Robert Greenwalt
94a5246b80 am 665c912a: Merge "Listen for network disconnect." into jb-mr2-dev am: 7a8f0658c6
Original change: undetermined

Change-Id: I429a400cfff8b6ed51db23b1cf72cdd4856903dc
2021-05-31 06:16:07 +00:00
Robert Greenwalt
2867672999 am a07f1f2d: Remove STOPSHIP and defer removal. am: f95bfb1fa5
Original change: undetermined

Change-Id: I1173d88598b9dbe25fa630d04b0d13761c76dd7c
2021-05-31 06:15:53 +00:00
Robert Greenwalt
a8c113def7 am 3016244f: Merge "Add new route.hasGateway() api" into jb-mr2-dev am: 46976c9027
Original change: undetermined

Change-Id: Ib525b99399b015c0ec98422daf2c50e86b350c58
2021-05-31 06:15:31 +00:00
Robert Greenwalt
974e41ded8 am ccbe7e6f: Merge "Use CONNECTIVITY_INTERNAL for global proxy" into jb-mr2-dev am: c5976600f8
Original change: undetermined

Change-Id: I930ecb2320b1e50707282371b0eacdf60d6e9833
2021-05-31 06:15:04 +00:00
Lorenzo Colitti
4d963b44a9 am 6c2e8fb4: Merge "Fix LinkProperties\'s equals() method." into jb-mr2-dev am: 79f58996c5
Original change: undetermined

Change-Id: I388ad232ad8fd1e98255cead8358d1636c2de9e6
2021-05-31 06:14:20 +00:00
Robert Greenwalt
32877f571b am 2e3f7f04: Merge "Add BT - DataTracker connection" into jb-mr2-dev am: baee17e854
Original change: undetermined

Change-Id: I49464909406a15c721cdb617c935a6c963b0c3ea
2021-05-31 06:13:34 +00:00
Wink Saville
c4fc0db221 am f98a515f: Merge "Cleanup some debug in LinkCapabilities and Properties." into jb-mr2-dev am: 157e5bf119
Original change: undetermined

Change-Id: I6590a56c4782645cda831b143fe523866c7a56ad
2021-05-31 06:13:21 +00:00
Lorenzo Colitti
9aeb1e2b50 am cdee9727: Merge "Make isHostRoute match only host routes" into jb-mr2-dev am: faac152a2d
Original change: undetermined

Change-Id: Ia5a61337c20f52ea5e0cd2b20cb52a87f74b971c
2021-05-31 06:13:08 +00:00
Robert Greenwalt
68f4d9375f am e1b73b79: Prevent NPE in new API. am: f92734e168
Original change: undetermined

Change-Id: Ifc08981965885104ccc7a4d29acea5b67c44e3fa
2021-05-31 06:12:46 +00:00
Lorenzo Colitti
0e53732896 am 31453e5a: Merge "Reset connections on all stacked interfaces." into jb-mr2-dev am: 97f2e96382
Original change: undetermined

Change-Id: Idc4a1e42711c63be0fb6496ed8f15db77d32d99d
2021-05-31 06:12:32 +00:00
Robert Greenwalt
db69f970b7 Revert of Ifd0c4081a. Turning off logging. am: fa4e867061
Original change: undetermined

Change-Id: I460abf0ea9f2e570b0ea70d078828107fbd02590
2021-05-31 06:11:42 +00:00
Robert Greenwalt
3db8cac025 Don't return an unmod collection. am: 26ce4b57d5
Original change: undetermined

Change-Id: I196bc866530fa36229bd0be249eba725f46d192a
2021-05-31 06:11:27 +00:00
Lorenzo Colitti
c2f0534221 Merge "Don't update routes if Dhcp fails." into jb-mr2-dev am: 2d17281ca7
Original change: undetermined

Change-Id: I1a0a1673c297a7b277cb5c129fdb273145a889a6
2021-05-31 06:11:14 +00:00
Lorenzo Colitti
15c203341c Fix build. am: 50e2b43ce1
Original change: undetermined

Change-Id: I47a944128de763423391817aaeff5cedf17cd789
2021-05-31 06:10:51 +00:00
Lorenzo Colitti
74cbe6c1a2 Merge "Add stacked interfaces to LinkProperties." into jb-mr2-dev am: 79c3dfdf0e
Original change: undetermined

Change-Id: I346c8aa0c1aac70ace58ddcfbd54f31470fff7ff
2021-05-31 06:10:14 +00:00
Robert Greenwalt
cb73d7669a Add logging to track down bug am: b9f53aa687
Original change: undetermined

Change-Id: Ib7bd83a2fb5c000a1ed29a6528b9b07f06374f6e
2021-05-31 06:09:24 +00:00
Lorenzo Colitti
c47a20b443 Merge "Unit test routes with interfaces in LinkProperties" into jb-mr2-dev am: 90fbffb1e9
Original change: undetermined

Change-Id: I8a67e3e858800565c6740d9199a29f9c16506d02
2021-05-31 06:09:08 +00:00
Lorenzo Colitti
6ba0b9d46f Unbreak documentation build. am: ab7ad3a458
Original change: undetermined

Change-Id: If9841b6dcff51e43cbd8b1806bf2e81e3c66e103
2021-05-31 05:56:52 +00:00
Lorenzo Colitti
fd9943aec1 Always specify an interface for host routes. am: 697e1c0748
Original change: undetermined

Change-Id: I4d0321d92ebdd6b66dafb107a738c7d9ab437a8a
2021-05-31 05:56:38 +00:00
Lorenzo Colitti
203d3ed063 RouteInfo changes. am: 0580598772
Original change: undetermined

Change-Id: I10b09541bc50ee3b62c19e8b320357cad1bac69f
2021-05-31 05:56:24 +00:00
Robert Greenwalt
24d78c86d4 Revert "Add default route constants to RouteInfo." am: ddf54416c5
Original change: undetermined

Change-Id: I2bb9e893133c5fc85311504826b8fe18982feecf
2021-05-31 05:56:11 +00:00
Lorenzo Colitti
0b5ea32574 Add default route constants to RouteInfo. am: b00860f1ad
Original change: undetermined

Change-Id: I2f5cc5d4935074e6c059af84625f6f5e50a0a04f
2021-05-31 05:55:57 +00:00
Robert Greenwalt
25f626beec Improve ConnectivityManager docs am: 26744a5f52
Original change: undetermined

Change-Id: Ibcbbebdc879b0f9893e481039113f05b335fd579
2021-05-31 05:55:16 +00:00
Jeff Sharkey
770ab27e71 Improve notification UI for lockdown VPN. am: 6932ff654e
Original change: undetermined

Change-Id: I44ddd248ed8e2d33aac922bdea299d478a207e7d
2021-05-31 05:55:01 +00:00
Russell Brenner
8b3c3089cb Adjust captive portal test for setup wizard am: 4774b0208e
Original change: undetermined

Change-Id: I598773844ac151fb1783be07abc1c7c1df8eaf30
2021-05-31 05:54:08 +00:00
Robert Greenwalt
3957f8f7db Merge "Up our DNS server support from 2 > 4" am: f345cde69e
Original change: undetermined

Change-Id: I7384411327f7631c50c07a72fb0fdf271aea641e
2021-05-31 05:51:55 +00:00
Jeff Sharkey
a18f262a5d Expose roaming flag for testing. am: e35bff840d
Original change: undetermined

Change-Id: I3acdd09db2e766de9854c7ff604a112ba488c91c
2021-05-31 05:51:33 +00:00
Robert Greenwalt
ce3aa40e80 Fix javadoc break am: 1ee3d2c33e
Original change: undetermined

Change-Id: I9fdfd42e9cc0154a1f69a08908c749292f317144
2021-05-31 05:51:07 +00:00