Commit graph android_packages_modules_Co.../tests/unit/java/com
Message SHA1
Merge "Update the SDK for the tests with intended target in T+"
Chiachang Wang   authored and   Gerrit Code Review   commited 2022-01-21 06:34:29 +00:00
b04664d7a6
[MS41.2] Add unit test for query history APIs
Test: atest NetworkStatsServiceTest NetworkStatsManagerTest
Bug: 204830222
Bug: 200768422
Change-Id: I1dce7d671c5524496e0451665f62447ef6e454ae

Junyu Lai   commited 2022-01-20 15:06:50 +00:00
7372824eca
Update the SDK for the tests with intended target in T+
Correct the SDK for those tests are expected running in T+
device. Check @IgnoreUpTo(S) may be incorrect after receiving
patches before T release.

Refer to temporary constant definition in DevSdkIgnoreRule until
the SDK constant being pushed into AOSP and synced with branch
used for mainline.

BUg: 215294242
Test: atest CtsNetTestCases CtsNetTestCasesLatestSdk
Change-Id: Ide6a241f7944dd1e75bc33b21aa29471a5df94c6

Chiachang Wang   commited 2022-01-20 10:30:19 +08:00
7212fbee14
[DU03-2]Remove INetworkStatsService from BatteryStatsImpl
Correct the NetworkStatsServiceTest

BatteryStatsImpl is using INetworkStatsService APIs, which
cannot be accessed after moving into the mainline module. So, replace
and remove those hidden API usages.

Bug: 210066922
Test: atest BatteryStatsImplTest WifiPowerCalculatorTest
            MobileRadioPowerCalculatorTest NetworkStatsServiceTest
CTS-Coverage-Bug: 213437796
Change-Id: I47dc377a5cce7d8a0029dc808ad0f46e651764b1

Frank   commited 2022-01-20 00:15:55 +08:00
9ef027c2f5
Merge "Ability for DPM to specify fallback mechanism" am: 226131ab48 am: 5854b40065
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1905550

Change-Id: I4d0da31854a555f3d8e039bee61fd44e0c13e03e

Sooraj Sasindran   authored and   Automerger Merge Worker   commited 2022-01-13 17:50:43 +00:00
ae47e9143e
Merge "[DU01]Remove INetworkManagementService from NetworkStatsService" am: 231503a08c am: 9f903bfa01
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1925678

Change-Id: Ib6057fcdcfd2013637486de95d092c8ea77e2f66

Frank Li   authored and   Automerger Merge Worker   commited 2022-01-13 06:11:17 +00:00
27fb34c2d0
Ability for DPM to specify fallback mechanism
Bug: 194332512
Test: unit test
Change-Id: Id4d85da8f64e7559326c4657b8833dac3ce5ce3d

Sooraj Sasindran   commited 2022-01-13 06:07:36 +00:00
06baf4cfa1
Merge "[DU01]Remove INetworkManagementService from NetworkStatsService"
Frank Li   authored and   Gerrit Code Review   commited 2022-01-13 05:45:42 +00:00
231503a08c
Merge "Add excludeLocalRoutes in NativeNetworkConfig" am: e52be3b59f am: 6571c82556
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1944725

Change-Id: I9b9ae0fc67509766c63300966469382bd62a331b

Chiachang Wang   authored and   Automerger Merge Worker   commited 2022-01-13 01:27:09 +00:00
ec42cfc39e
Merge "Add excludeLocalRoutes in NativeNetworkConfig"
Chiachang Wang   authored and   Gerrit Code Review   commited 2022-01-13 00:57:49 +00:00
e52be3b59f
Add excludeLocalRoutes in NativeNetworkConfig
Add extra field in NativeNetworkConfig to allow CS to notify
netd whether the local traffic should be excluded from the VPN
network.

Bug: 184750836
Test: atest FrameworksNetworkTests
Change-Id: If230fe7057722c80a09433673ac3cec857f7a7a5

Chiachang Wang   commited 2022-01-11 11:33:44 +08:00
bf6b879b55
Merge "[MS42.2] Adopt TelephonyDisplayInfo in unit test" am: 6a360b5a71 am: 665da11c53
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1938693

Change-Id: I8540010df5ba0e714d17d6b8b19359489de5a31e

Junyu Lai   authored and   Automerger Merge Worker   commited 2022-01-10 12:21:09 +00:00
b7396ea9bf
[DU01]Remove INetworkManagementService from NetworkStatsService
NetworkStatsService is using INetworkManagementService APIs, which
cannot be accessed after moving into the mainline module. So, replace
and remove those hidden API usages.

