Commit Graph

8438 Commits

Author SHA1 Message Date
Aaron Huang
d4db72dbfc Merge "Add test for NetworkAgentConfig" 2020-03-13 04:13:04 +00:00
Roshan Pius
e072ca8b35 services.net: Use the new ModuleNetworkStackClient
Use the new ModuleNetworkStackClient to retrieve instances IpMemoryStore
& IpClient.

Bug: 145825329
Test: Compiles
Change-Id: I065525fdbd64b9509ef0f47bb35954d267c65fd2
Merged-In: I065525fdbd64b9509ef0f47bb35954d267c65fd2
2020-03-12 18:55:31 -07:00
junyulai
0c88795cb5 [SP21] Address comments for API council review about aosp/1172143
Test: atest FrameworksNetTests ImsPhoneCallTrackerTest
Test: atest TetheringTests NetworkStackTests
Test: m doc-comment-check-docs
Fix: 148552904

Change-Id: I141393f229e772d2eb9f7c156849e379bd71b845
2020-03-12 21:34:17 +08:00
lucaslin
9e90c02511 Add version check to prevent test fail on Android Q
Include androidx.core_core for androidx.core.os.BuildCompat.

Bug: 151293251
Test: atest CtsNetTestCasesLatestSdk:android.net.NetworkCapabilitiesTest
Change-Id: I73ef7eececec757a6e9683b231bf73fcd8d49f8d
2020-03-12 11:54:40 +00:00
Automerger Merge Worker
62a15a95cc Merge "Add javadoc for Network#netId" am: 08679046fe am: 7c87e61500
Change-Id: I1adbf90c9ac47d2918123dc3fe587f34c1dbbbb9
2020-03-12 10:30:33 +00:00
Automerger Merge Worker
7c87e61500 Merge "Add javadoc for Network#netId" am: 08679046fe
Change-Id: Ie59644d3f581b17856625409112eb5c5bd8d2aa4
2020-03-12 10:16:29 +00:00
Mark Chien
08679046fe Merge "Add javadoc for Network#netId" 2020-03-12 09:55:18 +00:00
markchien
43321d2e00 Add javadoc for Network#netId
Bug: 151156820
Test: m doc-comment-check-docs
Change-Id: Iea34a5c58a8b77c83258a39a8a44601e21a482f5
2020-03-12 09:54:44 +00:00
paulhu
27ca44913a Kill ConnectivityManager.CONNECTIVITY_ACTION_SUPL
CONNECTIVITY_ACTION_SUPL is marked as a "temporary hack" and has
never been public. Remove this intent definition since no one is
receiving this intent and should use network callback to know the
connection change.

Bug: 109636544
Test: atest FrameworksNetTests
Change-Id: Ie9e5127742beba04f1c191e894e8a29fe1e704bb
2020-03-11 22:14:11 +08:00
Automerger Merge Worker
16967f5a37 Merge "Add CTS for SocketUtils.makePacketSocketAddress(int, int, byte[])" am: da284dc189 am: a40c813a46
Change-Id: I988faa70f42a42be3d6158842f722d8e1d19ab37
2020-03-11 10:43:57 +00:00
Automerger Merge Worker
a40c813a46 Merge "Add CTS for SocketUtils.makePacketSocketAddress(int, int, byte[])" am: da284dc189
Change-Id: Ieb04ad8b9d0d36840d61cf10585672deb797c911
2020-03-11 10:25:04 +00:00
Paul Hu
da284dc189 Merge "Add CTS for SocketUtils.makePacketSocketAddress(int, int, byte[])" 2020-03-11 09:50:26 +00:00
paulhu
4c48b0a060 Add CTS for SocketUtils.makePacketSocketAddress(int, int, byte[])
Bug: 149426063
Bug: 150640362
Test: atest CtsNetTestCasesLatestSdk:android.net.util.SocketUtilsTest
      on both Q and R devices
