Commit graph android_packages_modules_Co.../tests
Message SHA1
Add KeepalivePacketDataTest
Add test for constructor of KeepalivePacketData and
InvalidPacketException

Bug: 151109466
Test: atest CtsNetTestCasesLatestSdk:android.net.KeepalivePacketDataTest
      on both Q and R devices
Change-Id: Ic9db4b9b83ff96c87f41c5f381763c3ee8dd27c8

Chiachang Wang   commited 2020-03-17 14:24:50 +08:00
13c97ebd73
Merge "Ensure that NetworkFactory objects cannot be reused."
Lorenzo Colitti   authored and   Gerrit Code Review   commited 2020-03-17 04:35:01 +00:00
3b2d608aa8
Move sensitive field parceling bool to constructor
This addresses API review comments recommending to use a copy
constructor with additional parameters instead of a dedicated method.
makeSensitiveFieldsParcelingCopy becomes LinkProperties(base, true).

Bug: 150877475
Test: atest FrameworksNetTests NetworkStackTests NetworkStackNextTests
Change-Id: Ib145ca7f36dcbee6ef47d09862a181fc04a28f03

Remi NGUYEN VAN   commited 2020-03-17 11:42:33 +09:00
c38954692a
Merge "Make LinkPropertiesTest backwards compatible"
Remi NGUYEN VAN   authored and   Gerrit Code Review   commited 2020-03-17 02:27:27 +00:00
167478a027
Make LinkPropertiesTest backwards compatible
LinkPropertiesTest must be backwards compatible with Q for CTS.

In Q 4 fields were added: DhcpServerAddress, WakeOnLanSupported,
CaptivePortalApiUrl, CaptivePortalData. The new test only tests these
fields on R and above.
testLinkPropertiesParcelable_Q still verifies that there are 14 fields
on Q, so the 4 extra fields can be ignored.

The changes use androidx.core.os.BuildCompat.isAtLeastR(), so
androidx.core_core is added as a dependency to FrameworksNetCommonTests.

Test: atest CtsNetTestCasesLatestSdk:android.net.LinkPropertiesTest
        on Q and R devices
Bug: 150918852
Change-Id: I570efa4eb483a717d4204a18473d02653a69f46d

Remi NGUYEN VAN   commited 2020-03-17 11:23:13 +09:00
1d88c2e1a1
Merge "Clean up unit testing for ConnectivityDiagnostics."
Cody Kesting   authored and   Gerrit Code Review   commited 2020-03-16 19:33:33 +00:00
01f0a15807
Restrict VPN Diagnostics callbacks to underlying networks.
ConnectivityDiagnosticsCallbacks should only be invoked for the
underlying networks declared by active VPNs. This encourages VPN apps to
declare their underlying networks.

The previous permission model for VPNs allowed active VPNs to receive
callbacks on any network.

Bug: 148903617
Test: atest FrameworksNetTests
Change-Id: Ic08cdd2e2532580fda0fd3034e2bdff27e0ff84b

Cody Kesting   commited 2020-03-16 11:05:13 -07:00
e385a7a90a
Ensure that NetworkFactory objects cannot be reused.
NetworkFactory is turning into a one-time object that cannot be
re-used. Check for this in ConnectivityService.

Bug: 148635501
Test: test continues to pass
Change-Id: I793436ee0f4b5d778788ad34b8a2575d2ad0ed80
Merged-In: I793436ee0f4b5d778788ad34b8a2575d2ad0ed80

Lorenzo Colitti   commited 2020-03-17 01:39:23 +09:00
86ae4716e4
Merge "Ensure that NetworkFactory objects cannot be reused." into rvc-dev
TreeHugger Robot   authored and   Android (Google) Code Review   commited 2020-03-16 16:23:23 +00:00
f7da86d448
Merge "Protect ConnectivityService from SecurityException in permission check."
Cody Kesting   authored and   Gerrit Code Review   commited 2020-03-16 14:33:25 +00:00
4427f0d106
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
Merged-In: I64cd2c914f2da71383af7cdef2cf64c60a7d268c
(cherry picked from commit 1e7f68f39c0855a45dbf4eeecbff430a2f6f3396)

Automerger Merge Worker   authored and   Chiachang Wang   commited 2020-03-16 08:04:19 +00:00
46b1d18fc5
[SP24] Rename functions that add Entry unconditionally
Currently, in NetworkStats, there are many methods to manipulate
the records. However, some methods are similar and ambiguous,
such as addEntry, addValues, setValues, addIfaceValues,
combineValues and combineAllValues.

Thus, properly grouping and renaming methods are necessary.
In this change, for methods that add one record unconditionally,
name them insertEntry.
  setIfaceValues -> insertEntry
  addEntry -> insertEntry

Test: atest FrameworksNetTests ImsPhoneCallTrackerTest TetheringTests
Test: m doc-comment-check-docs
Bug: 148895143
Change-Id: I801ddc49e283a254b9586700c9b597c0adb0d459

