Commit graph android_packages_modules_Co.../tests/unit/java/com
Message SHA1
Merge "[MS07.2] Move NetworkStatsCollection/IdentitySet into frameworks" am: 7577131341
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1895330

Change-Id: I0201841996260b719dffd8577fd979cce4ebc26b

Treehugger Robot   authored and   Automerger Merge Worker   commited 2021-12-10 19:12:44 +00:00
f945467c54
[MS07.2] Move NetworkStatsCollection/IdentitySet into frameworks
These files are needed for the data migration util system Api
interfaces. Thus, they need to be moved into frameworks folder.

This change also set the @IgnoreUpTo annotation to S, since
these tests are testing purely platform code on S- devices which
is not really necessary for MTS. Also the tests are still covered
by the unit tests, since they are always verifying HEAD.

Test: TH
Bug: 197717846
Change-Id: I93c19b4860864c724be9f9f889ee2173f4605198

Junyu Lai   commited 2021-12-09 08:43:16 +00:00
e9710f0918
Merge "Remove NsdSettings from test" am: 5c3c3af9b6
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1908687

Change-Id: Id16806c021858dd1f1abb4e26995677f6ae0561c

Paul Hu   authored and   Automerger Merge Worker   commited 2021-12-07 06:00:27 +00:00
b8db34b69c
Remove NsdSettings from test
NsdSettings has been removed from NsdService, so the test needs
to update accordingly.

Bug: 206702844
Test: atest FrameworksNetTests CtsNetTestCases
Change-Id: I23b6323b2d870746737370b9a3fc90e530e3d2ed

paulhu   commited 2021-12-03 22:26:39 +08:00
850bd91c3a
Merge "Save uid netd network permissions" am: 6fafdc1548
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1773890

Change-Id: Ia265f482f1dd0750b1dab72b525886b4d63d43a4

Paul Hu   authored and   Automerger Merge Worker   commited 2021-11-29 03:45:34 +00:00
bf010fa384
Save uid netd network permissions
PermissionMonitor only saves netd network permissions by appId.
Then apply same permision to uids which are same appId. But
UIDS_ALLOWED_ON_RESTRICTED_NETWORKS can allow single uid has
restricted network permission. Thus, save the netd network
permissions by uid that can apply different permission to each
uid.

Bug: 192431153
Test: atest FrameworksNetTests
Change-Id: I942cbe0fa30758a7497c47a1b684ed70c4e3b09e

paulhu   commited 2021-11-26 14:47:01 +08:00
b2d5b054d3
Merge "Update NSD tests without AsyncChannel" am: 469d941752
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1823893

Change-Id: I2aa5666f1ab0ff035aefc800065fededc81e4517

Remi NGUYEN VAN   authored and   Automerger Merge Worker   commited 2021-11-22 06:18:11 +00:00
9759005048
Merge "Update NSD tests without AsyncChannel"
Remi NGUYEN VAN   authored and   Gerrit Code Review   commited 2021-11-22 05:58:15 +00:00
469d941752
Merge "Use real ProxyTracker in ConnectivityServiceTest" am: c7037475fa
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1885529

Change-Id: Iac952ca15e14b107409b8470b087aceafb06021f

Aaron Huang   authored and   Automerger Merge Worker   commited 2021-11-22 05:41:19 +00:00
1d5bf4bf1a
Update NSD tests without AsyncChannel
Update the tests to use the newer NsdManager based on Binder interfaces
instead of AsyncChannel.

Bug: 190249673
Test: atest NsdManagerTest NsdServiceTest
Change-Id: I0991b598331e335a0bc211f010da7f034fb2441b

Remi NGUYEN VAN   commited 2021-11-18 18:22:45 +09:00
cd4b4ee973
Use real ProxyTracker in ConnectivityServiceTest
Currently CS test uses a mock ProxyTracker object to verify that
the sendProxyBroadcast() is called. Also, if the network is a
default network then sendProxyBroadcast() will be indirectly
called in setDefaultProxy(). This only verifies that the method
is called but it doesn't verify that the broadcast is sent.

