Commit Graph

43752 Commits

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

Change-Id: I61ed3eabd942af24f499605cfe5c5b9c883bfe7a
2022-01-12 12:21:24 +00:00
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
85b1837b21 Merge "add prohr to OWNERS_core_networking" am: ca6732df93 am: b15945397c
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1944924

Change-Id: I8b6b186b4d56a75fb2074dea797b3813f84d03be
2022-01-11 22:11:40 +00: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
ab58f0c4c2 Merge "Add test for setting excludeLocalRoutes" am: da13f899e3 am: a460e2e474
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1937330

Change-Id: I3072bab23bae32c1182096cb566529a6a3594778
2022-01-11 09:33:29 +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
ca5aa787e1 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 296bbae13c -s ours am: d132fa0cd0 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I22af24f6e769690ded0f17e9d37d8b6a46d13904
2022-01-11 01:35:40 +00: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
8bbb210f6d [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master am: 00ae342f42 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ic6e30a5763a0d5b1b37d511d54f64fa9e1679a45
2022-01-11 01:03:07 +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
b7396ea9bf 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
2022-01-10 12:21:09 +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
Bill Yi
95ab039647 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 725bc31d29 -s ours am: da274ec5f2 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I38e37397afe5f9f19c7d91bc5c13e13c865f7e92
2022-01-09 05:46:05 +00:00
Bill Yi
70ef817581 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: be8fc3803d -s ours
am skip reason: subject contains skip directive

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

Change-Id: I1027739eb07645c8edda8cdfcb938a869a67f0a4
2022-01-09 05:44:44 +00:00
Bill Yi
da274ec5f2 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 725bc31d29 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I645bffdbf496e0cbefd815b17be8b6d5ec4756c5
2022-01-09 05:43:54 +00:00
Bill Yi
be8fc3803d Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: Ia09c81abfe90e4e54d11228e4b56d4a671902985
2022-01-08 05:14:29 +00:00
Bill Yi
725bc31d29 Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I85fdf0d1af82a8e41bcbb85f9e7addcb97ab7be6
2022-01-08 05:13:16 +00:00
Matt Buckley
fb982983ce Merge "Revert^2 "Revert "Add CTS tests for exclude VPN routes APIs""" am: 67197b7ed6 am: e6aed4b035
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1941195

Change-Id: Ib6f4c89516ac4c936a89b640b57d381ce255b2ba
2022-01-07 18:17:35 +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
60e77a6b52 Merge "Revert "Revert "Add CTS tests for exclude VPN routes APIs""" am: b0818dd720 am: b4177c19ea
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1931760

Change-Id: I3467cb48023c7da6de571920bb52e2bc9cf289ad
2022-01-07 17:05:55 +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
c6cb899865 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
2022-01-07 15:57:30 +00:00
Junyu Lai
c412b621ce 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
2022-01-07 15:57:06 +00:00
Junyu Lai
7cec348cd4 [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
2022-01-07 15:57:04 +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
0424edbecf Include "generate_transaction_name" in the aidl build rules for am: cd4c8228bd am: 41e2be2aa8
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1918669

Change-Id: I8ae1bf9e30ebce2a9f2ef7d9c288745453416b49
2022-01-07 12:08:34 +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