junyulai   commited 2020-03-16 14:27:45 +08:00
2521ad7386
Merge "[SP21] Address comments for API council review about aosp/1172143"
Junyu Lai   authored and   Gerrit Code Review   commited 2020-03-16 02:41:19 +00:00
cc8e8480b3
Resolve ambiguous argument.
CTS tests don't have access to TestNetworkAgent and therefore
require overloading this method, which means 'null' is ambiguous.

Bug: 139268426
Test: FrameworksNetTests
Change-Id: I5d7deea82d7114fa38f37b90f94fe7e6073bd848
(cherry picked from commit ff83f1d7eea38c4143869cbf10dca5972421f6cd)

Automerger Merge Worker   authored and   Chalard Jean   commited 2020-03-15 12:56:05 +00:00
de065b5eb8
Merge "Resolve ambiguous argument."
Chalard Jean   authored and   Gerrit Code Review   commited 2020-03-14 03:38:01 +00:00
947aa6c65d
Merge changes from topic "services.net-wifi" into rvc-dev
* changes:
  services.net: Add a static library needed by wifi module
  services.net: Use the new ModuleNetworkStackClient

Roshan Pius   authored and   Android (Google) Code Review   commited 2020-03-13 22:39:09 +00:00
79a252687d
Merge "Clear UIDs when sharing NetworkCapabilties for ConnectivityDiagnostics." into rvc-dev
Cody Kesting   authored and   Android (Google) Code Review   commited 2020-03-13 18:44:50 +00:00
4cab4ab5f2
Resolve ambiguous argument.
CTS tests don't have access to TestNetworkAgent and therefore
require overloading this method, which means 'null' is ambiguous.

Bug: 139268426
Test: FrameworksNetTests
Change-Id: I9279718bde30bd98eff901921fb3411d22da72e5

Chalard Jean   commited 2020-03-13 21:17:33 +09:00
e82646b858
Merge "Remove redundant connected notification"
Treehugger Robot   authored and   Gerrit Code Review   commited 2020-03-13 07:10:13 +00:00
76c9cf8ae4
Ensure that NetworkFactory objects cannot be reused.
NetworkFactory is turning into a one-time object that cannot be
re-used. Check for this in ConnectivityService.

Bug: 148635501
Test: test continues to pass
Change-Id: I793436ee0f4b5d778788ad34b8a2575d2ad0ed80

Lorenzo Colitti   commited 2020-03-13 15:51:56 +09:00
62fd0c1ab8
Merge "Add test for NetworkAgentConfig"
Aaron Huang   authored and   Gerrit Code Review   commited 2020-03-13 04:13:04 +00:00
63ca656a6f
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

Roshan Pius   commited 2020-03-12 18:55:31 -07:00
279be1cf78
services.net: Use the new ModuleNetworkStackClient
Use the new ModuleNetworkStackClient to retrieve instances IpMemoryStore
& IpClient.

Bug: 145825329
Test: Compiles
Change-Id: I065525fdbd64b9509ef0f47bb35954d267c65fd2

