Commit Graph

43578 Commits

Author SHA1 Message Date
Treehugger Robot
2ef917c320 Merge "Bump tethering target sdk version to 31" am: 0d4f956b34
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1879617

Change-Id: I6f58b5bbb7c217a570217a98e6ab28a8d3c3b7e2
2022-01-13 05:15:27 +00:00
Treehugger Robot
0d4f956b34 Merge "Bump tethering target sdk version to 31" 2022-01-13 05:00:02 +00:00
Treehugger Robot
cee1df1245 Merge "Add a method to apply a set of network preferences to a user profile" am: 296a343528
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1904410

Change-Id: I3c6f70a6e51599a3792082ddb0da3d76e649e5ec
2022-01-13 04:21:05 +00:00
Treehugger Robot
296a343528 Merge "Add a method to apply a set of network preferences to a user profile" 2022-01-13 04:08:34 +00:00
Chiachang Wang
6571c82556 Merge "Add excludeLocalRoutes in NativeNetworkConfig" am: e52be3b59f
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1944725

Change-Id: I21f27620f3d41ef00862063ae0a349a815e09f2e
2022-01-13 01:15:47 +00:00
Chiachang Wang
e52be3b59f Merge "Add excludeLocalRoutes in NativeNetworkConfig" 2022-01-13 00:57:49 +00:00
Filip Zakrzewski
f21f17a142 Test mapping imports for ethernet am: 8a5823db30
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1941273

Change-Id: Ib899be92d049f80691bf7adeb66a6f7c7ad25a41
2022-01-12 21:42:14 +00:00
Filip Zakrzewski
8a5823db30 Test mapping imports for ethernet
Bug: 209505060

Change-Id: Icd74c2fbd9f3c5fc7e59679bb5b99950d8cdb820
2022-01-12 17:43:55 +00:00
Taras Antoshchuk
9fca863584 Merge "Revert "Revert^2 "Revert "Add CTS tests for exclude VPN routes A..."" am: e4f2b591de
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1941233

Change-Id: Ia6a71c1db14669366dc0e47b9ad5b6a630428f87
2022-01-12 15:46:56 +00:00
Taras Antoshchuk
e4f2b591de Merge "Revert "Revert^2 "Revert "Add CTS tests for exclude VPN routes A..."" 2022-01-12 15:27:30 +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
markchien
bf62258f8c Bump tethering target sdk version to 31
Also add BLUETOOTH_CONNECT permission which is needed for access
PanService if target sdk 31+. The permission would be granted to
privilege application without prompt.

Also remove the min_sdk_version 29 from AndroidManifest because it is
useless that the Android.bp already define min_sdk_version 30.

$aapt dump xmltree TetheringNext.apk AndroidManifest.xml
N: android=http://schemas.android.com/apk/res/android
  E: manifest (line=19)
    A: android:sharedUserId(0x0101000b)="android.uid.networkstack" (Raw: "android.uid.networkstack")
    A: android:versionCode(0x0101021b)=(type 0x10)0x1f
    A: android:versionName(0x0101021c)="Tiramisu" (Raw: "Tiramisu")
    A: android:compileSdkVersion(0x01010572)=(type 0x10)0x1f
    A: android:compileSdkVersionCodename(0x01010573)="Tiramisu" (Raw: "Tiramisu")
    A: package="com.android.networkstack.tethering" (Raw: "com.android.networkstack.tethering")
    A: platformBuildVersionCode=(type 0x10)0x1f
    A: platformBuildVersionName="Tiramisu" (Raw: "Tiramisu")
    E: uses-sdk (line=23)
      A: android:minSdkVersion(0x0101020c)=(type 0x10)0x1e
      A: android:targetSdkVersion(0x01010270)=(type 0x10)0x1f
    ....
    E: uses-permission (line=35)
      A: android:name(0x01010003)="android.permission.BLUETOOTH_CONNECT" (Raw: "android.permission.BLUETOOTH_CONNECT")

Bug: 204265450
Test: manual testing bluetooth tethering and TH
Change-Id: I6f821020679b9379cada29f6f0816187545a24fb
2022-01-12 07:24:16 +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
Sooraj Sasindran
e7aee2736e Add a method to apply a set of network preferences to a user profile
Add a method to apply a set of network preferences to a user profile

Bug: 194332512
CTS-Coverage-Bug: 211133973
Test: CTS
Change-Id: I97730ea14e7c96922236fd77a591e5acadd875ba
2022-01-11 21:07:23 -08: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
Chiachang Wang
bf6b879b55 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
2022-01-11 11:33:44 +08: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
Taras Antoshchuk
d9ba74953b Revert "Revert^2 "Revert "Add CTS tests for exclude VPN routes A..."
Revert "Revert "Revert "Revert "Add APIs that allow to exclude r..."

Revert "Revert "Revert "Revert "Add VpnServiceBuilderShim for Vp..."

Revert submission 1941195-revert-1931760-reland-vpn-impl-part-2-WGARECSJEM

Reason for revert: fixed merge conflict with aosp/1938197
Reverted Changes:
Ic25e5e4ea:Revert^2 "Revert "Add CTS tests for exclude VPN ro...
Ic72cafcf5:Revert "Revert "Revert "Add APIs that allow to exc...
I53802190a:Revert "Revert "Revert "Add VpnServiceBuilderShim ...

Change-Id: I5a6ceaae21c563de8bb71338c29973f58178b456
2022-01-10 10:20:46 +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