Merge "Mark networks with OEM_PAID always restricted" am: dbc568ceaf
...
am: e019e0e240
Lorenzo Colitti
authored and
android-build-merger
commited 2018-03-30 09:05:09 +00:00
3754e152e7
Merge "Limit the number of routes for performance" am: 7f5163f453
...
am: 554f03dc04
Chalard Jean
authored and
android-build-merger
commited 2018-03-30 08:58:44 +00:00
e2a49b5b4e
Merge "Clarify documentation for getActiveNetworkInfo and friends" am: b1016fbf14
...
am: bc4e495705
Chalard Jean
authored and
android-build-merger
commited 2018-03-30 08:51:38 +00:00
24b861fa74
Merge "Mark networks with OEM_PAID always restricted"
...
am: dbc568ceaf
Lorenzo Colitti
authored and
android-build-merger
commited 2018-03-30 08:47:25 +00:00
e019e0e240
Merge "Limit the number of routes for performance"
...
am: 7f5163f453
Chalard Jean
authored and
android-build-merger
commited 2018-03-30 08:42:42 +00:00
554f03dc04
Merge "Clarify documentation for getActiveNetworkInfo and friends"
...
am: b1016fbf14
Chalard Jean
authored and
android-build-merger
commited 2018-03-30 08:36:58 +00:00
bc4e495705
Merge "Require explicitly supplied truncation length" am: 2db4d5fbda
...
am: d78344d704
Lorenzo Colitti
authored and
android-build-merger
commited 2018-03-30 07:45:04 +00:00
56d68c37ea
Merge "Mark networks with OEM_PAID always restricted"
Lorenzo Colitti
authored and
Gerrit Code Review
commited 2018-03-30 07:00:54 +00:00
dbc568ceaf
Mark networks with OEM_PAID always restricted
...
Bug: 68762530
Exempt-From-Owner-Approval: OWNERS have approved, but gerrit doesn't see it
Test: runtest -x frameworks/base/tests/net/ -c android.net.NetworkCapabilitiesTest
Change-Id: Ieadef7c42634d890281543226203530fb18eb0a3
Pavel Maltsev
authored and
Lorenzo Colitti
commited 2018-03-30 07:00:39 +00:00
8cb5245570
Merge "Require explicitly supplied truncation length"
...
am: 2db4d5fbda
Lorenzo Colitti
authored and
android-build-merger
commited 2018-03-30 06:48:22 +00:00
d78344d704
Merge "Clarify UDP encapsulation socket API" am: db1e624ee1
...
am: bdc59ca370
Lorenzo Colitti
authored and
android-build-merger
commited 2018-03-30 06:48:17 +00:00
57498b9359
Merge "Limit the number of routes for performance"
Chalard Jean
authored and
Gerrit Code Review
commited 2018-03-30 06:40:29 +00:00
7f5163f453
Merge "Clarify documentation for getActiveNetworkInfo and friends"
Chalard Jean
authored and
Gerrit Code Review
commited 2018-03-30 06:37:22 +00:00
b1016fbf14
Merge "Clarify UDP encapsulation socket API"
...
am: db1e624ee1
Lorenzo Colitti
authored and
android-build-merger
commited 2018-03-30 06:35:22 +00:00
bdc59ca370
Merge "Require explicitly supplied truncation length"
Lorenzo Colitti
authored and
Gerrit Code Review
commited 2018-03-30 04:59:22 +00:00
2db4d5fbda
Merge "Clarify UDP encapsulation socket API"
Lorenzo Colitti
authored and
Gerrit Code Review
commited 2018-03-30 04:58:47 +00:00
db1e624ee1
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
Chalard Jean
commited 2018-03-29 18:13:23 +09:00
459c9109ca
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
Chalard Jean
commited 2018-03-29 18:10:56 +09:00
33703ef8a7
Merge "Fix network usage stats on 464xlat tethered." am: 83088dcd8e
...
am: 7ea8c51311
Remi NGUYEN VAN
authored and
android-build-merger
commited 2018-03-29 07:46:34 +00:00
c83f2378e3
Merge "Fix network usage stats on 464xlat tethered."
...
am: 83088dcd8e
Change-Id: I0e13c2a6b9f6b5d0701a073ddc835781d5d2aace
Remi NGUYEN VAN
authored and
android-build-merger
commited 2018-03-29 07:36:21 +00:00
7ea8c51311
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
Benedict Wong
commited 2018-03-28 18:02:54 -07:00
5f38c02385
Merge "Merge "Minor clean-up in NetworkCapabilities" am: 1dd43b192c am: 6ab3c9c246 am: 5d97ad9fe4" into pi-dev
...
am: 601861fd1c
Change-Id: I6605aad319ea268827f47d95fb6aef7c4c07ae93
Pavel Maltsev
authored and
android-build-merger
commited 2018-03-28 05:28:17 +00:00
19d1da7a95
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
Remi NGUYEN VAN
commited 2018-03-28 12:14:14 +09:00
c19a5eb8e4
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
Benedict Wong
commited 2018-03-27 19:46:50 -07:00
a042c3f82b
Merge "Minor clean-up in NetworkCapabilities" am: 539f85a18d am: b1e2bfe4df
...
am: 8a956a5141
Bug: 72828388
Test: frameworks/base/tests/net/ -c android.net.NetworkCapabilitiesTest
Change-Id: I2f45d2c70c7c0142ae3b3ce9e6329c5f25b63380
(cherry picked from commit feb8d1498a822730e29cf346fe3382e3f5293a58)
Pavel Maltsev
commited 2018-03-27 22:45:49 +00:00
51f4d8a11d
Merge "Get application info in the correct user id" into pi-dev
...
am: 28a696afb4
Tony Mak
authored and
android-build-merger
commited 2018-03-26 17:15:29 +00:00
6dd26947ad
Merge "Get application info in the correct user id" into pi-dev
Tony Mak
authored and
Android (Google) Code Review
commited 2018-03-26 17:04:47 +00:00
28a696afb4
Merge "Improve ConnectivityManager.getNetworkWatchlistConfigHash() javadoc" into pi-dev
...
am: 2ce1e6ce2a
Ricky Wai
authored and
android-build-merger
commited 2018-03-26 17:01:45 +00:00
24c776f0c4
Merge "add airplane mode shell commands to connectivity" into pi-dev
...
am: e0c1ee6414
Michael West
authored and
android-build-merger
commited 2018-03-26 16:51:00 +00:00
07e389da47
Merge "Improve ConnectivityManager.getNetworkWatchlistConfigHash() javadoc" into pi-dev
Ricky Wai
authored and
Android (Google) Code Review
commited 2018-03-26 16:46:20 +00:00
2ce1e6ce2a
Merge "add airplane mode shell commands to connectivity" into pi-dev
Michael West
authored and
Android (Google) Code Review
commited 2018-03-26 16:38:03 +00:00
e0c1ee6414
Get application info in the correct user id
...
Fixes: 76396560
Test: Create work profile and launch hangouts in work profile.
Change-Id: Ic3727ac899153b6a96dd9b6d6921c32ba0bbd93e
Tony Mak
commited 2018-03-26 11:58:38 +00:00
2f6bcd9c06
[automerger skipped]Merge "Pass all relevant resolver info to netd" into pi-dev
...
am: ca697c621e -s ours
Change-Id: I5d2271059f77d290c65cd4a55d31334154e82270
Erik Kline
authored and
android-build-merger
commited 2018-03-24 16:12:38 +00:00
eac4afb474
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)
Erik Kline
commited 2018-03-23 21:59:24 -07:00
c54b9cb71a
add airplane mode shell commands to connectivity
...
Fixes: 74410990
Test: Manually checked that commands enable/disable airplane mode.
Change-Id: I942bd4679fcd498a39b9b2cab68e8d3c00ce62d3
mswest46
authored and
Michael West
commited 2018-03-24 01:53:45 +00:00
32928412a2
Merge "Pass all relevant resolver info to netd" am: ce907ddfc4
...
am: 189415933f
Erik Kline
authored and
android-build-merger
commited 2018-03-24 01:16:37 +00:00
905e6feea0
Merge "Pass all relevant resolver info to netd"
...
am: ce907ddfc4
Erik Kline
authored and
android-build-merger
commited 2018-03-24 01:07:10 +00:00
189415933f
Merge "Pass all relevant resolver info to netd"
Treehugger Robot
authored and
Gerrit Code Review
commited 2018-03-23 23:41:11 +00:00
ce907ddfc4
Merge "Have the status bar listen to all macro-users VPN changes." into pi-dev
...
am: 749299b1c5
Chalard Jean
authored and
android-build-merger
commited 2018-03-23 09:35:34 +00:00
52321d6b28
Merge "Have the status bar listen to all macro-users VPN changes." am: 90988528c3
...
am: cdb95af156
Chalard Jean
authored and
android-build-merger
commited 2018-03-23 09:29:28 +00:00
cc097d159f
Merge "Have the status bar listen to all macro-users VPN changes." into pi-dev
TreeHugger Robot
authored and
Android (Google) Code Review
commited 2018-03-23 09:26:46 +00:00
749299b1c5
Merge "Have the status bar listen to all macro-users VPN changes."
...
am: 90988528c3
Chalard Jean
authored and
android-build-merger
commited 2018-03-23 09:22:36 +00:00
cdb95af156
Merge "Have PermissionMonitor arbiter which app can access background networks" am: 433c0e652f
...
am: 3f05f98daa
Chalard Jean
authored and
android-build-merger
commited 2018-03-23 08:22:47 +00:00
36c387a51b
Merge "Have PermissionMonitor arbiter which app can access background networks"
...
am: 433c0e652f
Chalard Jean
authored and
android-build-merger
commited 2018-03-23 08:12:51 +00:00
3f05f98daa
Merge "Have the status bar listen to all macro-users VPN changes."
Chalard Jean
authored and
Gerrit Code Review
commited 2018-03-23 07:33:02 +00:00
90988528c3
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
Erik Kline
commited 2018-03-22 23:50:13 -07:00
286974f384
Merge "Have PermissionMonitor arbiter which app can access background networks" into pi-dev
...
am: 1f654aa247
Change-Id: I8d725b07e59654232ee41b82aac007dc6a495a01
Chalard Jean
authored and
android-build-merger
commited 2018-03-23 06:48:49 +00:00
d7a649f8fc
Merge "Have PermissionMonitor arbiter which app can access background networks"
Chalard Jean
authored and
Gerrit Code Review
commited 2018-03-23 06:15:00 +00:00
433c0e652f
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
Chalard Jean
commited 2018-03-23 13:37:56 +09:00
38354d1f60
Merge "Add method to NetworkStatsService for UID stats." am: db89ca3c12
...
am: f61f5ff462
Remi NGUYEN VAN
authored and
android-build-merger
commited 2018-03-23 04:01:09 +00:00
7370f4270e
Lorenzo Colitti
authored and
android-build-merger
commited 
Chalard Jean
authored and
Gerrit Code Review
commited 
Pavel Maltsev
authored and
Remi NGUYEN VAN
authored and
Benedict Wong
commited 
Tony Mak
authored and
Android (Google) Code Review
commited 
Ricky Wai
authored and
Michael West
authored and
Erik Kline
authored and
Treehugger Robot
authored and