Commit Graph

12378 Commits

Author SHA1 Message Date
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
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
Chalard Jean
7cd460d7ce [automerger skipped] Merge "Move module utils to the module package." am: e294449129 am: 8501b46296 am: 1601de7a23 -s ours
am skip reason: Change-Id I067eeecd458c34b7f2fbfa439072682661ac750c with SHA-1 211c6da815 is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I46d5e48ab689868d2e56fbde4cd02fb5c97d9ab6
2020-12-22 06:58:31 +00:00
Chiachang Wang
ebd47651f1 Merge "[IT03] Add replacement methods for network activity" am: 5cb10d24d0 am: 59dd3432f7 am: 4c7befb656
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1523338

MUST ONLY BE SUBMITTED BY AUTOMERGER

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Id272d92fda848dbac0dd8050417a00fcd2a8822e
2020-12-22 06:57:49 +00:00
James Mattis
f0cf0850fa Merge changes I177ec607,I68f364b4,Ib3b9f52c,If040d61e am: ebe2e05464 am: 7a22adb443 am: c176f8d290
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1507701

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Id8d45a68283ab29f6928628ebf852143793aff76
2020-12-22 06:57:02 +00: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
05cfdc7aab [automerger skipped] Merge "Move phone ID to extra for action provision" into rvc-qpr-dev am: 0d094ad38e -s ours am: d7bbdb68aa -s ours
am skip reason: Change-Id Ic4129def86949d7191d15056852718dadbd72fba with SHA-1 cab74db6c0 is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I55270aa3b837bea1e2c58603b762c7f10aae052c
2020-12-17 08:49:42 +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
e842b58308 [automerger skipped] Merge "Move phone ID to extra for action provision" am: 9d7a954112 am: 1fb857898b am: 625a058884 -s ours
am skip reason: Change-Id Ic4129def86949d7191d15056852718dadbd72fba with SHA-1 cab74db6c0 is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I2f0e1c00d00155641e8fdfde250787421dafa6b5
2020-12-17 07:55:26 +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
e3968cae74 Merge changes Ie0b32460,I21028457,I82754375 am: 29e5346c24 am: 59e069bbde am: 95dbc7e04a
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1529778

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I2e28cde0569c263c6afe5ad722be4060912eae0e
2020-12-16 10:33:27 +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
Lorenzo Colitti
bb6b62a41e Add tests for always-on VPN lockdown mode.
This requires mocking lots of new things that weren't mocked
before but is otherwise fairly straightforward.

A few changes to MockVpn are needed as well:

1. Set the VPN's NetworkInfo to CONNECTED, so methods such as
   isBlockingUid will work. While I'm at it, set the interface on
   the LinkProperties as well to make things a bit more
   realistic.

2. Constructs the VpnConfig when registering the agent, not when
   the MockVpn is created. This is needed because starting and
   stopping lockdown VPN calls prepare, which nulls out mConfig.
   But constructing the VpnConfig when registering the agent is
   more realistic anyway. The production code does that in
   establish, but we can't do that in ConnectivityServiceTest
   because some of the test cases don't call establish and call
   registerAgent directly.

Bug: 173331190
Test: atest FrameworksNetTests
Change-Id: I827543751dbf5e626a24ec02cd6f50b423f5f761
2020-12-15 21:08:20 +09:00
Remi NGUYEN VAN
1ffe4ac727 Merge changes from topic "tcp_keepalive_fix" am: 3a86e4690e am: 559e7604e6 am: 2d843b4921
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1494039

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I26fa0ae4a1f41f1b970f6f7b192dfc4fe4bedb1d
2020-12-15 11:42:29 +00:00
Remi NGUYEN VAN
6ebd98efc1 Add TcpKeepalivePacketData to SystemApi am: 11511b31f6 am: 349ba03274 am: 7240fd9ea1
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1494038

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I1aa9deefefcaf75959463e8a8a87bfeefb98f0ee
2020-12-15 11:42:19 +00:00
Sarah Chin
1be00b7b29 Merge "Move phone ID to extra for action provision" 2020-12-15 11:07:25 +00:00
Remi NGUYEN VAN
2d843b4921 Merge changes from topic "tcp_keepalive_fix" am: 3a86e4690e am: 559e7604e6
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1494039

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Idedfa2e8237109824683a9923079b02835c39acc
2020-12-15 10:23:23 +00:00
Remi NGUYEN VAN
7240fd9ea1 Add TcpKeepalivePacketData to SystemApi am: 11511b31f6 am: 349ba03274
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1494038

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ic764adda49e414e6ed34a101fd83c3fc62f5734c
2020-12-15 10:23:21 +00:00
Remi NGUYEN VAN
559e7604e6 Merge changes from topic "tcp_keepalive_fix" am: 3a86e4690e
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1494039

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ic9e330a2bd8dbb701db0e5b73c1954670d4988fc
2020-12-15 09:41:42 +00:00
Remi NGUYEN VAN
349ba03274 Add TcpKeepalivePacketData to SystemApi am: 11511b31f6
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1494038

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ibe3df65b4e12ecda5d95737f3b1ea18dabc2461d
2020-12-15 09:38:38 +00:00
Sarah Chin
ef1dd4e469 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 01:10:27 -08:00
Remi NGUYEN VAN
3a86e4690e Merge changes from topic "tcp_keepalive_fix"
* changes:
  Use API TcpKeepalivePacketData in ClientModeImpl
  Add TcpKeepalivePacketData to SystemApi
2020-12-15 09:02:55 +00:00
Chiachang Wang
9f994053b3 Merge "Remove hidden deprecated getActiveNetworkQuotaInfo" am: 6443bf4c41 am: 8413fe564e am: 53ffa8edac
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1527738

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I3f3b1e288635d84e93115fddbbafb5321f55646e
2020-12-15 08:55:43 +00:00
Sarah Chin
cab74db6c0 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
2020-12-15 00:25:01 -08:00
Chiachang Wang
53ffa8edac Merge "Remove hidden deprecated getActiveNetworkQuotaInfo" am: 6443bf4c41 am: 8413fe564e
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1527738

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ic4d06df07e1ee4d856ceabff0a7928d04a19f29f
2020-12-15 08:12:16 +00:00
Chiachang Wang
8413fe564e Merge "Remove hidden deprecated getActiveNetworkQuotaInfo" am: 6443bf4c41
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1527738

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ia59544cd76712acdcc406f0f0391a0bbfe5c2f9e
2020-12-15 07:39:15 +00:00
Chiachang Wang
6443bf4c41 Merge "Remove hidden deprecated getActiveNetworkQuotaInfo" 2020-12-15 07:02:54 +00:00