Bug: 209738761
Test: atest NetworkStatsServiceTest
Change-Id: Ieda3c3382fa61411587c5b390bbecb2a2524844b

lifr   commited 2022-01-08 01:33:36 +08:00
214714285a
Merge "[MS39.2] Remove the looper from NetworkStatsSubscriptionMonitor" am: 7d9470ca0b am: fc294135ba
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1936490

Change-Id: I4349dd3fe4ef291df4c0a77a23a8a8dc30f9e06a

Treehugger Robot   authored and   Automerger Merge Worker   commited 2022-01-07 15:57:30 +00:00
c6cb899865
Merge changes from topic "ms17-multipath" am: bc1f44adb0 am: 31028206da
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1930833

Change-Id: I9263c1ede3fd0558c269ce0aeb5acd941f971860

Junyu Lai   authored and   Automerger Merge Worker   commited 2022-01-07 15:57:06 +00:00
c412b621ce
[MS17.2] Fix remaining daily budget assertion am: eaa58de991 am: e09d39d37e
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1930832

Change-Id: Id8834e89326119fac5bbf10b94d6e62b8e5eb1f8

Junyu Lai   authored and   Automerger Merge Worker   commited 2022-01-07 15:57:04 +00:00
7cec348cd4
[MS42.2] Adopt TelephonyDisplayInfo in unit test
Test: atest NetworkStatsSubscriptionsMonitorTest
Fix: 213021103

Change-Id: Ib6b472a095a6ae92a2574c1ea2d382e1c2699d57

Junyu Lai   commited 2022-01-07 06:45:56 +00:00
50a8f07132
[MS39.2] Remove the looper from NetworkStatsSubscriptionMonitor
OnSubscriptionsChangedListenerHandler(Looper looper) is
hidden, there is no way to pass a looper to it in the test.
This change partially revert aosp/1340040 to fix hidden
API dependency. And will use a different approach to address
this problem in later stages.

Test: atest NetworkStatsSubscriptionMonitorTest
Bug: 204830222
Bug: 213280079
Change-Id: Ie17f04cd9f174f2895bde4607bbd7a9a92181a96

Junyu Lai   commited 2022-01-07 06:45:56 +00:00
0e9c51ca5c
[MS17.2] Fix remaining daily budget assertion
Currently, the test didn't mock data usage of the month.
Thus, when asserting remaining budget, the calculation
always assumes there is no used data, hence wrong budget
value is expected. See #getRemainingDailyBudget.

This change makes data usage of this month includes the
bytes used today. And adjust the policy limit accordingly.

Test: atest MultipathPolicyTrackerTest
Bug: 204830222
Change-Id: I3ca6505f8d502047485ba3676f16fbc474117cc1

Junyu Lai   commited 2022-01-07 06:45:56 +00:00
eaa58de991
[MS17.3] Remove NetworkStatsManagerInternal dependency
Test: atest MultipathPolicyTrackerTest
Bug: 204830222

Change-Id: I219e963124b8fa0967ea08f2f047f7c654ab4a04

Junyu Lai   commited 2022-01-07 06:45:56 +00:00
3cb8fe8c66
Merge "[MS32.2] Remove TetheringManager#ACTION_TETHER_STATE_CHANGED usage" am: 392161e651 am: 89d6bdf330
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1935967

Change-Id: I3ab051c2745baab3081cbeb91daf5d10aaee168c

Junyu Lai   authored and   Automerger Merge Worker   commited 2022-01-06 14:09:50 +00:00
5bdd14b848
Merge "[MS34.2] Replace TelephonyManager#getSubscriberId(subId) with public API" am: 38e0582797 am: 13f0d24647
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1935970

Change-Id: Ibc05a4867e8ed2722352245e383313dba02448ff

Junyu Lai   authored and   Automerger Merge Worker   commited 2022-01-06 14:09:31 +00:00
1b69ac1a18
Merge "[MS33.2] Remove NetdService dependency" am: ee7ca130dc am: ac65d203f0
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1935969

Change-Id: Ib124d7c4a4be5274b504946640c4a9ec1c5fbd3f

Treehugger Robot   authored and   Automerger Merge Worker   commited 2022-01-05 11:17:43 +00:00
55180757fb
[MS32.2] Remove TetheringManager#ACTION_TETHER_STATE_CHANGED usage
Replace intent receiver with callback listener.

Test: atest com.android.server.net.NetworkStatsServiceTest
Bug: 204830222
Change-Id: I07ef87b08b5d177719a82f79a2866d72b003fb5a