Change-Id: I4b5a3dfb78b404d414b7dc358e6f16c3414a8b33
2020-03-11 15:20:26 +08:00
Cody Kesting
807ce6621b Clean up unit testing for ConnectivityDiagnostics.
Connectivity Diagnostics included an unnecessary try-catch for verifying
that the permissions check for invoking ConnectivityDiagnosticsCallbacks
doesn't throw when the uid and package name do not match.

Bug: 149119324
Test: atest FrameworksNetTests
Change-Id: Ie302b1f4f437e819fdd15ec28adb0b56750c2c53
2020-03-10 23:27:01 -07:00
Cody Kesting
a84aee7ad3 Add support for registering test networks with administrators.
CTS testing for ConnectivityDiagnosticsManager requires registering
TestNetworks with the administrator UIDs set. This sets up the CTS
process to be an administrator over the test network, which allows it to
receive ConnectivityDiagnosticsCallback callbacks.

Bug: 148032944
Test: atest android.net.cts.ConnectivityDiagnosticsManagerTest
Test: atest IpSecManagerTunnelTest
Change-Id: I7a443c368cf1ac470fbe40883ca24bc3143153b0
2020-03-10 23:27:01 -07:00
Cody Kesting
1dee169fae Replace com.android.internal.util.Preconditions.checkNotNull with
java.util.Objects.requireNonNull

Note: This is a partial cherry-pick.

Bug: 126528330

Test: Treehugger
Change-Id: I60fbb04b2720761f9c364b8c8350906d3d4a0ee7
Merged-In: Idb1b6ba41af3b52f3376b1157259af3c30328c4e
(cherry picked from commit d4e7dd113d)
2020-03-10 23:26:30 -07:00
Benedict Wong
feff1cde9a Automatically set IPsec tunnel interface as up
This change makes IPsec tunnel interfaces automatically get brought up
once they are created. Originally this was considered to be an
additional safety check, as they would not be start routing traffic
until explicitly brought up. However, in the intervening time, the
NetworkManagementController now requires the NETWORK_STACK permission to
set an interface as up. Additionally, that call is a hidden API, and
thus not usable for use cases such as IWLAN.

Bug: 149348618
Test: FrameworksNetTests, CtsNetTestCases passing.
Change-Id: I55b63a748463a388e1e2991d2d5d6b3023545e60
2020-03-10 23:08:16 -07:00
Tyler Wear
e4314861e3 mtu: Add MTU parameter to Routes
- Change route to update existing route
- MTU parameter added to AddRoute

Bug: 142892223
Test: unit test
Change-Id: Ie339d0cee5be12c2232a4631fed61219a0facc64
2020-03-11 13:33:10 +08:00
Automerger Merge Worker
19edb580e6 [automerger skipped] Merge "Remove framework code that has moved to frameworks/libs/net" am: 73808bd4cf -s ours am: 96a23bf0db -s ours
am skip reason: Change-Id Ibf2f370c97a602f186e37ea9ffbe177dd2ee0f1c with SHA-1 9d279abf30 is in history

Change-Id: I3e6b84639e5121f8f667ee35738db151d57644df
2020-03-11 04:55:07 +00:00
Automerger Merge Worker
96a23bf0db [automerger skipped] Merge "Remove framework code that has moved to frameworks/libs/net" am: 73808bd4cf -s ours
am skip reason: Change-Id Ibf2f370c97a602f186e37ea9ffbe177dd2ee0f1c with SHA-1 9d279abf30 is in history

Change-Id: I88ef318934572883b59615bd6a1644a5f658842b
2020-03-11 04:35:01 +00:00
Aaron Huang
73808bd4cf Merge "Remove framework code that has moved to frameworks/libs/net" 2020-03-11 04:22:09 +00:00
Aaron Huang
97ae1a81fa Add test for NetworkAgentConfig
Test: atest CtsNetTestCasesLatestSdk:android.net.NetworkAgentConfigTest
Change-Id: If9158d086bacb0ade94d59898ac223e4c8f4f73a
2020-03-10 21:01:14 +08:00
Automerger Merge Worker
390e1ba34f Merge "Skip Route tests that are R-specific on Q" am: 3e3abc9ec4 am: 65ffa79f4a
Change-Id: I536ba305759dd4c616f432034a6bc0be5bb4dca5
2020-03-10 10:35:38 +00:00
Automerger Merge Worker
65ffa79f4a Merge "Skip Route tests that are R-specific on Q" am: 3e3abc9ec4
Change-Id: I385fb495bacc26e1959492c53d063409a4e7bf02
2020-03-10 10:28:15 +00:00
Chiachang Wang
3e3abc9ec4 Merge "Skip Route tests that are R-specific on Q" 2020-03-10 10:24:48 +00:00
Chiachang Wang
1d74bab6e7 Skip Route tests that are R-specific on Q
MTU was added in R so test for it should be run on Q. Also
revise test to adopt rule.