Instead of testing setDefaultProxy() is called, it is better to
verify that the broadcast is actually sent. Therefore, use a
real ProxyTracker in the test to verify the broadcast is sent.

Test: FrameworksNetTests:ConnectivityServiceTest
Change-Id: Id5c9e07e8326f24bd2665b4bb08f96d6d57d999c

Aaron Huang   commited 2021-11-15 20:01:12 +08:00
e3879abb07
Don't rematch all requests when adding new ones am: 959d2cb6bd am: b92f209a18
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1784387

Change-Id: Iaeab1d0f2f505222d286c5071a73b6f5cb8df2f2

Remi NGUYEN VAN   authored and   Automerger Merge Worker   commited 2021-11-10 04:43:07 +00:00
813a7c2f9d
Don't rematch all requests when adding new ones
With the network selection rewrite in S, rematching a single request can
now easily be done; this can be used as an optimization in
handleRegisterNetworkRequests to avoid rematching all requests when
registering a new one.

This can be disabled by a flag that is unset by default,
REMATCH_ALL_REQUESTS_ON_REGISTER.

Test: atest ConnectivityServiceTest
Change-Id: If76f79b41ac88863974f7025624667134bea2570

Remi NGUYEN VAN   commited 2021-11-08 19:17:57 +09:00
959d2cb6bd
Merge "Shorten a timeout" am: a200fe8c1c am: f4016713ae
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1877219

Change-Id: I07e60e55a4cc615ea1c188ab2d4b105fbab971d6

Treehugger Robot   authored and   Automerger Merge Worker   commited 2021-11-01 12:50:27 +00:00
6521062e92
Merge "Shorten a timeout"
Treehugger Robot   authored and   Gerrit Code Review   commited 2021-11-01 12:19:28 +00:00
a200fe8c1c
Merge "Replace mDeps with a custom object" am: 31ac212428 am: 0aa49aa970
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1868567

Change-Id: Id0f7d537d2c67a5874708b2db1845da8c9c0b131

Chalard Jean   authored and   Automerger Merge Worker   commited 2021-11-01 10:56:26 +00:00
a08033b913
Merge "Replace mDeps with a custom object"
Chalard Jean   authored and   Gerrit Code Review   commited 2021-11-01 10:31:53 +00:00
31ac212428
Shorten a timeout
This timeout is not very useful but will be incurred every
time

Test: ConnectivityServiceTest
Change-Id: Ia7c76c7c7a148f14844d098be267e16c215776f5

Chalard Jean   commited 2021-11-01 19:30:10 +09:00
f63e4597a3
Merge "Add tests for testing if [start|finish]Op is called or not" am: 5bf4cd9a73 am: 3e7abf056d
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1853600

Change-Id: I1a024d7740de8a08fc9a1c8eb2ebec5aeef79b3a

Lucas Lin   authored and   Automerger Merge Worker   commited 2021-11-01 09:02:20 +00:00
92bebd2e79
Merge "Add tests for testing if [start|finish]Op is called or not"
Lucas Lin   authored and   Gerrit Code Review   commited 2021-11-01 08:33:36 +00:00
5bf4cd9a73
Replace mDeps with a custom object
Mockito's mocks are not thread-safe. The dependencies object
is used both on the test thread (to set it up) and in the CS
handler thread. This can't work with a mock.

Bug: 195626111
Test: ConnectivityServiceTest
Change-Id: Ia989dd71c3133513a90bc1d1957419fb1b74c300

Chalard Jean   commited 2021-11-01 16:30:56 +09:00
21f4f70d46
Add a test for metered/non-metered mobile network am: 2685c929f4 am: bbb828ef8e
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1779527

Change-Id: I294b20a075a549dbaa8faae95cddb117bd776905