Junyu Lai   commited 2022-01-05 05:31:05 +00:00
a9b4fa7248
[MS34.2] Replace TelephonyManager#getSubscriberId(subId) with public API
Test: atest com.android.server.net.NetworkStatsSubscriptionsMonitorTest
Bug: 204830222
Change-Id: I53cdf9a83a38ea6921bff02be48bc14a4012ba36

Junyu Lai   commited 2022-01-05 05:31:05 +00:00
851fb24667
[MS33.2] Remove NetdService dependency
This change pass INetd to NetworkStatsFactory to replace
NetdService#getNetdInstance.

Test: atest FrameworksNetTests
Bug: 204830222
Change-Id: I0756188adb394fa5343c8d2ae354567df63acf21

Junyu Lai   commited 2022-01-05 05:30:39 +00:00
37880f857a
Merge "wifi data usage: replaced Wi-Fi SSID with a Wi-Fi network key" am: 719ce67677 am: 28df48c743
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1916599

Change-Id: Id57ddf598a0b5ef3ab5102f2cd4da6f50cac67a4

Les Lee   authored and   Automerger Merge Worker   commited 2022-01-03 12:55:11 +00:00
fe44c47335
Merge "wifi data usage: replaced Wi-Fi SSID with a Wi-Fi network key"
Les Lee   authored and   Gerrit Code Review   commited 2022-01-03 12:36:49 +00:00
719ce67677
wifi data usage: replaced Wi-Fi SSID with a Wi-Fi network key
1. Used SSID to be a wifi network identity can't separate wifi
data usage when there are two different network with same SSID.
Use a new usage key from in WifiInfo to replace wifi SSID to
solve this issue.

2. To support to query wifi usage per configured Wifi network.
Adding matchWifiNetworkKeys in NetworkTemplate to support querying
multi networkKeys wifi data usage since each configured Wifi
network configuration might be used to connect different Wifi
network.

a. Replaced wording SSID with key of the wifi network
b. Add mock to handle get wifi network key from WifiInfo
c. Add null/empty set unit test to verify matchWifiNetworkKeys

Bug: 197520752
Bug: 126299427
Test: atest -c NetworkTemplateTest
Test: atest -c NetworkStatsServiceTest
Test: atest -c NetworkPolicyManagerServiceTest
Change-Id: Id7d66f6548dd1b4e657db8d7427213293618b406

Les Lee   commited 2022-01-03 15:13:45 +08:00
c728c36ca7
Merge "Allow VPN network agent to exclude local traffic" am: a7b3d00968 am: 3ded8323ea
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1927018

Change-Id: I4a7d56abb55dee7c95aaa5584f6273504f0aa16c

Chiachang Wang   authored and   Automerger Merge Worker   commited 2021-12-28 08:09:40 +00:00
6a0d0c5579
Merge "Allow VPN network agent to exclude local traffic"
Chiachang Wang   authored and   Gerrit Code Review   commited 2021-12-28 07:45:20 +00:00
a7b3d00968
Allow VPN network agent to exclude local traffic
Add API to allow network agent to set whether the local traffic
is excluded from the network. This commit is nonfunctional
currently but only storing the boolean inside the NAI.

Bug: 184750836
Test: atest FrameworksNetTests
Change-Id: I3799216ac8fdf22eb4bcabc6c6136d8edbf69360

Chiachang Wang   commited 2021-12-28 11:13:21 +08:00
bb754d6cc5
[conflict] Merge "Add test for Vpn#prepare()" into sc-dev am: f89a629776 am: 66737a8c5d
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/15606164

Lucas Lin   commited 2021-12-23 13:13:29 +00:00
7db5f91856
Merge "Add test for Vpn#prepare()" into sc-dev am: f89a629776
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/15606164

Change-Id: I6b9024a183cefba4ce7173650d78c61ee60c9ec2

Lucas Lin   authored and   Automerger Merge Worker   commited 2021-12-23 12:32:09 +00:00
66737a8c5d
Merge "[MS15.2] Move SUBSCRIBER_ID_MATCH_RULE_* constants to static lib"
Junyu Lai   authored and   Gerrit Code Review   commited 2021-12-23 01:35:00 +00:00
78d36d7653
[MS15.2] Move SUBSCRIBER_ID_MATCH_RULE_* constants to static lib
Subscriber Id Match Rules won't be exposed as system Api.
Any caller who references NetworkTemplate#SUBSCRIBER_ID_MATCH_RULE_*
should use the one in NetworkStatsUtils instead.
And remove the need of the constants as soon as possible.

Test: atest NetworkPolicyManagerServiceTest \
      FrameworksNetTests
Bug: 204830222
Change-Id: I363a4440f85f1ca818eaf1125e45b141dd6f0e55