Test: atest CtsNetTestCasesLatestSdk:android.net.LinkAddressTest
      on both devices
Bug: 150918852
Change-Id: Ibab9cfae0d35b26c6e4ca0defbb89769b04201d4
2020-03-10 10:24:38 +00:00
Aaron Huang
0e1759bdfa Remove framework code that has moved to frameworks/libs/net
Add srcs to framework and change import path.
Remove the codes which are moved to frameworks/libs/net.

Bug: 139268426
Bug: 135998869
Bug: 138306002
Bug: 143925787
Test: atest FrameworksNetTests
      atest FrameworksTelephonyTests
      ./frameworks/opt/net/wifi/tests/wifitests/runtests.sh
Change-Id: Ia5692aade490fbc8a037186fcdfc453e0dd8045b
Merged-In: Ibf2f370c97a602f186e37ea9ffbe177dd2ee0f1c
2020-03-10 06:45:16 +00:00
Automerger Merge Worker
92dbf9f250 Merge "Add test for getDeprecationTime and getExpirationTime" am: c5d2170b64 am: 9d279abf30
Change-Id: Idef9ba4bad2510cbfa6b466067351b9e1057b672
2020-03-10 04:33:31 +00:00
Automerger Merge Worker
9d279abf30 Merge "Add test for getDeprecationTime and getExpirationTime" am: c5d2170b64
Change-Id: Ibf2f370c97a602f186e37ea9ffbe177dd2ee0f1c
2020-03-10 04:09:18 +00:00
Chiachang Wang
c5d2170b64 Merge "Add test for getDeprecationTime and getExpirationTime" 2020-03-10 03:40:55 +00:00
Automerger Merge Worker
6daced5a80 Merge "Clear UIDs when sharing NetworkCapabilties for ConnectivityDiagnostics." am: 42fbfe8826 am: 6196f04eed
Change-Id: I3d81c42cafd92023b23978e84bedcba246480dd7
2020-03-09 20:17:37 +00:00
Automerger Merge Worker
6196f04eed Merge "Clear UIDs when sharing NetworkCapabilties for ConnectivityDiagnostics." am: 42fbfe8826
Change-Id: I1336262b19aaa729fb07410eb9aeeb7869f2f88f
2020-03-09 19:59:18 +00:00
Cody Kesting
a830439b37 Protect ConnectivityService from SecurityException in permission check.
ConnectivityService currently calls
LocationPermissionChecker#checkLocationPermission. This method call
throws a SecurityException if the given package name and UID do not
match. This permission check is made from the ConnectivityService
Thread, so any Exception being thrown will crash the SystemServer. This
is not acceptable, so surround the permission check in a try-catch in
case any SecurityExceptions are thrown.

Bug: 149119324
Test: atest ConnectivityServiceTest
Change-Id: Ibe2874f2a5249432270aa1b9eb7d004bbba35ac2
2020-03-09 11:27:00 -07:00
Cody Kesting
42fbfe8826 Merge "Clear UIDs when sharing NetworkCapabilties for ConnectivityDiagnostics." 2020-03-09 15:12:51 +00:00
Chiachang Wang
ac98e787d3 Add test for getDeprecationTime and getExpirationTime
Add for cts coverage for system API

