Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
367,804 Commits 3 Branches 0 Tags
f24d22c1e00a465c1a5477d17941ea7541fb0cfc
Commit Graph

3447 Commits

Author SHA1 Message Date
Paul Jensen
29d0cad81f Merge "Fix socket leaks in various android.net.Network methods." into pi-dev 
am: 9c1597bff7

Change-Id: I2a2254ce65c2176ae0be1d6276034b1bb0cad987
 2018-03-30 16:22:51 +00:00
Lorenzo Colitti
4baea5ba44 Merge "Add Network.fromNetworkHandle()" into pi-dev 
am: c0b767a937

Change-Id: I22e68ab29982690dee5b2c0c6e1fbd47df0b0326
 2018-03-30 14:55:48 +00:00
TreeHugger Robot
9c1597bff7 Merge "Fix socket leaks in various android.net.Network methods." into pi-dev 2018-03-30 09:47:51 +00:00
Lorenzo Colitti
f04afa2537 Merge "Mark networks with OEM_PAID always restricted" am: 8e338f7dae 
am: b9cce46ba8

Change-Id: I88500f6add4f1a6c8a77eb976a489c11c7dc5b6d
 2018-03-30 09:05:09 +00:00
Chalard Jean
e3ddf3b53d Merge "Clarify documentation for getActiveNetworkInfo and friends" am: 39d6694208 
am: 3621eb75cb

Change-Id: I339bb71182723907ed078e8be739c4d4ea2d1da5
 2018-03-30 08:51:38 +00:00
Lorenzo Colitti
b9cce46ba8 Merge "Mark networks with OEM_PAID always restricted" 
am: 8e338f7dae

Change-Id: I4ffcf01e1f79c8a3570ea2b819688b55904939fe
 2018-03-30 08:47:25 +00:00
Chalard Jean
3621eb75cb Merge "Clarify documentation for getActiveNetworkInfo and friends" 
am: 39d6694208

Change-Id: I167776fb6ec44aff4b35b58378b54e3b55907427
 2018-03-30 08:36:58 +00:00
Lorenzo Colitti
8c39b22dd5 Merge "Disallow Reserved SPI Allocation" am: 7fcde83572 
am: 62e6b774e3

Change-Id: Ic5c7857754a04ae7238414b55a1e5ab653d62f6b
 2018-03-30 08:33:06 +00:00
TreeHugger Robot
1a8d1a51cf Merge "Clarify documentation for getActiveNetworkInfo and friends" into pi-dev 2018-03-30 08:22:29 +00:00
Lorenzo Colitti
968a0172dc Merge "Require explicitly supplied truncation length" am: 0dde066ef7 
am: 2749432646

Change-Id: I347bfd43be54d162dea831770ab08d792ea1443f
 2018-03-30 07:45:04 +00:00
Lorenzo Colitti
62e6b774e3 Merge "Disallow Reserved SPI Allocation" 
am: 7fcde83572

Change-Id: Idd387dfad8d8886fad28005f9001a732a73cae1b
 2018-03-30 07:39:01 +00:00
Lorenzo Colitti
8e338f7dae Merge "Mark networks with OEM_PAID always restricted" 2018-03-30 07:00:54 +00:00
Pavel Maltsev
4af9107d6c 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
 2018-03-30 07:00:39 +00:00
Lorenzo Colitti
2749432646 Merge "Require explicitly supplied truncation length" 
am: 0dde066ef7

Change-Id: I20f7f910f4f0369e38eebd0b7fe6970331763e85
 2018-03-30 06:48:22 +00:00
Lorenzo Colitti
93f325276f Merge "Clarify UDP encapsulation socket API" am: 2891409c93 
am: a12c8fe218

Change-Id: I5fcf79691c670e710e46b3a9eac8a580c44028fb
 2018-03-30 06:48:17 +00:00
Chalard Jean
39d6694208 Merge "Clarify documentation for getActiveNetworkInfo and friends" 2018-03-30 06:37:22 +00:00
Lorenzo Colitti
a12c8fe218 Merge "Clarify UDP encapsulation socket API" 
am: 2891409c93

Change-Id: Ie1e7ea81440afee2618211d989989cf5daff3e1e
 2018-03-30 06:35:22 +00:00
Lorenzo Colitti
7fcde83572 Merge "Disallow Reserved SPI Allocation" 2018-03-30 06:16:17 +00:00
Lorenzo Colitti
0dde066ef7 Merge "Require explicitly supplied truncation length" 2018-03-30 04:59:22 +00:00
Lorenzo Colitti
2891409c93 Merge "Clarify UDP encapsulation socket API" 2018-03-30 04:58:47 +00:00
Chalard Jean
5a041d1a24 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-30 12:22:06 +09:00
Lorenzo Colitti
c0b767a937 Merge "Add Network.fromNetworkHandle()" into pi-dev 2018-03-30 01:36:10 +00:00
Benedict Wong
dab50eecfd Merge "Add documentation for TCP interactions with transforms" into pi-dev 2018-03-30 00:01:43 +00:00
Paul Jensen
89bb993293 Fix socket leaks in various android.net.Network methods. 
Bug: 72124526
Test: make CtsNetTestCases
Change-Id: I3398b67272360f894e01a8cdfbc47b17d77c2330
 2018-03-29 07:43:01 -04:00
Paul Jensen
4af1781776 Add Network.fromNetworkHandle() 
This is the counterpart to Network.getNetworkHandle() and facilitates
native code calling back to Java with network handle values from
getNetworkHandle.

Bug: 77210159
Bug: 64148938
Test: make CtsNetTestCases