Aaron Huang   authored and   Automerger Merge Worker   commited 2021-10-26 12:46:09 +00:00
da7a6dcdbc
Add a test for metered/non-metered mobile network
NetworkTemplate.buildTemplateMobileWithRatType() supports
to build a template with metered filter, so a mobile network
is metered or non-metered should be tested.

This commit also rename buildMobile3gState to buildMobileState
because originally this method uses NetworkInfo to simulate the
network type. The NetworkInfo related codes were removed.
Currently, setMobileRatTypeAndWaitForIdle is used to simulate
the network type in test.

Ignore-AOSP-First: The parent of this change contains a CL will
conflict with internal tree so ignore AOSP first.
Bug: 183776809
Test: this
Change-Id: I8e54e2acb06db81fb0eaf330c4fd7cb391b01ff3

Aaron Huang   commited 2021-10-26 12:16:18 +00:00
2685c929f4
Merge "Update callers to use buildTemplateMobileWithRatType with metered" am: c5655055a3 am: 386e1702a5
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1807404

Change-Id: I84a85ec334d652ddbbe390b67b3923164c615b69

Aaron Huang   authored and   Automerger Merge Worker   commited 2021-10-26 06:23:50 +00:00
fa4e56de74
Add tests for testing if [start|finish]Op is called or not
Add a test for testing if [start|finish]Op will be called when
[start|stop]VpnProfile is called.
Also add a test to ensure that the startOp will not be called
again when seamless handover is happened.

Bug: 197135981
Test: atest FrameworksNetTests:VpnTest
Change-Id: I778ea4edf7c4a2d20b3b8e1877e7942feac5372a

lucaslin   commited 2021-10-26 03:46:46 +08:00
d4e7b00b2b
Update callers to use buildTemplateMobileWithRatType with metered
The method buildTemplateMobileWithRatType is updated to take
metered as a parameter so the callers should be updated to
the new version.

Bug: 183776809
Test: atest FrameworksNetTest
Change-Id: I859514b93705f9ee4f9ae4b0bcddcb61005a78ff
Merged-In: I859514b93705f9ee4f9ae4b0bcddcb61005a78ff

Aaron Huang   commited 2021-10-25 15:22:59 +00:00
6359ebd099
Merge "Add underlying networks into NetworkAgentInfo if any" am: 9c9850b944 am: 6f824bad06
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1829935

Change-Id: I347434b77acfba34c1d05b8e99dca742709a9056

Lucas Lin   authored and   Automerger Merge Worker   commited 2021-10-21 10:03:44 +00:00
ac66638f92
Merge "Add underlying networks into NetworkAgentInfo if any"
Lucas Lin   authored and   Gerrit Code Review   commited 2021-10-21 08:33:29 +00:00
9c9850b944
Merge "Crash bad callers earlier" am: 7a30d04659 am: ad329392a7
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1862335

Change-Id: Ibae0be71adf2a8e3293aa12b4e2e2e570b6896cd

Paul Hu   authored and   Automerger Merge Worker   commited 2021-10-20 07:17:35 +00:00
1259ec8c9a
Crash bad callers earlier
Instead of crashing when parceling the NetworkInfo object,
crash at the time the bad call is made.

Bug: 145972387
Test: FrameworksNetTests
Change-Id: If8b5fd3d7b800c97211bcd16c9a8c5812708d4ab

Chalard Jean   authored and   paulhu   commited 2021-10-19 16:43:50 +08:00
4b918ab1a4
Add underlying networks into NetworkAgentInfo if any
Now, VPN will set underlying networks into NetworkCapabilities
directly. So the declaredUnderlyingNetworks can also be set
directly when creating a NetworkAgentInfo.

Bug: 191918368
Test: atest FrameworksNetTests:ConnectivityServiceTest
Change-Id: I507072d00ae1eb0c391e5261ab93e359b9c4cb5c