Bug: 139268426
Bug: 135998869
Test: atest FrameworksNetTests
Test: atest CtsNetTestCasesLatestSdk:android.net.LinkAddressTest
Change-Id: I64cd2c914f2da71383af7cdef2cf64c60a7d268c
2020-03-09 06:59:50 +00:00
Automerger Merge Worker
fee42b27c2 Merge "Ignore NetworkAgentConfigTest on Q" am: b6871630d7 am: 42eac89804
Change-Id: I1bfc29accc854f214ec29906a4a210543e8d38df
2020-03-09 05:22:37 +00:00
Automerger Merge Worker
fb1276b04c Merge "Skip LinkAddress tests that are R-specific on Q" am: b2f8f992ba am: e7fa2e1710
Change-Id: I9e81c9f043860ba991077f6e3c7f34100063ec98
2020-03-09 05:22:14 +00:00
Automerger Merge Worker
43b70efbba Merge "Ignore testReevaluateNetwork until Q" am: 48f2c29253 am: 05fee52ee7
Change-Id: I759d08dcf2ccfa7420e592e5673f3b8da24241f3
2020-03-09 05:21:45 +00:00
Automerger Merge Worker
42eac89804 Merge "Ignore NetworkAgentConfigTest on Q" am: b6871630d7
Change-Id: I4626672d2e5e96c7f249f34850f490199d82b06c
2020-03-09 05:12:17 +00:00
Automerger Merge Worker
e7fa2e1710 Merge "Skip LinkAddress tests that are R-specific on Q" am: b2f8f992ba
Change-Id: I9221f3dbe00d9994b73c973cb61a59da7d32b0ac
2020-03-09 05:12:00 +00:00
Automerger Merge Worker
05fee52ee7 Merge "Ignore testReevaluateNetwork until Q" am: 48f2c29253
Change-Id: I0c8c1ecba97100efc49c2ec776af83a60160bd44
2020-03-09 05:11:40 +00:00
Remi NGUYEN VAN
b6871630d7 Merge "Ignore NetworkAgentConfigTest on Q" 2020-03-09 05:03:20 +00:00
Remi NGUYEN VAN
b2f8f992ba Merge "Skip LinkAddress tests that are R-specific on Q" 2020-03-09 05:00:33 +00:00
Remi NGUYEN VAN
48f2c29253 Merge "Ignore testReevaluateNetwork until Q" 2020-03-09 05:00:12 +00:00
Remi NGUYEN VAN
186adbf536 Ignore NetworkAgentConfigTest on Q
NetworkAgentConfig did not exist on Q.

Test: atest CtsNetTestCasesLatestSdk:android.net.NetworkAgentConfigTest
          on Q and R devices
Bug: 150918852
Change-Id: I5414d7767c39327ff41673ff13ccd34982e10742
2020-03-09 12:04:39 +09:00
Remi NGUYEN VAN
1306f533e6 Skip LinkAddress tests that are R-specific on Q
Address lifetime was added in R so tests for it should not be run on Q.

Test: CtsNetTestCasesLatestSdk:android.net.LinkAddressTest on both
          devices
Bug: 150918852
Change-Id: I98b14727eabcf569829eee8df34afc057eba6f93
2020-03-09 10:42:53 +09:00
Automerger Merge Worker
966c351bf0 Merge "Remove the NetworkScore class." am: d88d10a100 am: 1f3fab6597
Change-Id: I4afcb386d3432872e4a9698db4f7652ada0d9702
2020-03-08 05:26:32 +00:00
Automerger Merge Worker
1f3fab6597 Merge "Remove the NetworkScore class." am: d88d10a100
Change-Id: Ieb78467dac3aca48eea9d049b83a74f9ff41eec7
2020-03-08 05:11:03 +00:00
Treehugger Robot
d88d10a100 Merge "Remove the NetworkScore class." 2020-03-08 04:52:26 +00:00
Cody Kesting
83bc447911 Update Javadoc comments for ConnectivityDiagnostics constants.
API Council feedback requested adding documentation for detection method
constants used in DataStallReport to indicate how the Data Stall was
detected.

Bug: 150598997
Test: n/a
Change-Id: Ib08f05562dd4b17973eeee97452d9f56d37e80fe
2020-03-06 08:05:06 -08:00