Chalard Jean
cc039fddf8
Merge "Limit the number of routes for performance" am: 9b4dc28bd3
...
am: 782450b691
Change-Id: I1fcf34b553b4a7cbadd0a2a7bf697140e948243e
2018-03-30 08:58:44 +00:00
Chalard Jean
ef6b974a62
Merge "Clarify documentation for getActiveNetworkInfo and friends" am: a47ebd7f70
...
am: fc45f0749c
Change-Id: I339bb71182723907ed078e8be739c4d4ea2d1da5
2018-03-30 08:51:38 +00:00
Chalard Jean
782450b691
Merge "Limit the number of routes for performance"
...
am: 9b4dc28bd3
Change-Id: If4de2779b24560f75a7bb977dbb0f996115a0648
2018-03-30 08:42:42 +00:00
Chalard Jean
fc45f0749c
Merge "Clarify documentation for getActiveNetworkInfo and friends"
...
am: a47ebd7f70
Change-Id: I167776fb6ec44aff4b35b58378b54e3b55907427
2018-03-30 08:36:58 +00:00
Lorenzo Colitti
63c49de81c
Merge "Require explicitly supplied truncation length" am: 83f01be8d5
...
am: 8c65f40004
Change-Id: I347bfd43be54d162dea831770ab08d792ea1443f
2018-03-30 07:45:04 +00:00
Lorenzo Colitti
8c65f40004
Merge "Require explicitly supplied truncation length"
...
am: 83f01be8d5
Change-Id: I20f7f910f4f0369e38eebd0b7fe6970331763e85
2018-03-30 06:48:22 +00:00
Lorenzo Colitti
4424759827
Merge "Clarify UDP encapsulation socket API" am: b676aef03c
...
am: 9ef3a6cf3f
Change-Id: I5fcf79691c670e710e46b3a9eac8a580c44028fb
2018-03-30 06:48:17 +00:00
Chalard Jean
9b4dc28bd3
Merge "Limit the number of routes for performance"
2018-03-30 06:40:29 +00:00
Chalard Jean
a47ebd7f70
Merge "Clarify documentation for getActiveNetworkInfo and friends"
2018-03-30 06:37:22 +00:00
Lorenzo Colitti
9ef3a6cf3f
Merge "Clarify UDP encapsulation socket API"
...
am: b676aef03c
Change-Id: Ie1e7ea81440afee2618211d989989cf5daff3e1e
2018-03-30 06:35:22 +00:00
Lorenzo Colitti
83f01be8d5
Merge "Require explicitly supplied truncation length"
2018-03-30 04:59:22 +00:00
Lorenzo Colitti
b676aef03c
Merge "Clarify UDP encapsulation socket API"
2018-03-30 04:58:47 +00:00
Chalard Jean
0764935893
Limit the number of routes for performance
...
In evaluating whether "most" of the addressing space is
covered, the list of routes are obtained from a third-party
app, so it's possbile the system service stalls unless
some limit is enforced on how much work it has to do.
This change limits the number of routes to 400, as determined
by time measurement on various devices.
Bug: 74176086
Test: runtest framework-net
Change-Id: Ie4a96098bc044ade87b188839586f14dd101c100
2018-03-29 18:13:23 +09:00
Chalard Jean
ba7a3467fd
Clarify documentation for getActiveNetworkInfo and friends
...
For VPNs it's unobvious what these methods do, so document that.
Bug: 70917007
Test: Comment changes only. Checkdoc passes.
Change-Id: I31ec1aea356d88d969eaf9fc7d8c2ed13ce924eb
2018-03-29 18:10:56 +09:00
Remi NGUYEN VAN
12cfe2edc0
Merge "Fix network usage stats on 464xlat tethered." am: 83088dcd8e
...
am: 10cb43f1de
Change-Id: I016722f3a0ae2ae0a1d48bfacc4fe07ee3578ef7
2018-03-29 07:46:34 +00:00
Remi NGUYEN VAN
10cb43f1de
Merge "Fix network usage stats on 464xlat tethered."
...
am: 83088dcd8e
Change-Id: I0e13c2a6b9f6b5d0701a073ddc835781d5d2aace
2018-03-29 07:36:21 +00:00
Benedict Wong
b0571f55db
Require explicitly supplied truncation length
...
Instead of providing default truncation lengths (based on RFC or
otherwise), this change imposes a restriction that the truncation length
must be supplied for all auth or aead algorithms.
Bug: 77204048
Test: Updated tests, ran on walleye
Change-Id: I4a0e2e71aa97259e56f44e7c8a2ce53135708d97
2018-03-28 18:02:54 -07:00
Pavel Maltsev
093afe8b8e
Merge "Merge "Minor clean-up in NetworkCapabilities" am: 98dc002acc am: 6d8274ebf1 am: fbb48a210f" into pi-dev
...
am: 601861fd1c
Change-Id: I6605aad319ea268827f47d95fb6aef7c4c07ae93
2018-03-28 05:28:17 +00:00
Remi NGUYEN VAN
dbee0f8554
Fix network usage stats on 464xlat tethered.
...
Usage stats corrections for 464xlat in NetworkStatsFactory are not applied
to tethered traffic. Add adjustments in NetworkStatsService. After
migrating external callers off NetworkStatsFactory, we will be able to
only apply adjustments in NetworkStatsService and remove stacked
interface tracking from NetworkStatsFactory.
Bug: 72107146
Fixes: 72107146
Test: runtest frameworks-net & manual - checked corrected network usage
Change-Id: I5ce450e616b4fddf21f2a491fe5d0c9e9f969bda
2018-03-28 12:14:14 +09:00
Benedict Wong
9660f605b6
Clarify UDP encapsulation socket API
...
This change updates the getSocket() methods for IPsec to improve clarity
of the return types, both for public APIs, and internal-only methods.
Bug: 72473753
Test: APIs updated, CTS + unit tests ran.
Change-Id: I0afebd432c5d04c47c93daa1ce616d712aa323d7
2018-03-27 19:46:50 -07:00
Pavel Maltsev
3585034ec9
Merge "Minor clean-up in NetworkCapabilities" am: 98dc002acc am: 6d8274ebf1
...
am: fbb48a210f
Bug: 72828388
Test: frameworks/base/tests/net/ -c android.net.NetworkCapabilitiesTest
Change-Id: I2f45d2c70c7c0142ae3b3ce9e6329c5f25b63380
(cherry picked from commit feb8d1498a822730e29cf346fe3382e3f5293a58)
2018-03-27 22:45:49 +00:00
Tony Mak
e589c20e3c
Merge "Get application info in the correct user id" into pi-dev
...
am: d5bff7f0dd
Change-Id: I763a8fae339cb9ca56b713c695d3e97e3c46c3d5
2018-03-26 17:15:29 +00:00
Tony Mak
d5bff7f0dd
Merge "Get application info in the correct user id" into pi-dev
2018-03-26 17:04:47 +00:00
Ricky Wai
a635ed5a99
Merge "Improve ConnectivityManager.getNetworkWatchlistConfigHash() javadoc" into pi-dev
...
am: 9bf657d1e7
Change-Id: Ic3de4d136a995a8291fb43c780a311e423aeb9b7
2018-03-26 17:01:45 +00:00
Michael West
dd1f48c399
Merge "add airplane mode shell commands to connectivity" into pi-dev
...
am: 83c1f9e33b
Change-Id: I81fd444f1364c394d17759c261798b3a3f85b826
2018-03-26 16:51:00 +00:00
Ricky Wai
9bf657d1e7
Merge "Improve ConnectivityManager.getNetworkWatchlistConfigHash() javadoc" into pi-dev
2018-03-26 16:46:20 +00:00
Michael West
83c1f9e33b
Merge "add airplane mode shell commands to connectivity" into pi-dev
2018-03-26 16:38:03 +00:00
Tony Mak
bbd068ec5f
Get application info in the correct user id
...
Fixes: 76396560
Test: Create work profile and launch hangouts in work profile.
Change-Id: Ic3727ac899153b6a96dd9b6d6921c32ba0bbd93e
2018-03-26 11:58:38 +00:00
Erik Kline
a877b58853
[automerger skipped]Merge "Pass all relevant resolver info to netd" into pi-dev
...
am: ca697c621e -s ours
Change-Id: I5d2271059f77d290c65cd4a55d31334154e82270
2018-03-24 16:12:38 +00:00
Erik Kline
05c62dfd61
Pass all relevant resolver info to netd
...
Test: runtest frameworks-net passes
Test: manual testing of opportunistic and strict mode works
Bug: 34953048
Bug: 64133961
Bug: 72345192
Merged-In: I96f7747b8f0bb38d95579b688b4c2d068f1229cf
Merged-In: Ia4d896c4cc33c02f0c46d5d4c760cc33b13dff0b
Change-Id: Ia4f1905e1fa60e7a468c2246fb809191d2ba796b
(cherry picked from commit e5dac904d361a349f1cfc48500a678d22e3a7316)
2018-03-23 21:59:24 -07:00
mswest46
c6a5bcfce1
add airplane mode shell commands to connectivity
...
Fixes: 74410990
Test: Manually checked that commands enable/disable airplane mode.
Change-Id: I942bd4679fcd498a39b9b2cab68e8d3c00ce62d3
2018-03-24 01:53:45 +00:00
Erik Kline
b7216674a2
Merge "Pass all relevant resolver info to netd" am: 6a4cdf21d2
...
am: e1b0a74661
Change-Id: I96f7747b8f0bb38d95579b688b4c2d068f1229cf
2018-03-24 01:16:37 +00:00
Erik Kline
e1b0a74661
Merge "Pass all relevant resolver info to netd"
...
am: 6a4cdf21d2
Change-Id: If4f46b030fe141a6904a48966e5ab34ffb6b10bc
2018-03-24 01:07:10 +00:00
Treehugger Robot
6a4cdf21d2
Merge "Pass all relevant resolver info to netd"
2018-03-23 23:41:11 +00:00
Chalard Jean
2d667376f0
Merge "Have the status bar listen to all macro-users VPN changes." into pi-dev
...
am: 55f0dd815d
Change-Id: I4e9887a438abfa1a5c9456c73c019c96193e9111
2018-03-23 09:35:34 +00:00
Chalard Jean
e9d037c6ef
Merge "Have the status bar listen to all macro-users VPN changes." am: b84083ae3b
...
am: cad715f0d8
Change-Id: Ib4daa5f4136662721794bd8bcd4f185cb2944824
2018-03-23 09:29:28 +00:00
TreeHugger Robot
55f0dd815d
Merge "Have the status bar listen to all macro-users VPN changes." into pi-dev
2018-03-23 09:26:46 +00:00
Chalard Jean
cad715f0d8
Merge "Have the status bar listen to all macro-users VPN changes."
...
am: b84083ae3b
Change-Id: Icc4fe4fbdb75c90abaaee8009f08f1220536686e
2018-03-23 09:22:36 +00:00
Chalard Jean
34f4cfc1d5
Merge "Have PermissionMonitor arbiter which app can access background networks" am: c907d94361
...
am: 3234396b78
Change-Id: I803bdbfd9344d3d2a8bd312f98a1f63636e47cd9
2018-03-23 08:22:47 +00:00
Chalard Jean
3234396b78
Merge "Have PermissionMonitor arbiter which app can access background networks"
...
am: c907d94361
Change-Id: Ic05e362af58d667b5be84c3bd421c9250927abe2
2018-03-23 08:12:51 +00:00
Chalard Jean
b84083ae3b
Merge "Have the status bar listen to all macro-users VPN changes."
2018-03-23 07:33:02 +00:00
Erik Kline
79371011d7
Pass all relevant resolver info to netd
...
Test: runtest frameworks-net passes
Test: manual testing of opportunistic and strict mode works
Bug: 34953048
Bug: 64133961
Bug: 72345192
Change-Id: Ia4f1905e1fa60e7a468c2246fb809191d2ba796b
2018-03-22 23:50:13 -07:00
Chalard Jean
48bb6ede68
Merge "Have PermissionMonitor arbiter which app can access background networks" into pi-dev
...
am: 1f654aa247
Change-Id: I8d725b07e59654232ee41b82aac007dc6a495a01
2018-03-23 06:48:49 +00:00
Chalard Jean
c907d94361
Merge "Have PermissionMonitor arbiter which app can access background networks"
2018-03-23 06:15:00 +00:00
Chalard Jean
a43eede395
Have PermissionMonitor arbiter which app can access background networks
...
This will let ConnectivityService send the right callbacks to the
relevant apps.
Test: manual with apps
runtest frameworks-net
cts
new tests for this functionality
Bug: 67408339
Change-Id: I6f08efd9e73c7e191f833d7f307a3bf4c9e2f0b4
2018-03-23 13:37:56 +09:00
Remi NGUYEN VAN
e49cf94e4e
Merge "Add method to NetworkStatsService for UID stats." am: db89ca3c12
...
am: ff5f0b7f6c
Change-Id: I2527d95000c7500c824ede70f87ecb38e21ed323
2018-03-23 04:01:09 +00:00
Remi NGUYEN VAN
ff5f0b7f6c
Merge "Add method to NetworkStatsService for UID stats."
...
am: db89ca3c12
Change-Id: I2c6cba3ebbc8c23ade754cfd411ac54a561b020a
2018-03-23 03:54:13 +00:00
Ricky Wai
573dcabcff
Improve ConnectivityManager.getNetworkWatchlistConfigHash() javadoc
...
Test: NULL
Bug: 74831039
Change-Id: I227ba1377a51821204cd5830e7da6ff3a15bca02
2018-03-22 20:13:05 +00:00
Chalard Jean
f8d5bd9441
Have PermissionMonitor arbiter which app can access background networks
...
This will let ConnectivityService send the right callbacks to the
relevant apps.
Test: manual with apps
runtest frameworks-net
cts
new tests for this functionality
Bug: 67408339
Change-Id: I6f08efd9e73c7e191f833d7f307a3bf4c9e2f0b4
2018-03-22 19:03:59 +09:00
Remi NGUYEN VAN
6f124c455f
Add method to NetworkStatsService for UID stats.
...
Useful for clients such as BatteryStats which currently rely
on NetworkStatsFactory. Data at that stage is incomplete as
it does not account for tethering, VT data and corresponding
464xlat corrections.
Test: runtest frameworks-net, CTS tests pass.
Change-Id: I763b77f601c827fd2963204694fb5b45425cc791
2018-03-22 15:31:28 +09:00