Junyu Lai   commited 2021-12-22 09:41:29 +00:00
07c772cf49
Add test for Vpn#prepare()
Add test for Vpn#prepare() to check if the SecurityException will
be thrown when the caller is not the SYSTEM_UID and doesn't have
CONTROL_VPN permission and its package doesn't match the oldPackage
or the newPackage.

Ignore-AOSP-First: It's a part of security patches.
Bug: 191276656
Test: atest FrameworksNetTests:VpnTest
Change-Id: Ibe0b245561b00442a6377fb849603f8b9026e9c4
Merged-In: Ibe0b245561b00442a6377fb849603f8b9026e9c4

lucaslin   authored and   Lucas Lin   commited 2021-12-22 07:03:31 +00:00
f76481568d
Added a new network capability MMTEL
Added NET_CAPABILITY_MMTEL to indicate a network
support MMTEL (Multimedia telephony). This is for
IMS service to request an IMS network that supports
voice or PS (VoPS for 4G, VoNR for 5G).

This was previously submitted as aosp/1927841, but
which got reverted due to breaking the mainline
build, which uses the pre-built module.

Bug: 210774375
Test: atest ConnectivityServiceTest
Change-Id: If8b691ff4999a4dbf54e7567d9ca74d743dc5ded

Jack Yu   commited 2021-12-21 16:31:30 +00:00
04bbc5b9b0
Revert "Added a new network capability MMTEL"
Revert "Added setup/tear down data support"

Revert "Added a new network capability MMTEL"

Revert submission 1927643-mmtel_capability

Reason for revert: b/211586152
Reverted Changes:
Ifea8b1e40:Added a new network capability MMTEL
I38655bef2:Added a new network capability MMTEL
I837606d9e:Added setup/tear down data support
I2c7b291fe:Added a new network capability MMTEL

Change-Id: Ie9b0b0d9017ef8aea7fbb56dda522e7c433144b9

Martijn Coenen   commited 2021-12-21 11:24:01 +00:00
6ebc8ba595
Added a new network capability MMTEL
Added NET_CAPABILITY_MMTEL to indicate a network
support MMTEL (Multimedia telephony). This is for
IMS service to request an IMS network that supports
voice or PS (VoPS for 4G, VoNR for 5G).

Bug: 210774375
Test: atest ConnectivityServiceTest
Change-Id: Ifea8b1e40f65c610e925a27be873930fee2df693

Jack Yu   commited 2021-12-16 14:38:10 -08:00
f322d4f5e0
Merge "Add makeDependencies method in IpSecService related tests"
Aaron Huang   authored and   Gerrit Code Review   commited 2021-12-16 12:32:41 +00:00
3c1e7398a4
Merge "Change to use Dependencies in IpSecService Tests"
Aaron Huang   authored and   Gerrit Code Review   commited 2021-12-15 07:53:23 +00:00
286c0e5336
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: I3d84b1a82e07a9b4a56ddc88f3f81d875870517c

Treehugger Robot   authored and   Automerger Merge Worker   commited 2021-12-10 18:57:07 +00:00
a9656625d2
Add makeDependencies method in IpSecService related tests
Bug: 204153604
Test: FrameworksNetTest
Change-Id: Iea5731273e4772966466088f11a4c6334fa19f5d

Aaron Huang   commited 2021-12-10 12:11:20 +00:00
9792b5b5e6
[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
Move f/b/packages/Nsd files to f/b/packages/ConnectivityT
Move Nsd files to ConnectivityT so that nsd, ipsec,
ethernet and netstats files can live in the same
directory and it will be easier to move everything
in frameworks/base/packages/ConnectivityT to
packages/modules/Connectivity after fixing all of the
hidden API usages.

Bug: 204153604
Test: FrameworksNetTests
      CtsNetTestCases
Change-Id: I411e242e8739d15920cfc2fe274115f7f39bd89f

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

Change-Id: Id2ff4ca8c54ea88966d78d4000384ea4aa780ad4

Paul Hu   authored and   Automerger Merge Worker   commited 2021-12-07 06:01:16 +00:00
b8c0a764bd
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: Ibff437f91017017cc6fcc7e456e621e2ad81995a

Paul Hu   authored and   Automerger Merge Worker   commited 2021-11-29 03:45:46 +00:00
b0a10cd127
Change to use Dependencies in IpSecService Tests
The interface IpSecServiceConfiguration is refactored to static
class Dependencies. Refine the tests to use Dependencies.

Bug: 204153604
Test: FrameworksNetTests
Change-Id: Ie2b79b1d948a19f64600ed9ea3b60b192dd92dfd

Aaron Huang   commited 2021-11-27 00:27:33 +08:00
ced49fd763