Commit Graph

43564 Commits

Author SHA1 Message Date
Remi NGUYEN VAN
27f85f972f Merge changes Iad0b0d52,Iee727308 am: 6eb0654f9b
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1793508

Change-Id: I22e6fd6ea27a7b30a3775f74aa3446cf08a05302
2022-01-12 12:02:21 +00:00
Remi NGUYEN VAN
6eb0654f9b Merge changes Iad0b0d52,Iee727308
* changes:
  Use recording callbacks in NsdManagerTest
  Refactor NsdManagerTest
2022-01-12 11:47:03 +00:00
Remi NGUYEN VAN
0f17237773 Use recording callbacks in NsdManagerTest
Refactor the test to use recording callbacks based on ArrayTrackRecord,
which allow removing the test's own logic to poll for events.

Bug: 190249673
Test: atest NsdManagerTest --rerun-until-failure 20
Change-Id: Iad0b0d52271b13954c0193b3b9d4307349a39443
2022-01-12 15:26:11 +09:00
Maciej Żenczykowski
b15945397c Merge "add prohr to OWNERS_core_networking" am: ca6732df93
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1944924

Change-Id: Ibd698b2b88d66fef723c037b661fdab1d903ed6d
2022-01-11 21:52:46 +00:00
Maciej Żenczykowski
ca6732df93 Merge "add prohr to OWNERS_core_networking" 2022-01-11 21:41:34 +00:00
Patrick Rohr
7d3ceb9dae add prohr to OWNERS_core_networking
Test: TreeHugger
Change-Id: I93ca246578f81351335a580e0555180265c7610b
2022-01-11 18:54:31 +00:00
Chiachang Wang
a460e2e474 Merge "Add test for setting excludeLocalRoutes" am: da13f899e3
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1937330

Change-Id: I5cc037b6377bb71c8a5a3a126821818ef57737ec
2022-01-11 09:13:45 +00:00
Chiachang Wang
da13f899e3 Merge "Add test for setting excludeLocalRoutes" 2022-01-11 08:56:38 +00:00
Remi NGUYEN VAN
eaada07913 Refactor NsdManagerTest
Refactor the test to use Kotlin, and move some repeated code to
submethods.

Bug: 190249673
Test: atest NsdManagerTest
Change-Id: Iee7273080d5d29f1d364ac0a77e017edf9b36051
2022-01-11 12:52:22 +09:00
Treehugger Robot
d132fa0cd0 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 296bbae13c -s ours
am skip reason: subject contains skip directive

Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1943353

Change-Id: Iba18fd722966d4e74bd8c0b764abb1e8013184b2
2022-01-11 01:12:05 +00:00
Treehugger Robot
296bbae13c Merge "Import translations. DO NOT MERGE ANYWHERE" 2022-01-11 00:49:44 +00:00
TreeHugger Robot
00ae342f42 Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master 2022-01-11 00:43:18 +00:00
Bill Yi
c1a1376836 Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: If066bbd12a50e3af9310195ffbaff306e3e29f11
2022-01-10 14:59:11 +00:00
Junyu Lai
665da11c53 Merge "[MS42.2] Adopt TelephonyDisplayInfo in unit test" am: 6a360b5a71
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1938693

Change-Id: I72c3175fe3dce0800051d854928a1227d6f5c225
2022-01-10 12:06:47 +00:00
Junyu Lai
6a360b5a71 Merge "[MS42.2] Adopt TelephonyDisplayInfo in unit test" 2022-01-10 11:43:58 +00:00
Bill Yi
a3c4f8ac63 Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I96478827878b5c8b27c228c7a81ebecd8c62228f
2022-01-10 06:48:25 +00:00
Matt Buckley
e6aed4b035 Merge "Revert^2 "Revert "Add CTS tests for exclude VPN routes APIs""" am: 67197b7ed6
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1941195

Change-Id: I79923b432c049fb8e2cbd42d97f49e78d0631b24
2022-01-07 17:50:51 +00:00
Matt Buckley
67197b7ed6 Merge "Revert^2 "Revert "Add CTS tests for exclude VPN routes APIs""" 2022-01-07 17:48:45 +00:00
Matt Buckley
01d9abecef Revert^2 "Revert "Add CTS tests for exclude VPN routes APIs""
1a6d19e4b8

