Lorenzo Colitti
afff39ff53
[automerger skipped] Merge "Migrate away from AsyncChannel in NetworkAgent" am: abf3317103 am: 9156ffa5a5 am: bd646b30c1 -s ours
...
am skip reason: Change-Id Ie364ab50f416e7821e70f4539a881eea828e1256 with SHA-1 37ebfa827a is in history
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1483962
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ie47420e86dfe4aec19162545116023c9da75aa14
2021-01-06 15:22:38 +00:00
Lorenzo Colitti
bd646b30c1
Merge "Migrate away from AsyncChannel in NetworkAgent" am: abf3317103 am: 9156ffa5a5
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1483962
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I7aa23752ed86096651e122b8497180052fa16337
2021-01-06 14:44:24 +00:00
Lorenzo Colitti
9156ffa5a5
Merge "Migrate away from AsyncChannel in NetworkAgent" am: abf3317103
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1483962
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I29a9073fcd69953811d899d3b421624d21a81edb
2021-01-06 14:26:23 +00:00
Lorenzo Colitti
abf3317103
Merge "Migrate away from AsyncChannel in NetworkAgent"
2021-01-06 14:10:21 +00:00
Paul Hu
cd73ec04a4
Merge "Use system API to obtain IDnsResolver IBinder" am: 1caeb0322a am: 89de26e233 am: 4c0cc156c5
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1475820
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I9effd15dcb8a6d51ee3920427a80b776da9bf885
2020-12-30 08:03:47 +00:00
Paul Hu
4c0cc156c5
Merge "Use system API to obtain IDnsResolver IBinder" am: 1caeb0322a am: 89de26e233
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1475820
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ia1352dd2276585cbacb48dbe952c4f90b0e4a2e5
2020-12-30 07:32:47 +00:00
Paul Hu
89de26e233
Merge "Use system API to obtain IDnsResolver IBinder" am: 1caeb0322a
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1475820
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I03c6112d13adfc26ba236133be70b1116778cd6e
2020-12-30 06:50:00 +00:00
Paul Hu
1caeb0322a
Merge "Use system API to obtain IDnsResolver IBinder"
2020-12-30 06:35:05 +00:00
Junyu Lai
0310fc1f60
Merge "Add test for increment operation count on non-default network" am: 20f05ed023 am: 7933522fbf am: 730e15b8d6
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1517499
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I53607908e07f8c7c94e1c2ac8632ebb645ea469a
2020-12-28 10:01:46 +00:00
Junyu Lai
730e15b8d6
Merge "Add test for increment operation count on non-default network" am: 20f05ed023 am: 7933522fbf
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1517499
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: If52e015750ffe1efc4b584b6ef47db240cd8d187
2020-12-28 09:47:56 +00:00
Junyu Lai
7933522fbf
Merge "Add test for increment operation count on non-default network" am: 20f05ed023
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1517499
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ib5418322817339172b8b41aab131a590583d4dfc
2020-12-28 09:02:31 +00:00
Junyu Lai
20f05ed023
Merge "Add test for increment operation count on non-default network"
2020-12-28 08:16:44 +00:00
Chiachang Wang
629e586bff
Merge "[IT4.2] Update argument type of interfaceClassDataActivityChanged" am: 6b674eea72 am: 3fa134a3f8 am: 1db2093644
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1531806
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I992dd2f78c0f7334bbe97a03faba161d09a03a71
2020-12-28 02:32:19 +00:00
Chiachang Wang
1db2093644
Merge "[IT4.2] Update argument type of interfaceClassDataActivityChanged" am: 6b674eea72 am: 3fa134a3f8
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1531806
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I2e255f46fc8b3d9fb3f4e1af4bd66b4a0e38369e
2020-12-28 02:02:08 +00:00
Chiachang Wang
3fa134a3f8
Merge "[IT4.2] Update argument type of interfaceClassDataActivityChanged" am: 6b674eea72
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1531806
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I579829d0a152de56ce23ec15aa8a8f26538a9de7
2020-12-28 01:47:44 +00:00
Chiachang Wang
6b674eea72
Merge "[IT4.2] Update argument type of interfaceClassDataActivityChanged"
2020-12-28 01:05:28 +00:00
Serik Beketayev
20754ee85c
Merge "[Mainline] Migrate ProxyInfo" am: ea935361d5 am: 872ac951cc am: a12940d1ca
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1506616
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ia6f5bf74bf461f762472ea1d88553db3b9719c80
2020-12-25 09:58:40 +00:00
Serik Beketayev
a12940d1ca
Merge "[Mainline] Migrate ProxyInfo" am: ea935361d5 am: 872ac951cc
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1506616
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ica0e0965296e3bf843fa73fc6d687da6a9ae721d
2020-12-25 09:45:54 +00:00
Serik Beketayev
872ac951cc
Merge "[Mainline] Migrate ProxyInfo" am: ea935361d5
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1506616
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ic839f183b48279532dcfb484818457a5372087b2
2020-12-25 09:21:03 +00:00
Serik Beketayev
ea935361d5
Merge "[Mainline] Migrate ProxyInfo"
2020-12-25 08:32:04 +00:00
Remi NGUYEN VAN
96be83bccb
Migrate away from AsyncChannel in NetworkAgent
...
Use two oneway binder interfaces instead.
The interfaces post messages to handlers as was implemented before, but
provide a more strictly defined interface, with less hops between
NetworkAgent, AsyncChannel, and ConnectivityService.
The actual public interface is the NetworkAgent @SystemApi: the binder
interface is an internal implementation detail.
Test: atest FrameworksNetTests CtsNetTestCasesLatestSdk
Bug: 173574274
Merged-In: Ie364ab50f416e7821e70f4539a881eea828e1256
Change-Id: Ie364ab50f416e7821e70f4539a881eea828e1256
2020-12-25 03:54:19 +00:00
Remi NGUYEN VAN
4f9da57398
Merge "Migrate away from AsyncChannel in NetworkAgent"
2020-12-25 01:57:44 +00:00
Sudheer Shanka
49305f5625
Merge "Update usage of allowlist/denylist in some method names/comments." am: e1dc77b743 am: f316b89f93 am: fa2f9f4eee
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1402789
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I40b28e3be169fbc59f8b889871ed938b45de2fab
2020-12-24 09:50:20 +00:00
Sudheer Shanka
fa2f9f4eee
Merge "Update usage of allowlist/denylist in some method names/comments." am: e1dc77b743 am: f316b89f93
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1402789
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I97e8af4a71f23438e830b1a44834719b7c488d67
2020-12-24 09:36:33 +00:00
Sudheer Shanka
f316b89f93
Merge "Update usage of allowlist/denylist in some method names/comments." am: e1dc77b743
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1402789
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I0d6e7220d742e38bd153916a95e43d5de0da830e
2020-12-24 08:40:56 +00:00
Sudheer Shanka
e1dc77b743
Merge "Update usage of allowlist/denylist in some method names/comments."
2020-12-24 08:16:51 +00:00
Aaron Huang
45c71859fd
Merge "Have NetworkPolicyManagerService create MultipathPolicyTracker" am: 99f0ad7b3e am: 7334ba2cb9 am: c0fe879c33
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1519960
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I023815a53f01a0459b94033b7e2fa2ed91cca86a
2020-12-24 07:02:53 +00:00
Aaron Huang
c0fe879c33
Merge "Have NetworkPolicyManagerService create MultipathPolicyTracker" am: 99f0ad7b3e am: 7334ba2cb9
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1519960
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I73403fbbf0f7ba0a233e4866273698fb0f43019b
2020-12-24 06:51:17 +00:00
Remi NGUYEN VAN
29a9868442
Merge "Split connectivity JNI and service jar" am: dfa9e2c0a1 am: fbe03a2069 am: 4c1a956203
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1478000
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I914bd578b1c64d43c59541d92ff88e6c5d423ed7
2020-12-24 06:43:47 +00:00
Aaron Huang
7334ba2cb9
Merge "Have NetworkPolicyManagerService create MultipathPolicyTracker" am: 99f0ad7b3e
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1519960
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Idc48a3618c12f332a5e067973519ab7777058fdf
2020-12-24 06:34:32 +00:00
Serik Beketayev
aca858652c
[Mainline] Migrate ProxyInfo
...
Bug: 173455434
Test: atest FrameworksNetTests
Change-Id: I924aed710b62a0c91b888a9e04ac2c90cdfd88d0
2020-12-23 22:15:51 -08:00
Aaron Huang
99f0ad7b3e
Merge "Have NetworkPolicyManagerService create MultipathPolicyTracker"
2020-12-24 06:03:43 +00:00
junyulai
0a2a999f05
Add test for increment operation count on non-default network
...
Currently, when the caller increment operation count, the count
will be blamed on the active default network even though the
traffic is all generated on other networks. This is kind
of weird. But in order to change the behavior, extend test
coverage first.
Test: atest com.android.server.net.NetworkStatsServiceTest#testOperationCount_nondefault_traffic
Bug: 174123988
Change-Id: Ia5b5aa3601de15bb9ee5a29f6d184d122f1c5352
2020-12-24 13:22:59 +08:00
Sudheer Shanka
e4c793b200
Update usage of allowlist/denylist in some method names/comments.
...
In a previous change (https://r.android.com/1394342 ), we did a mass update of whitelist->allowlist
and blacklist->denylist in network policy related code. Updating
some usages of those (like allowlisted to allowed) to make them
sound natural.
Test: atest services/tests/servicestests/src/com/android/server/net/NetworkPolicyManagerServiceTest.java
Test: atest services/tests/servicestests/src/com/android/server/NetworkManagementInternalTest.java
Test: atest hostsidetests/net/src/com/android/cts/net/HostsideRestrictBackgroundNetworkTests.java
Change-Id: I6d34b0bd3cdb64d5872874fd9378bfc962a24f8d
2020-12-24 04:03:33 +00:00
Remi NGUYEN VAN
4c1a956203
Merge "Split connectivity JNI and service jar" am: dfa9e2c0a1 am: fbe03a2069
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1478000
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ib2a5b04ad30c0f5d51871859714e4acde0c99277
2020-12-24 02:15:46 +00:00
Remi NGUYEN VAN
fbe03a2069
Merge "Split connectivity JNI and service jar" am: dfa9e2c0a1
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1478000
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I075c0c00d9e6af0a32e134ef5508e4acc1707580
2020-12-24 01:59:11 +00:00
Remi NGUYEN VAN
dfa9e2c0a1
Merge "Split connectivity JNI and service jar"
2020-12-24 01:46:30 +00:00
Aaron Huang
5301b6faf4
Have NetworkPolicyManagerService create MultipathPolicyTracker
...
To make connectivity service mainline, this patch makes
MultipathPolicyTracker as a submodule of NetworkPolicyManagerService
to remove the dependencies of ConnectivityService.
Bug: 175015282
Test: FrameworksNetTests
Change-Id: I82a7c62069ffd0683deb2f5ce2f99de120a2a16f
2020-12-23 23:17:15 +08:00
Chiachang Wang
973313a3d5
[IT4.2] Update argument type of interfaceClassDataActivityChanged
...
The argument type of interfaceClassDataActivityChanged takes a
string for the network type. It requires both the receivers and
NMS to do type transformation. The transformation is a redundant
work. Update it to take integer directly and rename to
understandable naming.
Bug: 170598012
Test: atest FrameworksNetTests
Change-Id: Ibe9fa7a1b71af2dab916b5d615742e77e4174c39
2020-12-23 17:34:08 +08:00
Remi NGUYEN VAN
37ebfa827a
Migrate away from AsyncChannel in NetworkAgent
...
Use two oneway binder interfaces instead.
The interfaces post messages to handlers as was implemented before, but
provide a more strictly defined interface, with less hops between
NetworkAgent, AsyncChannel, and ConnectivityService.
The actual public interface is the NetworkAgent @SystemApi: the binder
interface is an internal implementation detail.
Test: atest FrameworksNetTests CtsNetTestCasesLatestSdk
Change-Id: Ie364ab50f416e7821e70f4539a881eea828e1256
2020-12-23 17:30:54 +09:00
Chiachang Wang
49cbff8801
Merge "[IT04] Add uid as parameter of interfaceClassDataActivityChanged" am: 3035c93439 am: 40b5767863 am: 702597e7fe
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1523339
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ieafdf569c13b1421c18fa3086827e6e432b498d7
2020-12-23 07:31:25 +00:00
Chiachang Wang
702597e7fe
Merge "[IT04] Add uid as parameter of interfaceClassDataActivityChanged" am: 3035c93439 am: 40b5767863
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1523339
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I3dea98c80dd4d6f29739b26cf120957c58364445
2020-12-23 06:49:23 +00:00
Chiachang Wang
40b5767863
Merge "[IT04] Add uid as parameter of interfaceClassDataActivityChanged" am: 3035c93439
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1523339
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I9a70b967bf424f8bf4012602c0fac49478d024bb
2020-12-23 06:26:00 +00:00
Chiachang Wang
3035c93439
Merge "[IT04] Add uid as parameter of interfaceClassDataActivityChanged"
2020-12-23 05:20:33 +00:00
Remi NGUYEN VAN
4cc964f854
Merge "Fix testDeclareNetworkRequestUnfulfillable on R" am: 09d97085d0 am: 679ec299a9 am: 8a17206d21
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1519790
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I3bc46833ea281b13ab4013a65e5e6f24e9d76ff9
2020-12-23 05:10:25 +00:00
Remi NGUYEN VAN
8a17206d21
Merge "Fix testDeclareNetworkRequestUnfulfillable on R" am: 09d97085d0 am: 679ec299a9
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1519790
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I78e997f44d00ee99ca4212bd9b1b72d12dfc8e4f
2020-12-23 04:56:01 +00:00
Remi NGUYEN VAN
679ec299a9
Merge "Fix testDeclareNetworkRequestUnfulfillable on R" am: 09d97085d0
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1519790
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ifbd7dafd1b5b2387f64991d7d8c41b62c7a97e3f
2020-12-23 03:58:04 +00:00
Remi NGUYEN VAN
09d97085d0
Merge "Fix testDeclareNetworkRequestUnfulfillable on R"
2020-12-23 03:25:54 +00:00
Remi NGUYEN VAN
e9fda58f79
Split connectivity JNI and service jar
...
The VPN JNI code is moving to the tethering APEX with
ConnectivityService, so it needs to be split out of libandroid_servers.
Also move the service-connectivity.jar build rule to
packages/Connectivity together with the jni build rule.
Bug: 171540887
Test: m, device boots and VPN (L2TP and VpnService) verified working
Change-Id: Ic29096e2280ce928729315f53b2159b620da49d5
2020-12-23 12:21:25 +09:00
Remi NGUYEN VAN
852709e1cd
Merge "Split NetworkUtils and NetworkUtilsInternal" am: caa437cae0 am: 15befc3d9e am: a0ac08e394
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1513140
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ief9d6a1fae360dbe1c43d5d6bac4dad5850c004b
2020-12-23 02:22:35 +00:00