Commit Graph

11695 Commits

Author SHA1 Message Date
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
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
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
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
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
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
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
a0ac08e394 Merge "Split NetworkUtils and NetworkUtilsInternal" am: caa437cae0 am: 15befc3d9e
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1513140

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I7b2eae7f9988ae8fa8c858709cafc17c1420f4b7
2020-12-23 02:07:05 +00:00
Remi NGUYEN VAN
15befc3d9e Merge "Split NetworkUtils and NetworkUtilsInternal" am: caa437cae0
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1513140

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Iaa5503f829077f70803e2e865f58c6e4691d1a73
2020-12-23 01:37:12 +00:00
Remi NGUYEN VAN
caa437cae0 Merge "Split NetworkUtils and NetworkUtilsInternal" 2020-12-23 01:19:27 +00:00
Chiachang Wang
f896dfcb81 [IT04] Add uid as parameter of interfaceClassDataActivityChanged
Add uid into interfaceClassDataActivityChanged in
INetworkManagementEventObserver. This helps the listeners to use
BaseNetworkObserver to listen for target evnets instead of using
whole INetdUnsolicitedEventListener with no-op in other event
that listeners do not care about.

Bug: 170598012
Test: m ; atest FrameworksNetTests
Change-Id: I2a42a522c2ff9b1e0be88261a8574bb7f5292fa6
2020-12-22 08:39:22 +08:00
Chalard Jean
1601de7a23 Merge "Move module utils to the module package." am: e294449129 am: 8501b46296
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1406808

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Idb3306b246eb9cbe55352587dfd437e42b326b1f
2020-12-21 06:33:29 +00:00
Chalard Jean
8501b46296 Merge "Move module utils to the module package." am: e294449129
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1406808

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I9c42945df36d94e4abdf073fac17141f3b23d034
2020-12-21 06:11:51 +00:00
Chalard Jean
e294449129 Merge "Move module utils to the module package." 2020-12-21 05:35:09 +00:00
Chiachang Wang
4c7befb656 Merge "[IT03] Add replacement methods for network activity" am: 5cb10d24d0 am: 59dd3432f7
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1523338

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ic2ca929e5074f70851d19e896b66da8b8f59d0a9
2020-12-21 04:56:33 +00:00
Chiachang Wang
59dd3432f7 Merge "[IT03] Add replacement methods for network activity" am: 5cb10d24d0
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1523338

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I00c4a1046f3b67003f5091d92022477b9347212f
2020-12-21 04:21:20 +00:00
Lucas Lin
8de2d6be61 Merge "Use [clear|restore]CallingIdentity instead of withCleanCallingIdentity" am: 0ac2ae14b3 am: 5e3ef9ef02
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1532898

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I7832d94ecf58d3e2cd4a5f4fcc9a5f96bafb1eea
2020-12-21 03:55:55 +00:00
Chiachang Wang
5cb10d24d0 Merge "[IT03] Add replacement methods for network activity" 2020-12-21 03:50:05 +00:00
Chiachang Wang
b4bba7179b [IT03] Add replacement methods for network activity
Reference for NMS in ConnectivityManager should be removed for
incoming CS mainline. The API for listening network activity
should not go into NMS. As an alternative, the registry requests
should be sent to CS and handled by CS. Add necessary alternative
in IConnectivityManger first. The detail implementation will be
added in the follow up commits.

Bug: 170598012
Test: m
Change-Id: If4d24b937feb88a61f22073af2f671cf20298364
2020-12-21 03:48:54 +00:00
Lucas Lin
5e3ef9ef02 Merge "Use [clear|restore]CallingIdentity instead of withCleanCallingIdentity" am: 0ac2ae14b3
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1532898

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I97202f6832a279896bbcc63043913b35c98589c2
2020-12-21 03:35:33 +00:00
Lucas Lin
0ac2ae14b3 Merge "Use [clear|restore]CallingIdentity instead of withCleanCallingIdentity" 2020-12-21 03:09:20 +00:00
James Mattis
c176f8d290 Merge changes I177ec607,I68f364b4,Ib3b9f52c,If040d61e am: ebe2e05464 am: 7a22adb443
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1507701

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I999071b30ea66a17bde8c6b77556c9911790a357
2020-12-20 19:24:41 +00:00
James Mattis
7a22adb443 Merge changes I177ec607,I68f364b4,Ib3b9f52c,If040d61e am: ebe2e05464
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1507701

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ic30796bc2354ba9d29057886e5c9e3b20ff1250f
2020-12-20 19:08:12 +00:00
James Mattis
ebe2e05464 Merge changes I177ec607,I68f364b4,Ib3b9f52c,If040d61e
* changes:
  nits removing extra space, change method name, etc
  maybeLogBlockedStatusChanged multilayer requests
  Update getSignalStrengthThresholds for multilayer
  Update to unneeded for multilayered requests