Change-Id: Ic25e5e4eaf57e033a9304244387e6fba15213d2b
2022-01-07 17:44:52 +00:00
Taras Antoshchuk
b4177c19ea Merge "Revert "Revert "Add CTS tests for exclude VPN routes APIs""" am: b0818dd720
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1931760

Change-Id: I8ad75ca171f00eff1d8a0f9ed3b06b78d3347265
2022-01-07 16:44:00 +00:00
Taras Antoshchuk
b0818dd720 Merge "Revert "Revert "Add CTS tests for exclude VPN routes APIs""" 2022-01-07 16:27:12 +00:00
Treehugger Robot
fc294135ba Merge "[MS39.2] Remove the looper from NetworkStatsSubscriptionMonitor" am: 7d9470ca0b
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1936490

Change-Id: I1458ab6ba83d4ab5fcc36c6fa7fb5ddfde8e04a7
2022-01-07 15:02:37 +00:00
Treehugger Robot
7d9470ca0b Merge "[MS39.2] Remove the looper from NetworkStatsSubscriptionMonitor" 2022-01-07 14:42:52 +00:00
Junyu Lai
31028206da Merge changes from topic "ms17-multipath" am: bc1f44adb0
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1930833

Change-Id: I89f407506bf633fe17d23832192b9f94d8accb68
2022-01-07 14:32:20 +00:00
Junyu Lai
e09d39d37e [MS17.2] Fix remaining daily budget assertion am: eaa58de991
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1930832

Change-Id: Ia9d27be5a7114f547946375efeebd6ea848af351
2022-01-07 14:32:19 +00:00
Junyu Lai
bc1f44adb0 Merge changes from topic "ms17-multipath"
* changes:
  [MS17.3] Remove NetworkStatsManagerInternal dependency
  [MS17.2] Fix remaining daily budget assertion
2022-01-07 14:17:03 +00:00
Siim Sammul
41e2be2aa8 Include "generate_transaction_name" in the aidl build rules for am: cd4c8228bd
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1918669

Change-Id: I40bb8fa0ba1de9804b692318bae113e20e87493e
2022-01-07 11:54:52 +00:00
Junyu Lai
50a8f07132 [MS42.2] Adopt TelephonyDisplayInfo in unit test
Test: atest NetworkStatsSubscriptionsMonitorTest
Fix: 213021103

