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 |
|
The Android Open Source Project
|
4baad9b65f
|
[automerger skipped] Reconcile with jb-mr2-release - do not merge am: a4712d353f -s ours
am skip reason: subject contains skip directive
Original change: undetermined
Change-Id: I21a6877a17a0dca179e8addc324e7f75396693ba
|
2021-05-31 06:12:55 +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 |
|
The Android Automerger
|
f2e200fb46
|
merge in jb-mr2-release history after reset to jb-mr2-dev am: 095035b66a
Original change: undetermined
Change-Id: I8ab1d268ecfd3271cde599b49630b4ae4d566cc0
|
2021-05-31 06:12:19 +00:00 |
|
Lorenzo Colitti
|
3c10be9588
|
Merge "Framework changes for 464xlat." into jb-mr2-dev am: 82217ba580
Original change: undetermined
Change-Id: Ia9f0ace07f42fa25b11be01270514ef340b59a07
|
2021-05-31 06:12:04 +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
|
cb6a7aad80
|
Merge "Set routes from stacked links as well." into jb-mr2-dev am: 8c9e75757f
Original change: undetermined
Change-Id: I40020d79a725fed6ff8afe885411443c3066dab0
|
2021-05-31 06:10:37 +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 |
|
Wink Saville
|
dae77c7893
|
Revert "Fail fast if somebody is adding default routes" am: 4235ce5640
Original change: undetermined
Change-Id: I0f89f2624033299de09550d622ce10e819190573
|
2021-05-31 06:09:52 +00:00 |
|
Robert Greenwalt
|
611616cafc
|
Fail fast if somebody is adding default routes am: f2f0430d40
Original change: undetermined
Change-Id: I550c1ddf580ae48e5c685538ab2b22bec26e6092
|
2021-05-31 06:09:38 +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
|
8c3de70db5
|
Remove redundant parameter to modifyRoute am: f7020e29fe
Original change: undetermined
Change-Id: Ic8c8057c5c645458ca13bda802004e11b860346c
|
2021-05-31 05:57:05 +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 |
|
Jeff Sharkey
|
95a1c7e782
|
Allow loopback traffic in lockdown mode. am: b103b2578b
Original change: undetermined
Change-Id: Ie210959061e114368c923d5f5c70550e5b5d8525
|
2021-05-31 05:55:44 +00:00 |
|
Robert Greenwalt
|
ec625ff8b6
|
Remove two new permission checks am: dc55f48d64
Original change: undetermined
Change-Id: I3c98a3307a5ff432baa0eb7e968005d1d6fa912e
|
2021-05-31 05:55:29 +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 |
|
The Android Automerger
|
b60d0d4570
|
merge in jb-mr2-release history after reset to master am: be253713d5
Original change: undetermined
Change-Id: Ic416c564c23fb93f6d8420dbb5919fe4ba4a0912
|
2021-05-31 05:54:49 +00:00 |
|
Jeff Sharkey
|
ee0b0534de
|
Migrate to using Mockito directly. am: c8a2687705
Original change: undetermined
Change-Id: I2030051b2d6c688919562517282901614fd7974d
|
2021-05-31 05:54:35 +00:00 |
|
Kenny Root
|
eaac89b594
|
am dc7b3e3b: am 79a80652: Merge "KeyStore: stop using state()" am: 9a51314973
Original change: undetermined
Change-Id: Ic2a2223d718af743047dd602bcaca2b0ffb0ea2c
|
2021-05-31 05:54:22 +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
|
52aa3b4d5b
|
Fix a permissions probem in ConnectivityManager am: 1790009c36
Original change: undetermined
Change-Id: Idc3757bf3a4f46d2390df2bbf3488ac433952c90
|
2021-05-31 05:53:54 +00:00 |
|
Robert Greenwalt
|
8ffe306bbb
|
Reintroduce the net.dns system properties <TEMP> am: d44340d0ec
Original change: undetermined
Change-Id: I4225929e37a2c0d2b793d4e77904c802263be380
|
2021-05-31 05:53:40 +00:00 |
|
Robert Greenwalt
|
abee77559e
|
Merge "Second pass tying into dns cache per interface" am: 75c17e5f38
Original change: undetermined
Change-Id: I71f20a1aaab51c39ffa50c235fd071f01dff3dab
|
2021-05-31 05:53:26 +00:00 |
|
Wink Saville
|
09ab3ff930
|
Merge "Revert "Clean up published network condition reporting."" am: 75ba50a4fa
Original change: undetermined
Change-Id: I4a3d6f828eaa87a2d924bfa479daf0cc394a080f
|
2021-05-31 05:53:05 +00:00 |
|
Robert Greenwalt
|
60f14a2d63
|
Merge "Revert "Second pass tying into dns cache per interface"" am: 3ed6099b4b
Original change: undetermined
Change-Id: If851e7d7b3812a8d994520c41f771c03236a6b10
|
2021-05-31 05:52:42 +00:00 |
|
Wink Saville
|
4193986380
|
Clean up published network condition reporting. am: 463928fabe
Original change: undetermined
Change-Id: I5d947fdd962c918aaab9c8fc0f750adfb6fd5c13
|
2021-05-31 05:52:21 +00:00 |
|
Mattias Falk
|
ab4a7fbe31
|
Second pass tying into dns cache per interface am: ea8d68962c
Original change: undetermined
Change-Id: If87709abf03eac5a0b9d9ce189e200182a2b70b7
|
2021-05-31 05:52:09 +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 |
|
Jean-Baptiste Queru
|
5304df56c3
|
am 3f051210: Merge from AOSP staging branch am: 7542010f7b
Original change: undetermined
Change-Id: I6171a6ae1d090b41091dd0c8938bca266dc2b732
|
2021-05-31 05:51:20 +00:00 |
|
Robert Greenwalt
|
ce3aa40e80
|
Fix javadoc break am: 1ee3d2c33e
Original change: undetermined
Change-Id: I9fdfd42e9cc0154a1f69a08908c749292f317144
|
2021-05-31 05:51:07 +00:00 |
|
Jianzheng Zhou
|
c98a894ebf
|
Refactor getPersistedNetworkPreference am: a8aa160836
Original change: undetermined
Change-Id: Ifc544d6b8f094995520b4693fded8a96cde1b1c3
|
2021-05-31 05:50:54 +00:00 |
|
Robert Greenwalt
|
e9b9567f1b
|
Merge "Support for dns domain." am: ff31bee14a
Original change: undetermined
Change-Id: I15fc7fdc8b73adae2e64df434099d2b4dea0653d
|
2021-05-31 05:50:40 +00:00 |
|
Jeff Sharkey
|
256492ea98
|
am 298d5f42: am b84f21c5: am bc0edecb: Merge "Increase readability of connectivity event log." into jb-mr1.1-dev am: 7a4d27dfdf
Original change: undetermined
Change-Id: I9958d499ba882d617fb690b6b42bf02d63ac0d04
|
2021-05-31 05:50:17 +00:00 |
|
Robert Greenwalt
|
b7ea39f7b6
|
Merge "Remove DhcpInfoInternal" am: 2be645a342
Original change: undetermined
Change-Id: I5146d6392f0ab9f64b4b12d90f64ace6b6bee47d
|
2021-05-31 05:50:03 +00:00 |
|
Dianne Hackborn
|
f76bd60065
|
am e0d454d2: am 72325cdb: am 63bc6c12: am a46a74fc: Merge "Remove extraneous logs." into jb-mr1-dev am: 044ac6a1c8
Original change: undetermined
Change-Id: Id15f0681a8c7abc91abc94e90bb5f2b910103419
|
2021-05-31 05:49:39 +00:00 |
|
Jeff Sharkey
|
1f713c5178
|
am 65f4de10: am 3a8af8ef: Merge "Migrate more Secure settings to Global." into jb-mr1-dev am: b1ed51bc0e
Original change: undetermined
Change-Id: I35ddc8afb63c59d551e66128c852c7dedd940f8e
|
2021-05-31 05:49:26 +00:00 |
|
Jeff Sharkey
|
a54d74efe1
|
am f57fcddb: am 68b7a6d1: Merge "First step towards cleaning up Global settings." into jb-mr1-dev am: 621975ad96
Original change: undetermined
Change-Id: I3527c19149c9aab01c37b94810c9574dd789ef3e
|
2021-05-31 05:49:12 +00:00 |
|
Ashish Sharma
|
e0fc860225
|
am b39f3f46: am 1c1c06fa: Merge "Migrate DATA_ACTIVITY_TIMEOUT_MOBILE/WIFI from Settings.Secure to Settings.Global" into jb-mr1-dev am: 3136c613e1
Original change: undetermined
Change-Id: Ia5798b0e82762dc0f0118ddce22a8ff84bf1de04
|
2021-05-31 05:49:00 +00:00 |
|
Jeff Brown
|
c57bbf66ed
|
am 876f95ed: am b32e2216: Merge changes I332f020f,I632648ac into jb-mr1-dev am: 42af268864
Original change: undetermined
Change-Id: I90909b0706f5c961b7c1da0ba240a75348c62eaa
|
2021-05-31 05:48:46 +00:00 |
|