Commit Graph

12363 Commits

Author SHA1 Message Date
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
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
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
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
Chiachang Wang
7fe67c1961 Remove hidden deprecated getActiveNetworkQuotaInfo
getActiveNetworkQuotaInfo has never been in API surface since it
was introduced. It became essentially functionless since android O,
so there should be no usage dependency upon the hidden method,
In order to support ConnectivityService mainline, remove the
useless function to prevent necessary dependency.

Bug: 172183305
Test: atest FrameworksNetTests
Change-Id: Ia685b3260256d465ef614b2f577d13344074c787
2020-12-15 06:45:50 +00:00
Treehugger Robot
3bcad48a82 Merge "Add OWNERS for packages/Connectivity" am: 3efe49a31f am: 57ec33bb99 am: 6fe6e75fa1
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1527821

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I1d1a911e4de7a6ee590bed3f257366d697808ed7
2020-12-14 14:59:06 +00:00
Treehugger Robot
6fe6e75fa1 Merge "Add OWNERS for packages/Connectivity" am: 3efe49a31f am: 57ec33bb99
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1527821

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ia8636eac306c01778bdf79fa82fb9f4f7efe2db6
2020-12-14 14:48:52 +00:00
Treehugger Robot
57ec33bb99 Merge "Add OWNERS for packages/Connectivity" am: 3efe49a31f
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1527821

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ifd4cf4bd8f333adab27eeceae4aa48a8bdee4c89
2020-12-14 14:38:13 +00:00
Treehugger Robot
3efe49a31f Merge "Add OWNERS for packages/Connectivity" 2020-12-14 14:12:36 +00:00
Remi NGUYEN VAN
993306ed6b Use API TcpKeepalivePacketData in ClientModeImpl
Instead of statically linking against and jarjaring
TcpKeepalivePacketData, use the new android.net.TcpKeepalivePacketData
API for S. On R, build the KeepalivePacketDataParcelable from the base
KeepalivePacketData class.

The current ClientModeImpl code that uses a statically linked
TcpKeepalivePacketData is actually broken, as since R the system_server
has been sending a @hide android.net.TcpKeepalivePacketData, and
ClientModeImpl was testing it against com.android.wifi.x.android.net.*.
To fix this on R, this change rebuilds a
TcpKeepalivePacketDataParcelable class from the packet data included in
the base KeepalivePacketData class.

Bug: 172789687
Test: atest ConnectivityManagerTest#testCreateTcpKeepalive
      See associated test change
Change-Id: Ia32b4444dbf90306b2cfd37ec13d4ba4e90cd1e8
2020-12-14 18:43:53 +09:00
Remi NGUYEN VAN
11511b31f6 Add TcpKeepalivePacketData to SystemApi
This is consistent with NattKeepalivePacketData, which is also a
subclass of KeepalivePacketData.

TcpKeepalivePacketData is already used by the wifi module, but
statically linked.

Bug: 172789687
Test: m
Change-Id: I6aee1ae205987521bea4a3838bbece279ffa0e37
2020-12-14 18:43:44 +09:00
Remi NGUYEN VAN
afebd5c3fe Add OWNERS for packages/Connectivity
In preparation of future modularization of connectivity classes, a large
part of frameworks/base/services/net is planned to be moved to
packages/modules/Connectivity. However moving each class "manually"
to that git project would lose their commit history, and require many
cross-repository topics.

To facilitate the work, create frameworks/base/packages/Connectivity,
which will be used to move the classes at first, before they can all be
moved together with their history to packages/modules/Connectivity. This
mirrors the procedure used for NetworkStack, Tethering,
CaptivePortalLogin, etc. previously.

The added OWNERS file just imports owners from the previous file
location.

Bug: 171540887
Test: m
Change-Id: Ic1c0dbbe8c1f07582c04757ced0ead2fc5b10ca7
2020-12-14 18:34:39 +09:00
Lorenzo Colitti
50c30ed67f Merge "Generalize support for underlying networks." am: ca830d9239 am: 51c973d4b7 am: 2be66008a0
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1513052

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ida4e4d7b6d607d6c9f6efc2d06732f7826f7942e
2020-12-14 06:40:27 +00:00
Treehugger Robot
1e7b9bca3d Merge "Fix a crash in eng builds" am: 26d146ff7f am: 99890b486d am: f65b271328
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1527538

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I6e1c20b4c1004e8205d65f318939ee7d8b006f00
2020-12-14 06:39:50 +00:00
Lorenzo Colitti
2be66008a0 Merge "Generalize support for underlying networks." am: ca830d9239 am: 51c973d4b7
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1513052

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I4748f059d035219adcec0a75dac53968ea82af84
2020-12-14 06:11:47 +00:00
Treehugger Robot
f65b271328 Merge "Fix a crash in eng builds" am: 26d146ff7f am: 99890b486d
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1527538

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: If9e83003de2a3a0b227ca558264403be312fa1e6
2020-12-14 06:11:21 +00:00
Lorenzo Colitti
51c973d4b7 Merge "Generalize support for underlying networks." am: ca830d9239
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1513052

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ia252eb29dbccb0105c3f4a46c7597abb56de0c21
2020-12-14 05:59:51 +00:00
Treehugger Robot
99890b486d Merge "Fix a crash in eng builds" am: 26d146ff7f
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1527538

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I245a8498d89e73fefa448a23d71a30d3f34b56ca
2020-12-14 05:50:17 +00:00