Change-Id: Ib6b472a095a6ae92a2574c1ea2d382e1c2699d57
2022-01-07 06:45:56 +00:00
Junyu Lai
0e9c51ca5c [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
2022-01-07 06:45:56 +00:00
Junyu Lai
eaa58de991 [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
2022-01-07 06:45:56 +00:00
Junyu Lai
3cb8fe8c66 [MS17.3] Remove NetworkStatsManagerInternal dependency
Test: atest MultipathPolicyTrackerTest
Bug: 204830222

Change-Id: I219e963124b8fa0967ea08f2f047f7c654ab4a04
2022-01-07 06:45:56 +00:00
Chiachang Wang
b4a319bf24 Add test for setting excludeLocalRoutes
Bug: 184750836
Test: atest FrameworksNetTests
Change-Id: I4e79467ce7afcf07f4b8d7f964a605703a6d2c5e
2022-01-07 09:39:43 +08:00
Siim Sammul
cd4c8228bd Include "generate_transaction_name" in the aidl build rules for
Connectivity as otherwise method names are not visible in the collected
binder latency data.

Test: N/A
Bug: 208515821
Change-Id: I0e6c6dcd4663f0abe473d39f7de4c718ac3fb66f
2022-01-06 15:21:13 +00:00
Junyu Lai
89d6bdf330 Merge "[MS32.2] Remove TetheringManager#ACTION_TETHER_STATE_CHANGED usage" am: 392161e651
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1935967

Change-Id: I50d2557ea2280947bdfaba097c68eefdcae767a9
2022-01-06 14:04:04 +00:00
Junyu Lai
13f0d24647 Merge "[MS34.2] Replace TelephonyManager#getSubscriberId(subId) with public API" am: 38e0582797
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1935970

Change-Id: I480abeaeb984f4fdfbeac006ab88cb9357e42fa5
2022-01-06 14:02:58 +00:00
Junyu Lai
392161e651 Merge "[MS32.2] Remove TetheringManager#ACTION_TETHER_STATE_CHANGED usage" 2022-01-06 13:57:12 +00:00
Junyu Lai
38e0582797 Merge "[MS34.2] Replace TelephonyManager#getSubscriberId(subId) with public API" 2022-01-06 13:56:39 +00:00
James Mattis
241bbaddf3 Update to ConnectivityService to use utils am: 4ab1ffca29
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1934218

Change-Id: I7c7ad0a9e797ad6c279fe97c66211854d061dfea
2022-01-06 04:32:48 +00:00
James Mattis
4ab1ffca29 Update to ConnectivityService to use utils
Update to ConnectivityService to use permission utils to validate the
existence of a system feature.

Bug: 210485380
Test: atest FrameworksNetTests:
com.android.server.ConnectivityServiceTest

Change-Id: Ia537cc5b37ef8d80f49f1a83ba572b3b8a9f6874
2022-01-05 09:15:24 -08:00
Taras Antoshchuk
1a6d19e4b8 Revert "Revert "Add CTS tests for exclude VPN routes APIs""
This reverts commit f4882153ed.

Reason for revert: failing build target configuration is fixed

Change-Id: Ic8ed8fce72a1c816ee6766f296efaddeafcd2f70
2022-01-05 14:00:25 +01:00
Treehugger Robot
ac65d203f0 Merge "[MS33.2] Remove NetdService dependency" am: ee7ca130dc
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1935969

Change-Id: I35fb80fc8cfb90760be7b11f58c1a7746c417c44
2022-01-05 11:01:20 +00:00
Treehugger Robot
ee7ca130dc Merge "[MS33.2] Remove NetdService dependency" 2022-01-05 10:39:13 +00:00
Junyu Lai
a9b4fa7248 [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
2022-01-05 05:31:05 +00:00
Junyu Lai
851fb24667 [MS34.2] Replace TelephonyManager#getSubscriberId(subId) with public API
Test: atest com.android.server.net.NetworkStatsSubscriptionsMonitorTest
Bug: 204830222
Change-Id: I53cdf9a83a38ea6921bff02be48bc14a4012ba36
2022-01-05 05:31:05 +00:00
Junyu Lai
37880f857a [MS33.2] Remove NetdService dependency
This change pass INetd to NetworkStatsFactory to replace
NetdService#getNetdInstance.

Test: atest FrameworksNetTests
Bug: 204830222
Change-Id: I0756188adb394fa5343c8d2ae354567df63acf21
2022-01-05 05:30:39 +00:00
lucaslin
0be0f9dc54 Caps callback should be called when underlying networks are changed am: 36faae95ba
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1838424

Change-Id: I1fb110a8e4e3c9a1665b978b08b6697910371789
2022-01-05 03:44:37 +00:00
lucaslin
36faae95ba Caps callback should be called when underlying networks are changed
Add a test to check if onCapabilitiesChanged will be called when
the underlying networks are changed.

Bug: 191918368
Test: atest CtsHostsideNetworkTests:HostsideVpnTests
Change-Id: I8dfb16e01199d41b1b65f69e129ec40e37f9ab0f
2022-01-04 15:27:11 +08:00
Treehugger Robot
86d23e7da9 Merge "[MS25.2] Remove AppOpsManager.OP_GET_USAGE_STATS dependency" am: 90cf8dbd92
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1934184

Change-Id: I45c8eb61ae26e4a0fd22980c259406f2c09a0331
2022-01-03 23:00:36 +00:00
Treehugger Robot
90cf8dbd92 Merge "[MS25.2] Remove AppOpsManager.OP_GET_USAGE_STATS dependency" 2022-01-03 22:41:30 +00:00
Treehugger Robot
8003834727 Merge "Add tethering IPv4 UDP forwarding test" am: 76bc75f0a2
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1843121

Change-Id: I3a2cee7185a970c045a006c4a548c19b184896c8
2022-01-03 13:55:21 +00:00