Change-Id: I032b959d84180c063a79ddd97c35e7384b0f50a1
 2018-03-29 07:24:59 -04:00
Chalard Jean
e8785fb0e4 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
62df0a68e0 Merge "Fix network usage stats on 464xlat tethered." am: 83088dcd8e 
am: aa20932ff1

Change-Id: I016722f3a0ae2ae0a1d48bfacc4fe07ee3578ef7
 2018-03-29 07:46:34 +00:00
Remi NGUYEN VAN
aa20932ff1 Merge "Fix network usage stats on 464xlat tethered." 
am: 83088dcd8e

Change-Id: I0e13c2a6b9f6b5d0701a073ddc835781d5d2aace
 2018-03-29 07:36:21 +00:00
Benedict Wong
bb7f2820f5 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
Nathan Harold
7f606ee8e5 Disallow Reserved SPI Allocation 
Disallow the allocation of SPIs in the range
reserved for future use by RFC 4303.

Bug: 77205120
Test: runtest frameworks-net
Change-Id: I05e26ed34b5871f1a07d5bd7b58b79a64cd74b67
 2018-03-28 16:08:57 +00:00
Remi NGUYEN VAN
9fb55e4f03 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
4c987ebade 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
Benedict Wong
361aedfe87 Merge "Add documentation for TCP interactions with transforms" am: b454937f06 
am: 28427a9c4d

Change-Id: I3aef3f0f16929b60cd9bb293373d18a3988076a7
 2018-03-28 01:26:33 +00:00
Benedict Wong
28427a9c4d Merge "Add documentation for TCP interactions with transforms" 
am: b454937f06

Change-Id: I2733218b5b3489902f80b694a1dd6b0d4c1198da
 2018-03-28 01:15:22 +00:00
Pavel Maltsev
ce68c5d615 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 feb8d1498a)
 2018-03-27 22:45:49 +00:00
Benedict Wong
420fe002f1 Add documentation for TCP interactions with transforms 
Updates API documentation to mention that TCP sockets where transforms
are deactivated will not send FIN packets.

Bug: 74851550
Test: API updates only
Merged-In: I8169f221c8c747538a8bddfbf02dcc73c9337189
Change-Id: I8169f221c8c747538a8bddfbf02dcc73c9337189
(cherry picked from commit 7d31a2f357)
 2018-03-27 15:20:32 -07:00
Benedict Wong
b454937f06 Merge "Add documentation for TCP interactions with transforms" 2018-03-27 22:19:37 +00:00
Jeff Sharkey
efae42a25d Merge "API council requested tweaks to TrafficStats." into pi-dev 
am: 9a6bc76ee8

Change-Id: I6b969377a6e268c1377fcc17f2443cb73072fda2
 2018-03-27 03:57:46 +00:00
TreeHugger Robot
9a6bc76ee8 Merge "API council requested tweaks to TrafficStats." into pi-dev 2018-03-27 02:56:24 +00:00
Jeff Sharkey
121d565b65 API council requested tweaks to TrafficStats. 
Test: atest android.appsecurity.cts.AppSecurityTests#testAppFailAccessPrivateData
Bug: 71584606
Change-Id: I4be8a47d54a04f17cbaac735d543ff7d6370376d
 2018-03-26 13:12:39 -06:00
Benedict Wong
7d31a2f357 Add documentation for TCP interactions with transforms 
Updates API documentation to mention that TCP sockets where transforms
are deactivated will not send FIN packets.

Bug: 74851550
Test: API updates only
Change-Id: I8169f221c8c747538a8bddfbf02dcc73c9337189
 2018-03-26 11:33:05 -07:00
Ricky Wai
b76efd7adf Merge "Improve ConnectivityManager.getNetworkWatchlistConfigHash() javadoc" into pi-dev 
am: e1c76d71e7

Change-Id: Ic3de4d136a995a8291fb43c780a311e423aeb9b7
 2018-03-26 17:01:45 +00:00
Ricky Wai
e1c76d71e7 Merge "Improve ConnectivityManager.getNetworkWatchlistConfigHash() javadoc" into pi-dev 2018-03-26 16:46:20 +00:00
Kurt Marcinkiewicz
98be440cfc Merge "Allow specifying a network for SNTP time sync" into pi-dev 
am: 991b971acb

Change-Id: I339c77063c72a9d76a5c4cb17052e20fb6e045a6
 2018-03-23 19:40:39 +00:00
Kurt Marcinkiewicz
991b971acb Merge "Allow specifying a network for SNTP time sync" into pi-dev 2018-03-23 18:02:19 +00:00
Chalard Jean
1d884f2797 Merge "Have the status bar listen to all macro-users VPN changes." am: b16a6053fe 
am: eb358dadac

Change-Id: Ib4daa5f4136662721794bd8bcd4f185cb2944824
 2018-03-23 09:29:28 +00:00
TreeHugger Robot
afc61792cb 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
eb358dadac Merge "Have the status bar listen to all macro-users VPN changes." 
am: b16a6053fe

Change-Id: Icc4fe4fbdb75c90abaaee8009f08f1220536686e
 2018-03-23 09:22:36 +00:00
Chalard Jean
d1052c2cfa Merge "Have PermissionMonitor arbiter which app can access background networks" 
am: 06f0fc04e7

Change-Id: Ic05e362af58d667b5be84c3bd421c9250927abe2
 2018-03-23 08:12:51 +00:00
Chalard Jean
b16a6053fe Merge "Have the status bar listen to all macro-users VPN changes." 2018-03-23 07:33:02 +00:00