2020-12-20 18:31:36 +00:00
Sarah Chin
d7bbdb68aa [automerger skipped] Merge "Move phone ID to extra for action provision" into rvc-qpr-dev am: 0d094ad38e -s ours
am skip reason: Change-Id Ic4129def86949d7191d15056852718dadbd72fba with SHA-1 cf44f2fe10 is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13129115

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I147899ccfd96a58763de3c8e9c1af6f2847da182
2020-12-17 08:42:13 +00:00
Sarah Chin
625a058884 Merge "Move phone ID to extra for action provision" am: 9d7a954112 am: 1fb857898b
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1530760

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I0aaf794caca7c3be0731a2ed7774ec181ffd108a
2020-12-17 07:21:39 +00:00
Sarah Chin
1fb857898b Merge "Move phone ID to extra for action provision" am: 9d7a954112
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1530760

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Idd950c7615945334cbf932beed42d20c41e968c3
2020-12-17 06:44:17 +00:00
Sarah Chin
9d7a954112 Merge "Move phone ID to extra for action provision" 2020-12-17 06:06:41 +00:00
lucaslin
86086774a9 Use [clear|restore]CallingIdentity instead of withCleanCallingIdentity
ConnectivityService is going to be a part of mainline module, to
prevent using @hide method - withCleanCallingIdentity(), use
clearCallingIdentity() & restoreCallingIdentity() instead.

Bug: 170598012
Test: FrameworksNetTests & CtsNetTestCasesLatestSdk
      & TetheringIntegrationTests
Change-Id: I20f45af4a4044844a171b09269981451a9d7cdb4
2020-12-17 01:28:39 +00:00
Lorenzo Colitti
95dbc7e04a Merge changes Ie0b32460,I21028457,I82754375 am: 29e5346c24 am: 59e069bbde
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1529778

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I2c437476b2891d327e3e29e3979b0dcd4e30b52d
2020-12-16 09:50:39 +00:00
Lorenzo Colitti
59e069bbde Merge changes Ie0b32460,I21028457,I82754375 am: 29e5346c24
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1529778

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Iec4ec0fa39235a171431832a5871e2cfdf1fbf25
2020-12-16 09:10:43 +00:00
Chalard Jean
fa159c1755 Move module utils to the module package.
Test: FrameworksWifiTest FrameworksNetTest
Change-Id: If5d1e4a58fb2d6d9544e6d01995dabe445cf1f25
Merged-In: I067eeecd458c34b7f2fbfa439072682661ac750c
2020-12-16 11:44:22 +09:00
Sarah Chin
cf44f2fe10 Move phone ID to extra for action provision
Previously, the phone ID was appended to the broadcast in DCT and sent
to ConnectivityManager. Instead of sending both as an action, send the
phone ID as an extra instead to make the action a protected broadcast.

Test: manually verify a SecurityException when action provision is sent
Test: atest DcTrackerTest
Bug: 172459128
Change-Id: Ic4129def86949d7191d15056852718dadbd72fba
Merged-In: Ic4129def86949d7191d15056852718dadbd72fba
2020-12-15 10:55:22 -08:00
Lorenzo Colitti
eb862ae1d7 Allow ConnectivityServiceTest to change the calling UID.
Allow ConnectivityServiceTest to change the UID by replacing
static calls to Binder.getCallingUid() with a method that can
be mocked.

Add registerNetworkCallbackAsUid as an initial way to exercise
this, and add some test coverage to the always-on lockdown test
to confirm that things are working as expected.

Bug: 173331190
Test: new unit tests
Change-Id: Ie0b32460e20e5906a0f479191e11a062f21cc608
2020-12-15 21:10:36 +09:00
Lorenzo Colitti
6fb90abce1 Add a test for getDefaultNetworkCapabilitiesForUser.
Bug: 173331190
Test: test-only change
Test: new test passes 100 times in a row
Change-Id: I210284578e38cd25b8b95235d3390d5bd66a5a70
2020-12-15 21:08:21 +09:00