lucaslin   commited 2021-10-19 15:04:56 +08:00
6adf5ac19b
Ensure calling package name and uid are matched
CS#requestRouteToHostAddress enforcing change permission doesn't
check whether the calling package belongs to calling uid. This
can be used to check whether package name exists or not without
permission. Thus, add a check to ensure calling package name and
uid are matched.

Bug: 193801134
Test: atest FrameworksNetTests CtsNetTestCases
Ignore-AOSP-First: Security fix
Merged-In: I980f1c68b5321601aa40da29e283fb4dd717d5de
Change-Id: I980f1c68b5321601aa40da29e283fb4dd717d5de
(cherry picked from commit b2c286816d, ag/15618365)

paulhu   authored and   Paul Hu   commited 2021-10-05 02:04:52 +00:00
7b073ebc7a
Merge "Remove "when" usage in ConnectivityServiceTest" am: f697c61406
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1844176

Change-Id: I9197503f4f19748824ab3cc1efc8d540779399ec

Treehugger Robot   authored and   Automerger Merge Worker   commited 2021-10-04 10:00:40 +00:00
7366c89d64
Remove "when" usage in ConnectivityServiceTest
"when" is not thread-safe, as it relies on global state to find which
mock was called with the method to mock in its parameters.

This causes flakes where non-test code that interacts with the mock may
be called from another thread between the contents of "when" and the
"when" method another thread, causing UnfinishedStubbingExceptions or
other test errors. In particular
ConnectivityService#getNetworkCapabilitiesInternal was seen to be
wrongly identified as a mocking site for Dependencies.

Replace all usages with doReturn().when(mock).method() syntax, which has
better thread safety since global state is not necessary to tie the
mock, mocked method and return value.

Bug: 195626111
Test: atest ConnectivityServiceTest
Change-Id: I57c5ffb3b3f799fc59c3af4ccb323fb5d6794fad

Remi NGUYEN VAN   commited 2021-10-04 17:03:44 +09:00
d7331e929f
Merge "Modify Nsd{Service,Manager}Test to conform to its change"
Luke Huang   authored and   Gerrit Code Review   commited 2021-09-29 03:35:20 +00:00
38f82199ab
Merge "Add a mode for cell radios unable to time share" am: c80a5d56db
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1827923

Change-Id: I5ded48c8498c32977adcfe2363599d6cfa246e1b

Chalard Jean   authored and   Automerger Merge Worker   commited 2021-09-18 12:50:52 +00:00
d4ec13a400
Merge "Add a mode for cell radios unable to time share"
Chalard Jean   authored and   Gerrit Code Review   commited 2021-09-18 12:39:24 +00:00
c80a5d56db
Add a mode for cell radios unable to time share
Upon changing the default SIM card, the radio will create a
new connection to the new subscription. If that subscription
works correctly, the stack will prefer it to the old one as
the new subscription will be marked with a Primary policy
flag it its score.

Normally, at this point the old network lingers to give apps
an opportunity to gracefully migrate their connections. But
with some radios, this may have a dramatic effect on the
performance of the new connection.

This patch introduces a flag so that devices with such radios
can be marked. In this case the stack will move to a degraded
mode and eschew the grace delay for apps and give them a hard
break instead, so that the new network can reach a good
performance immediately. Apps with existing connections will
suffer a worse experience.

If there is a request that can only be served by the old
connection, still keep it, as arguably the user still
expects their MMS be sent on the old connection, even if the
new connection doesn't work well until it's done.

Test: new test in this patch, and add relevant tests in both modes
      also manually change the value of the flag and run
      FrameworksNetTests and CtsNetTestCasesLatestSdk
Bug: 200226979
Change-Id: I4ace82f90e873bf06298cc689bb1d794ed5124bd

Chalard Jean   commited 2021-09-18 04:03:13 +00:00
0702f98edc
Merge "Remove ForceAllNetworkTypes from test" am: f7762c823a
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1824632

Change-Id: Ib5ef798b75c473e4e2c62cf295b55e3669508648