Roshan Pius   commited 2020-03-12 18:26:13 -07:00
1ce72ca363
[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

junyulai   commited 2020-03-12 21:34:17 +08:00
f8660076c0
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

lucaslin   authored and   Lucas Lin   commited 2020-03-12 11:54:40 +00:00
f5ef6765d5
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
Merged-In: I4b5a3dfb78b404d414b7dc358e6f16c3414a8b33
(cherry picked from aosp/1243868)

Automerger Merge Worker   authored and   Paul Hu   commited 2020-03-12 01:45:22 +00:00
8b080861a3
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

paulhu   commited 2020-03-11 22:14:11 +08:00
d9ce33f980
Merge "Add CTS for SocketUtils.makePacketSocketAddress(int, int, byte[])"
Paul Hu   authored and   Gerrit Code Review   commited 2020-03-11 09:50:26 +00:00
07fb93026d
Merge "Skip Route tests that are R-specific on Q" into rvc-dev
Chiachang Wang   authored and   Android (Google) Code Review   commited 2020-03-11 09:36:23 +00:00
3021e53984
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

paulhu   commited 2020-03-11 15:20:26 +08:00
48dc409d46
Add tests for Tunnel, Transport mode application with released SPIs
This change adds tests to validate that both transport and tunnel mode
transforms continue to work even after the SPI resource has been
released. Specifically, since SPI resources are effectively subsumed by
the creation of a Transform, the SPI resource is still "alive", but
removed from the user-tracking sparse arrays.

Bug: 142072071
Test: Added these new tests. Failing prior to aosp/1133555, passes with.
Change-Id: I37dd459d08b57b14f72f3b28ea80fa231b152f10

Benedict Wong   commited 2020-03-11 07:12:07 +00:00
d06d390b20
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

Cody Kesting   commited 2020-03-10 23:27:01 -07:00
081da59c0e
Merge "Merge NetworkStatsService handler changes." into rvc-dev
Lorenzo Colitti   authored and   Android (Google) Code Review   commited 2020-03-11 06:19:18 +00:00
a49516676a
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

Benedict Wong   commited 2020-03-10 23:08:16 -07:00
5a09daaa7f
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

Tyler Wear   authored and   Aaron Huang   commited 2020-03-11 13:33:10 +08:00
a8978d4b83
Merge "Remove framework code that has moved to frameworks/libs/net"
Aaron Huang   authored and   Gerrit Code Review   commited 2020-03-11 04:22:09 +00:00
5d427c44da
Add test for NetworkAgentConfig
Test: atest CtsNetTestCasesLatestSdk:android.net.NetworkAgentConfigTest
Change-Id: If9158d086bacb0ade94d59898ac223e4c8f4f73a

Aaron Huang   commited 2020-03-10 21:01:14 +08:00
1feaacee76
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
Merged-In: Ibab9cfae0d35b26c6e4ca0defbb89769b04201d4
(cherry picked from commit 09e5726e158d543b7632cd6e22f6e4c29b0bef52)

Automerger Merge Worker   authored and   Chiachang Wang   commited 2020-03-10 12:47:19 +00:00
e79a15713c
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

Chiachang Wang   commited 2020-03-10 10:24:38 +00:00
e32fd54cfd
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

Aaron Huang   commited 2020-03-10 06:45:16 +00:00
2a21ea79ab
Merge "Add test for getDeprecationTime and getExpirationTime"
Chiachang Wang   authored and   Gerrit Code Review   commited 2020-03-10 03:40:55 +00:00
b1bd6a47e4
Merge "Remove redundant connected notification" into rvc-dev
Lucas Lin   authored and   Android (Google) Code Review   commited 2020-03-10 02:21:07 +00:00
10870e84af
Merge "Ignore NetworkAgentConfigTest on Q" into rvc-dev
Remi NGUYEN VAN   authored and   Android (Google) Code Review   commited 2020-03-10 00:59:50 +00:00
8b542f5310
Merge "Skip LinkAddress tests that are R-specific on Q" into rvc-dev
Remi NGUYEN VAN   authored and   Android (Google) Code Review   commited 2020-03-10 00:59:32 +00:00
2f0b87ab79
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

Cody Kesting   commited 2020-03-09 11:27:00 -07:00
5df8e985df
Clear UIDs when sharing NetworkCapabilties for ConnectivityDiagnostics.
ConnectivityDiagnostics shares NetworkCapabilities in
ConnectivityReports and DataStallReports. These NetworkCapabilities need
to have their UIDs scrubbed before they are shared with callbacks.

Bug: 148942124
Test: atest FrameworksNetTests
Change-Id: I5bde5a8116f7e36b8f4de49adf4cab8ec45a5aa4
Merged-In: I5bde5a8116f7e36b8f4de49adf4cab8ec45a5aa4
(cherry picked from commit 3de243265558fb5505b4daabe715a5090104450f)

Cody Kesting   commited 2020-03-09 08:27:10 -07:00
33325fe622
Merge "Clear UIDs when sharing NetworkCapabilties for ConnectivityDiagnostics."
Cody Kesting   authored and   Gerrit Code Review   commited 2020-03-09 15:12:51 +00:00
52f8ad3e37
Merge NetworkStatsService handler changes.
=====
Remove the need of accessing handler in NSS unit test

Currently, to wait for handler becomes idle, specific message
is used and the test would wait for condition variable to be
open when the message is processed.

However, this is already done in the HandlerUtils. Thus,
there is no need to post such message manually in the handler.

Test: atest FrameworksNetTests
Bug: 150664039

Change-Id: Iab32b2dbab01634ca159dcb90fc9f929d1fed1a2
=====
Remove setHandler in NetworkStatsService

Currently, internal handler is set by setHandler after
constructing NSS object. This was introduced in ag/866187 to
access the handler in the unit test.

However, the design put NSS in a bad situation where all classes
that need handler or executor could not be final and need to be
dynamically allocated in order to get a valid handler.

Thus, since the usage of handler is removed in previous patch,
this change eliminate setHandler by initializing the handler in
the constructor.

Test: atest FrameworksNetTests
Bug: 150664039

Change-Id: I794a24d00b0ca9fdc78091e7b9ab7307e0f034b7
=====

Bug: 150664039
Change-Id: If256ed4437ddcbcc72a6f766cff2f4cc512ee3f7
Merged-In: If256ed4437ddcbcc72a6f766cff2f4cc512ee3f7
(cherry picked from commit 2a6439d7e2a3926e10a0b9a4dc730b1a022d8138)

Automerger Merge Worker   authored and   Lorenzo Colitti   commited 2020-03-09 07:59:27 +00:00
255258f568
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

Chiachang Wang   commited 2020-03-09 06:59:50 +00:00
aae21605af
Ignore testReevaluateNetwork until Q
The method did not exist until Q, so the test is not relevant on such
devices.

Test: atest CtsNetTestCasesLatestSdk:android.net.CaptivePortalTest on Q
          and R devices
Bug: 150918852
Merged-In: I913b6eaa61bfd4f1964b324dcb4dd272aa8cc583
(cherry picked from commit 4d166d7bd95d9582335aafaa03fb242206449054)

Change-Id: I2ddeee53d4ef63f01b791e3e95161194e29d3978

Automerger Merge Worker   authored and   Remi NGUYEN VAN   commited 2020-03-09 06:34:01 +00:00
cf31c89275