Xin Li
f14887fe2c
[automerger skipped] Merge "DO NOT MERGE - Merge pie-platform-release (PPRL.181205.001) into master" am: 891b57de32 -s ours am: 194bd24f09 -s ours
...
am: 02380802b7
2018-12-13 14:19:37 -08:00
Xin Li
ca19f55a31
[automerger skipped] DO NOT MERGE - Merge pie-platform-release (PPRL.181205.001) into master am: 77a7dfeb84 -s ours am: 067326b823 -s ours
...
am: 96cbec0c58
2018-12-13 13:54:36 -08:00
Xin Li
02380802b7
[automerger skipped] Merge "DO NOT MERGE - Merge pie-platform-release (PPRL.181205.001) into master" am: 891b57de32 -s ours
...
am: 194bd24f09
2018-12-13 13:01:05 -08:00
Xin Li
194bd24f09
[automerger skipped] Merge "DO NOT MERGE - Merge pie-platform-release (PPRL.181205.001) into master"
...
am: 891b57de32
2018-12-13 12:47:28 -08:00
Xin Li
96cbec0c58
[automerger skipped] DO NOT MERGE - Merge pie-platform-release (PPRL.181205.001) into master am: 77a7dfeb84 -s ours
...
am: 067326b823
2018-12-13 12:16:11 -08:00
Xin Li
067326b823
[automerger skipped] DO NOT MERGE - Merge pie-platform-release (PPRL.181205.001) into master
...
am: 77a7dfeb84
2018-12-13 11:18:53 -08:00
markchien
08e007ee9c
[automerger skipped] Merge "DO NOT MERGE fix some linkproperties configs missing" into pi-dev am: 688dc83a8e -s ours
...
am: 2be392783e
2018-12-13 10:40:59 -08:00
markchien
2be392783e
[automerger skipped] Merge "DO NOT MERGE fix some linkproperties configs missing" into pi-dev
...
am: 688dc83a8e -s ours
Change-Id: I6e34e781d1289e06c148fb2537e5608f3f007971
2018-12-12 22:01:55 -08:00
Treehugger Robot
891b57de32
Merge "DO NOT MERGE - Merge pie-platform-release (PPRL.181205.001) into master"
2018-12-13 05:45:20 +00:00
Etan Cohen
1457e13e50
Merge "[CM] Fix comments, add tests to TransportInfo API" am: 4060bc1480 am: 4e20619d98
...
am: b03827647f
2018-12-11 22:22:36 -08:00
Etan Cohen
b03827647f
Merge "[CM] Fix comments, add tests to TransportInfo API" am: 4060bc1480
...
am: 4e20619d98
2018-12-11 22:09:54 -08:00
Etan Cohen
4e20619d98
Merge "[CM] Fix comments, add tests to TransportInfo API"
...
am: 4060bc1480
Change-Id: Idd668efdd1fe65754228041f23f3a91148aa38d6
2018-12-11 21:54:25 -08:00
Xin Li
febb46ef31
[automerger skipped] Merge "DO NOT MERGE - Merge pie-platform-release (PPRL.181205.001) into stage-aosp-master" into stage-aosp-master am: 10cb63960f -s ours
...
am: 93d035b882
2018-12-11 16:08:24 -08:00
Xin Li
93d035b882
[automerger skipped] Merge "DO NOT MERGE - Merge pie-platform-release (PPRL.181205.001) into stage-aosp-master" into stage-aosp-master
...
am: 10cb63960f
2018-12-11 15:41:29 -08:00
Xin Li
320ca70330
[automerger skipped] DO NOT MERGE - Merge pie-platform-release (PPRL.181205.001) into stage-aosp-master am: 3f2a0eb8e2 -s ours
...
am: da05875376
2018-12-11 15:34:50 -08:00
Xin Li
da05875376
[automerger skipped] DO NOT MERGE - Merge pie-platform-release (PPRL.181205.001) into stage-aosp-master
...
am: 3f2a0eb8e2
2018-12-11 15:04:45 -08:00
Etan Cohen
73fb5a86f0
[CM] Fix comments, add tests to TransportInfo API
...
Bug: 117605977
Test: atest NetworkCapabilitiesTest
Change-Id: I734ec56e44cd09d11ae81a856a53a26e1191b9a0
2018-12-11 15:00:10 -08:00
Xin Li
77a7dfeb84
DO NOT MERGE - Merge pie-platform-release (PPRL.181205.001) into master
...
Bug: 120502534
Change-Id: Idc8bfb6d97a869b76cfb87ca1a494201baf9e8bd
2018-12-11 14:13:44 -08:00
TreeHugger Robot
10cb63960f
Merge "DO NOT MERGE - Merge pie-platform-release (PPRL.181205.001) into stage-aosp-master" into stage-aosp-master
2018-12-11 21:49:22 +00:00
Junyu Lai
4e9aec3832
Merge "VPN: Move package intent receiver to ConnectivityService." am: aff267369c am: c28617a31f
...
am: 50d4675894
2018-12-11 04:19:44 -08:00
Junyu Lai
50d4675894
Merge "VPN: Move package intent receiver to ConnectivityService." am: aff267369c
...
am: c28617a31f
2018-12-11 03:48:03 -08:00
Junyu Lai
c28617a31f
Merge "VPN: Move package intent receiver to ConnectivityService."
...
am: aff267369c
Change-Id: I3220f34afe7e56bcbde87a8de2b00ecddecbc97a
2018-12-11 03:36:18 -08:00
markchien
20f6d0a3b9
DO NOT MERGE fix some linkproperties configs missing
...
In handleUpdateLinkProperties(), it will always assign newLp
to nai first. Then, the copied newLp would add some configurations
ex: private dns/clatd. This updated newLp wouldn't be assigned back to
nai when linkproperties is not changed.
Bug: 113637648
Test: - build, flash, booted
- atest FrameworksNetTests
- run CtsNetTestCases
Change-Id: I9e25e46718e076d4afa784ee5e1d3abbe0f11911
2018-12-11 09:31:50 +00:00
junyulai
00dd21dea8
VPN: Move package intent receiver to ConnectivityService.
...
Currently, PermissionMonitor listen to user add/remove and
package add/remove intent respectively, and so does VPN.
Thus, races might occurr between them.
This commit refactor VPN part by using ConnectivityService to
listen to intents and dispatch events to VPN.
Bug: 118811303
Test: 1. atest FrameworksNetTests
2. manually add/remove package
3. cts-tradefed run cts -m CtsHostsideNetworkTests
Change-Id: Id76fd77c5fcfb2b0e21f211f63f007b1ea1aa53f
2018-12-11 14:04:02 +08:00
Xin Li
3f2a0eb8e2
DO NOT MERGE - Merge pie-platform-release (PPRL.181205.001) into stage-aosp-master
...
Bug: 120502534
Change-Id: I7351a1832c4bd2fd86324183ab83e9088d716822
2018-12-10 12:30:19 -08:00
Junyu Lai
20775e7c92
Merge "Refactoring of deleting stats in NetworkStats based on uids." am: 12924cb23b am: f348c8d8a9
...
am: bc661e2a6e
2018-12-10 03:10:15 -08:00
Etan Cohen
fef353db3b
Merge "[CS] Add a generic transport-specific information API" am: 0e18882d5c am: 7081aa381d
...
am: 7e32ea6593
2018-12-10 02:39:46 -08:00
Junyu Lai
bc661e2a6e
Merge "Refactoring of deleting stats in NetworkStats based on uids." am: 12924cb23b
...
am: f348c8d8a9
2018-12-09 21:46:07 -08:00
Junyu Lai
f348c8d8a9
Merge "Refactoring of deleting stats in NetworkStats based on uids."
...
am: 12924cb23b
2018-12-09 21:38:59 -08:00
Junyu Lai
12924cb23b
Merge "Refactoring of deleting stats in NetworkStats based on uids."
2018-12-10 05:15:28 +00:00
Etan Cohen
7e32ea6593
Merge "[CS] Add a generic transport-specific information API" am: 0e18882d5c
...
am: 7081aa381d
2018-12-08 20:19:32 -08:00
Etan Cohen
7081aa381d
Merge "[CS] Add a generic transport-specific information API"
...
am: 0e18882d5c
2018-12-08 20:09:11 -08:00
Etan Cohen
0e18882d5c
Merge "[CS] Add a generic transport-specific information API"
2018-12-09 03:53:44 +00:00
Etan Cohen
ac07cca084
[CS] Add a generic transport-specific information API
...
Add a generic transport-specific information container interface and
access methods. These can be used by a network factory to pass transport
(bearer)-specific network parameters to the app.
Bug: 117605977
Test: atest frameworks/base/tests/net/java/android/net (+new unit tests)
Change-Id: Ib7c83b677e1c02a2212265719813e648b0c9cc1b
2018-12-07 17:37:48 +00:00
Chenbo Feng
0be1392f7f
Merge "Call netd to update the tcp buffer size" am: a3713ac30d am: 80cf8a0c40
...
am: df92513813
2018-12-06 11:53:39 -08:00
Chenbo Feng
df92513813
Merge "Call netd to update the tcp buffer size" am: a3713ac30d
...
am: 80cf8a0c40
2018-12-06 11:37:33 -08:00
Chenbo Feng
80cf8a0c40
Merge "Call netd to update the tcp buffer size"
...
am: a3713ac30d
2018-12-06 11:16:18 -08:00
Treehugger Robot
a3713ac30d
Merge "Call netd to update the tcp buffer size"
2018-12-06 19:01:24 +00:00
junyulai
edb60c461b
Refactoring of deleting stats in NetworkStats based on uids.
...
In follow-up commits, current API would create new NetworkStats
every time when 464xlatAdjustment wants to filtered out some
uids.
This commit refactors it to delete stats in-place to get better
performance.
Bug: 118602783
Test: atest FrameworksNetTests
Change-Id: I858f95d1fa7733111786243b4e261ce8a70a068d
2018-12-06 19:01:17 +09:00
Luke Huang
136e24df90
Merge "Use ParcelFileDescriptor instead of FileDescriptor in INetd.aidl" am: 1038ffef1b am: 74b4d20c28
...
am: 83ab6ba827
2018-12-04 22:44:36 -08:00
Luke Huang
83ab6ba827
Merge "Use ParcelFileDescriptor instead of FileDescriptor in INetd.aidl" am: 1038ffef1b
...
am: 74b4d20c28
2018-12-04 22:35:32 -08:00
Luke Huang
74b4d20c28
Merge "Use ParcelFileDescriptor instead of FileDescriptor in INetd.aidl"
...
am: 1038ffef1b
2018-12-04 22:21:26 -08:00
Luke Huang
1038ffef1b
Merge "Use ParcelFileDescriptor instead of FileDescriptor in INetd.aidl"
2018-12-05 05:55:49 +00:00
Lucas Lin
2861b15093
Merge "Simpify logic in updateTcpBufferSizes" am: 08d5bca515 am: 7aa3fe1ebd
...
am: 3cf08592d6
2018-11-29 01:25:06 -08:00
Lucas Lin
3cf08592d6
Merge "Simpify logic in updateTcpBufferSizes" am: 08d5bca515
...
am: 7aa3fe1ebd
2018-11-29 01:11:05 -08:00
Lucas Lin
7aa3fe1ebd
Merge "Simpify logic in updateTcpBufferSizes"
...
am: 08d5bca515
Change-Id: Ia95fd298cdea4b47cc9842b63f11282de58d18f7
2018-11-29 00:55:52 -08:00
Bill Yi
94335ab16f
Merge pi-qpr1-release PQ1A.181105.017.A1 to pi-platform-release
...
Change-Id: Id08fdcae21e3ceb54e893a9ed11da6e67c889895
2018-11-28 18:45:59 -08:00
lucaslin
821c97863f
Simpify logic in updateTcpBufferSizes
...
updateTcpBufferSizes() only need tcp buffer size as its
parameter. Also unify the logic to check default network
outside the function.
Bug: 120119769
Test: 1. Build pass.
2. runtest frameworks-net
Change-Id: Iee9fec3efe7d5be5b590dd1c1f67ec5de636e613
2018-11-29 01:35:54 +00:00
Lucas Lin
b4c1226881
Merge "Update LinkProperties to NetworkAgentInfo only when it's changed" am: 0683c607b6 am: 8862ea3337
...
am: 41a9572c55
2018-11-28 02:46:24 -08:00
Lucas Lin
41a9572c55
Merge "Update LinkProperties to NetworkAgentInfo only when it's changed" am: 0683c607b6
...
am: 8862ea3337
2018-11-28 02:35:52 -08:00