Aaron Huang   authored and   Automerger Merge Worker   commited 2021-09-17 12:25:04 +00:00
fed2d0614f
Merge "Remove ForceAllNetworkTypes from test"
Aaron Huang   authored and   Gerrit Code Review   commited 2021-09-17 12:08:59 +00:00
f7762c823a
Merge "Add logging on UnfinishedStubbingException" am: f2ddb4151c
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1805818

Change-Id: Id8aa8e2c460891500b2926b0585edd0bfd972fa9

Treehugger Robot   authored and   Automerger Merge Worker   commited 2021-09-13 02:46:35 +00:00
e41baf1752
Merge "Add logging on UnfinishedStubbingException"
Treehugger Robot   authored and   Gerrit Code Review   commited 2021-09-13 02:34:27 +00:00
f2ddb4151c
Modify Nsd{Service,Manager}Test to conform to its change
(clean cherry-pick from downstream branch)
Test: atest NsdManagerTest NsdServiceTest
Bug: 191844585
Merged-In: I3cf658498bef5755dcb01127a94fff913b6e6298

Change-Id: I3cf658498bef5755dcb01127a94fff913b6e6298

Luke Huang   authored and   Remi NGUYEN VAN   commited 2021-09-13 10:18:04 +09:00
df75378ad4
Remove ForceAllNetworkTypes from test
Before sForceAllNetworkTypes is removed, the network
type and meteredness will be ignored when matchesMobile
or matchesMobileWildcard is called.

After sForceAllNetworkTypes is removed, the matches
method should check the network type and the meteredness.
Thus, if the test data contains different type or it's
not metered should not be counted.

Bug: 183776809
Test: FrameworksNetTests
Change-Id: Ie7194495d26c0f5ef7a247733f43c64688626c67

Aaron Huang   commited 2021-09-11 10:45:16 +08:00
7b4a4cbdd4
Merge "Include suspended network when getAllNetworkStateSnapshots" am: 48426bb2a4
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1797867

Change-Id: I700e16334e0f8aeea862555e8ecf784cf36fd315

Junyu Lai   authored and   Automerger Merge Worker   commited 2021-09-09 09:40:15 +00:00
6f988d4042
Merge "Include suspended network when getAllNetworkStateSnapshots"
Junyu Lai   authored and   Gerrit Code Review   commited 2021-09-09 09:24:04 +00:00
48426bb2a4
Include suspended network when getAllNetworkStateSnapshots
Suspended network should be considered as temporary shortage of
connectivity of a connected network. Thus, it should not be
excluded from network state snapshots and causes data usage to
stop accounting or iptables rules to be removed on the interface
of the suspended network.

This change also address the naming confusion of default networks
parameter of expectNotifyNetworkStatus.

Test: atest ConnectivityServiceTest#testGetAllNetworkStateSnapshots
Bug: 196079981
Change-Id: I8096356f9a472fb1c1246fbdf3fd5f981387fb1c

Junyu Lai   commited 2021-09-08 06:02:28 +00:00
ddecb66246
Merge changes Id2ffb056,I2a4e298b am: 420fa2baef
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1772667

Change-Id: I84acbefcaf5cb95cc208d27caf8a89c0717db94e

Paul Hu   authored and   Automerger Merge Worker   commited 2021-09-07 06:13:41 +00:00
9477c7b5ca
Merge changes Id2ffb056,I2a4e298b
* changes:
  Adjust some behaviors on PermissionMonitorTest
  Use common code

Paul Hu   authored and   Gerrit Code Review   commited 2021-09-07 06:01:54 +00:00
420fa2baef
Merge "Remove a forgotten log" am: 3d872e662e
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1803417

Change-Id: I5714b36c6f0f71887848aa8aa41697fca6c409aa

Chalard Jean   authored and   Automerger Merge Worker   commited 2021-09-07 04:51:49 +00:00
3fe1865b96