Xin Li
3873163068
[automerger skipped] DO NOT MERGE - Merge pie-platform-release (PPRL.181205.001) into master am: 0911727a11 -s ours am: c20f2baabc -s ours
...
am: 0f1d3dbb96
2018-12-13 13:54:36 -08:00
Xin Li
0f1d3dbb96
[automerger skipped] DO NOT MERGE - Merge pie-platform-release (PPRL.181205.001) into master am: 0911727a11 -s ours
...
am: c20f2baabc
2018-12-13 12:16:11 -08:00
Xin Li
c20f2baabc
[automerger skipped] DO NOT MERGE - Merge pie-platform-release (PPRL.181205.001) into master
...
am: 0911727a11
2018-12-13 11:18:53 -08:00
markchien
f45bf9dff4
[automerger skipped] Merge "DO NOT MERGE fix some linkproperties configs missing" into pi-dev am: 688dc83a8e -s ours
...
am: f1e036a1a2
2018-12-13 10:40:59 -08:00
markchien
f1e036a1a2
[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
Etan Cohen
67f7fa7dfa
Merge "[CM] Fix comments, add tests to TransportInfo API" am: 4060bc1480 am: be97184c39
...
am: e907da9b5a
2018-12-11 22:22:36 -08:00
Etan Cohen
e907da9b5a
Merge "[CM] Fix comments, add tests to TransportInfo API" am: 4060bc1480
...
am: be97184c39
2018-12-11 22:09:54 -08:00
Etan Cohen
be97184c39
Merge "[CM] Fix comments, add tests to TransportInfo API"
...
am: 4060bc1480
Change-Id: Idd668efdd1fe65754228041f23f3a91148aa38d6
2018-12-11 21:54:25 -08:00
Xin Li
66429d50b0
[automerger skipped] Merge "DO NOT MERGE - Merge pie-platform-release (PPRL.181205.001) into stage-aosp-master" into stage-aosp-master am: 1a302ebcc8 -s ours
...
am: 869cac887b
2018-12-11 16:08:24 -08:00
Xin Li
869cac887b
[automerger skipped] Merge "DO NOT MERGE - Merge pie-platform-release (PPRL.181205.001) into stage-aosp-master" into stage-aosp-master
...
am: 1a302ebcc8
2018-12-11 15:41:29 -08:00
Xin Li
ab8f794fa5
[automerger skipped] DO NOT MERGE - Merge pie-platform-release (PPRL.181205.001) into stage-aosp-master am: 9416b2b2ae -s ours
...
am: 4b049293c4
2018-12-11 15:34:50 -08:00
Xin Li
4b049293c4
[automerger skipped] DO NOT MERGE - Merge pie-platform-release (PPRL.181205.001) into stage-aosp-master
...
am: 9416b2b2ae
2018-12-11 15:04:45 -08:00
Etan Cohen
55191eb12e
[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
0911727a11
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
1a302ebcc8
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
e0701d9804
Merge "VPN: Move package intent receiver to ConnectivityService." am: aff267369c am: 3b3ed972b7
...
am: 28f897ee7b
2018-12-11 04:19:44 -08:00
Junyu Lai
28f897ee7b
Merge "VPN: Move package intent receiver to ConnectivityService." am: aff267369c
...
am: 3b3ed972b7
2018-12-11 03:48:03 -08:00
Junyu Lai
3b3ed972b7
Merge "VPN: Move package intent receiver to ConnectivityService."
...
am: aff267369c
Change-Id: I3220f34afe7e56bcbde87a8de2b00ecddecbc97a
2018-12-11 03:36:18 -08:00
markchien
4efb9334e5
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
47311631d8
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
9416b2b2ae
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
a9d95122a6
Merge "Refactoring of deleting stats in NetworkStats based on uids." am: 62724276e6 am: ed44d94dc1
...
am: 93f143fd89
2018-12-10 03:10:15 -08:00
Etan Cohen
8c6670ab58
Merge "[CS] Add a generic transport-specific information API" am: 9d38e58d60 am: e95b6a7ebc
...
am: b70ca9b938
2018-12-10 02:39:46 -08:00
Junyu Lai
93f143fd89
Merge "Refactoring of deleting stats in NetworkStats based on uids." am: 62724276e6
...
am: ed44d94dc1
2018-12-09 21:46:07 -08:00
Junyu Lai
ed44d94dc1
Merge "Refactoring of deleting stats in NetworkStats based on uids."
...
am: 62724276e6
2018-12-09 21:38:59 -08:00
Junyu Lai
62724276e6
Merge "Refactoring of deleting stats in NetworkStats based on uids."
2018-12-10 05:15:28 +00:00
Etan Cohen
b70ca9b938
Merge "[CS] Add a generic transport-specific information API" am: 9d38e58d60
...
am: e95b6a7ebc
2018-12-08 20:19:32 -08:00
Etan Cohen
e95b6a7ebc
Merge "[CS] Add a generic transport-specific information API"
...
am: 9d38e58d60
2018-12-08 20:09:11 -08:00
Etan Cohen
9d38e58d60
Merge "[CS] Add a generic transport-specific information API"
2018-12-09 03:53:44 +00:00
Etan Cohen
d397de2e39
[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
f76c615f8f
Merge "Call netd to update the tcp buffer size" am: 275ccbcc06 am: 2d64d2096d
...
am: f7e888fae8
2018-12-06 11:53:39 -08:00
Chenbo Feng
f7e888fae8
Merge "Call netd to update the tcp buffer size" am: 275ccbcc06
...
am: 2d64d2096d
2018-12-06 11:37:33 -08:00
Chenbo Feng
2d64d2096d
Merge "Call netd to update the tcp buffer size"
...
am: 275ccbcc06
2018-12-06 11:16:18 -08:00
Treehugger Robot
275ccbcc06
Merge "Call netd to update the tcp buffer size"
2018-12-06 19:01:24 +00:00
junyulai
85c0fd7969
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
fe21a7a1cd
Merge "Use ParcelFileDescriptor instead of FileDescriptor in INetd.aidl" am: c141de0b7e am: c8c22abba1
...
am: 55caa3ba30
2018-12-04 22:44:36 -08:00
Luke Huang
55caa3ba30
Merge "Use ParcelFileDescriptor instead of FileDescriptor in INetd.aidl" am: c141de0b7e
...
am: c8c22abba1
2018-12-04 22:35:32 -08:00
Luke Huang
c8c22abba1
Merge "Use ParcelFileDescriptor instead of FileDescriptor in INetd.aidl"
...
am: c141de0b7e
2018-12-04 22:21:26 -08:00
Luke Huang
c141de0b7e
Merge "Use ParcelFileDescriptor instead of FileDescriptor in INetd.aidl"
2018-12-05 05:55:49 +00:00
Lucas Lin
5165889699
Merge "Simpify logic in updateTcpBufferSizes" am: 08d5bca515 am: b33add21de
...
am: 24f572b083
2018-11-29 01:25:06 -08:00
Lucas Lin
24f572b083
Merge "Simpify logic in updateTcpBufferSizes" am: 08d5bca515
...
am: b33add21de
2018-11-29 01:11:05 -08:00
Lucas Lin
b33add21de
Merge "Simpify logic in updateTcpBufferSizes"
...
am: 08d5bca515
Change-Id: Ia95fd298cdea4b47cc9842b63f11282de58d18f7
2018-11-29 00:55:52 -08:00
Bill Yi
fade057e55
Merge pi-qpr1-release PQ1A.181105.017.A1 to pi-platform-release
...
Change-Id: Id08fdcae21e3ceb54e893a9ed11da6e67c889895
2018-11-28 18:45:59 -08:00
lucaslin
589964bdb5
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
b734a7ea70
Merge "Update LinkProperties to NetworkAgentInfo only when it's changed" am: 023c12cf58 am: 1ffa04c9e2
...
am: 4829c02947
2018-11-28 02:46:24 -08:00
Lucas Lin
4829c02947
Merge "Update LinkProperties to NetworkAgentInfo only when it's changed" am: 023c12cf58
...
am: 1ffa04c9e2
2018-11-28 02:35:52 -08:00
Lucas Lin
1ffa04c9e2
Merge "Update LinkProperties to NetworkAgentInfo only when it's changed"
...
am: 023c12cf58
2018-11-28 02:22:50 -08:00
Lucas Lin
023c12cf58
Merge "Update LinkProperties to NetworkAgentInfo only when it's changed"
2018-11-28 09:57:48 +00:00
lucaslin
34cd39435a
Update LinkProperties to NetworkAgentInfo only when it's changed
...
In previous design, it will always assign newLp to nai in
handleUpdateLinkProperties(). And Private dns configuration
will be missing when the same LinkProperties are updated
because the updated LinkProperties is not assigned back to
NetworkAgentInfo.
Bug: 118518971
Test: 1.Build pass.
2.runtest frameworks-net
Change-Id: I405c8f29497fec438082a2cf30eb5c7b9497e1c4
2018-11-28 06:16:38 +00:00
Luke Huang
10786db8bb
Use ParcelFileDescriptor instead of FileDescriptor in INetd.aidl
...
Stable aidl won't support FileDescriptor but ParcelFileDescriptor.
In order to migrate to stable aidl, replace all FileDescriptor in
INdetd.aidl.
Test: runtest frameworks-net passes
Change-Id: Icdf37aed0e0cce0352070a437066e77c0f2fd85a
2018-11-28 13:41:58 +08:00
