Commit graph

46,595 commits

Message SHA1
Merge "[MS59.2] Add unit test for NetworkStatsDataMigrationUtils" am: bfdd0f3c3c am: 9d39295472 am: 63b0335dae
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1958907

Change-Id: Ic46d1472184faea9af7e6361b6e15a0ececed171

Junyu Lai   authored and   Automerger Merge Worker   commited 2022-01-27 09:46:12 +00:00
1f00085fa3
Merge "[MS59.2] Add unit test for NetworkStatsDataMigrationUtils" am: bfdd0f3c3c am: 9d39295472
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1958907

Change-Id: I8b64c94d74345d9f579444e7de2b680a7ee7aea6

Junyu Lai   authored and   Automerger Merge Worker   commited 2022-01-27 09:24:11 +00:00
63b0335dae
Merge "[MS59.2] Add unit test for NetworkStatsDataMigrationUtils" am: bfdd0f3c3c
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1958907

Change-Id: I6c3b880f83f1af42ca65ee6b0171c2d223fedfb2

Junyu Lai   authored and   Automerger Merge Worker   commited 2022-01-27 09:23:50 +00:00
9d39295472
Merge "[MS59.2] Add unit test for NetworkStatsDataMigrationUtils"
Junyu Lai   authored and   Gerrit Code Review   commited 2022-01-27 09:20:10 +00:00
bfdd0f3c3c
Merge "Change NETWORK_TYPE_5G_NSA reference package" am: 85a2ef3dd5 am: 7cac3f3286 am: 60942b60eb
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1961305

Change-Id: I3609e75c518400178e234aa3c78684abba495d50

Aaron Huang   authored and   Automerger Merge Worker   commited 2022-01-27 09:16:19 +00:00
4d4f045196
Merge "Change NETWORK_TYPE_5G_NSA reference package" am: 85a2ef3dd5 am: 7cac3f3286
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1961305

Change-Id: I6f6fd8fbdf1d95db20f3c28226947304726dc8b9

Aaron Huang   authored and   Automerger Merge Worker   commited 2022-01-27 08:59:03 +00:00
60942b60eb
Merge "Change NETWORK_TYPE_5G_NSA reference package" am: 85a2ef3dd5
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1961305

Change-Id: Id6bfe506a96e2abeae8a3f6dd1c61f4b4873e397

Aaron Huang   authored and   Automerger Merge Worker   commited 2022-01-27 08:40:35 +00:00
7cac3f3286
Merge "Change NETWORK_TYPE_5G_NSA reference package"
Aaron Huang   authored and   Gerrit Code Review   commited 2022-01-27 08:36:23 +00:00
85a2ef3dd5
Merge "Use the network stack shims in services connectivity" am: 6c24db946d am: 46ff4399f6 am: ebc5e3f474
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1961300

Change-Id: Ic5082fd7a7829fa2e70dd424980bcc132890c55c

Jean Chalard   authored and   Automerger Merge Worker   commited 2022-01-27 08:19:14 +00:00
45e43b3633
Merge "Use the network stack shims in services connectivity" am: 6c24db946d am: 46ff4399f6
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1961300

Change-Id: I2a51baad1b5bec4cbbdbc5e93a6c773d20366cbd

Jean Chalard   authored and   Automerger Merge Worker   commited 2022-01-27 08:07:40 +00:00
ebc5e3f474
Merge "Use the network stack shims in services connectivity" am: 6c24db946d
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1961300

Change-Id: Ie1afdd8c586a1060db72447db7de8b264d73a621

Jean Chalard   authored and   Automerger Merge Worker   commited 2022-01-27 07:54:53 +00:00
46ff4399f6
Merge "Use the network stack shims in services connectivity"
Jean Chalard   authored and   Gerrit Code Review   commited 2022-01-27 07:36:53 +00:00
6c24db946d
Merge "Add getEnterpriseId api to network request" am: 71c9ca453d am: fc539a07ca am: 522f7ac0e2
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1960884

Change-Id: I59f08e1e614355425e82ecbd3fd700f713535ab4

Sooraj Sasindran   authored and   Automerger Merge Worker   commited 2022-01-27 06:30:20 +00:00
92fe558859
Merge "Adding bt dependency" am: d97f3a1901 am: e4383b7095 am: f04d176df8
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1960370

Change-Id: I6b866db31b41e948c38397fd831e7d03698b7f5b

Rahul Sabnis   authored and   Automerger Merge Worker   commited 2022-01-27 06:19:22 +00:00
163dfea637
Merge "Add getEnterpriseId api to network request" am: 71c9ca453d am: fc539a07ca
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1960884

Change-Id: Icd04e3533b257e06adbc0e32d0a4ec0426335e4d

Sooraj Sasindran   authored and   Automerger Merge Worker   commited 2022-01-27 06:14:19 +00:00
522f7ac0e2
Merge "Adding bt dependency" am: d97f3a1901 am: e4383b7095
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1960370

Change-Id: I55cdd8379cafe929fa7915cba86e7ce7bcfaf523

Rahul Sabnis   authored and   Automerger Merge Worker   commited 2022-01-27 06:13:57 +00:00
f04d176df8
Merge "Add getEnterpriseId api to network request" am: 71c9ca453d
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1960884

Change-Id: I1362e038ed047ea570a725a9816a90634f40c35b

Sooraj Sasindran   authored and   Automerger Merge Worker   commited 2022-01-27 05:59:06 +00:00
fc539a07ca
Merge "Adding bt dependency" am: d97f3a1901
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1960370

Change-Id: I74cd8ce8506d9fff75fa4b46ef191a4046d1a068

Rahul Sabnis   authored and   Automerger Merge Worker   commited 2022-01-27 05:58:34 +00:00
e4383b7095
Merge "Add getEnterpriseId api to network request"
Sooraj Sasindran   authored and   Gerrit Code Review   commited 2022-01-27 05:52:54 +00:00
71c9ca453d
Merge "Adding bt dependency"
Rahul Sabnis   authored and   Gerrit Code Review   commited 2022-01-27 05:42:18 +00:00
d97f3a1901
Merge "Set exclude_kotlinc_generated_files to false explicitly since kotlin reflection is used in some Connectivity test cases kotlin code." am: c7231f3e79 am: 42872abcee am: 6203a5cb4c
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1950403

Change-Id: Ia11b7f4b58e6f7b2f47ce1a3b92fd61cca431487

Wei Li   authored and   Automerger Merge Worker   commited 2022-01-27 01:01:09 +00:00
82f81a3406
Merge "Set exclude_kotlinc_generated_files to false explicitly since kotlin reflection is used in some Connectivity test cases kotlin code." am: c7231f3e79 am: 42872abcee
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1950403

Change-Id: Ic69b252bf2470c894b8e00eab53b277b7c6f6b99

Wei Li   authored and   Automerger Merge Worker   commited 2022-01-27 00:50:46 +00:00
6203a5cb4c
Merge "Set exclude_kotlinc_generated_files to false explicitly since kotlin reflection is used in some Connectivity test cases kotlin code." am: c7231f3e79
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1950403

Change-Id: If08bd9b6438b5e808f3628ae3dd4191ec361ff43

Wei Li   authored and   Automerger Merge Worker   commited 2022-01-27 00:37:41 +00:00
42872abcee
Merge "Set exclude_kotlinc_generated_files to false explicitly since kotlin reflection is used in some Connectivity test cases kotlin code."
Wei Li   authored and   Gerrit Code Review   commited 2022-01-27 00:22:49 +00:00
c7231f3e79
Set exclude_kotlinc_generated_files to false explicitly since kotlin reflection is used in some Connectivity test cases kotlin code.
Property "exclude_kotlinc_generated_files" is recently added to exclude some kotlinc generated files that are not needed if kotlin reflection is not used. Currently it defaults to false since there are test failures(b/213966211) which is in FullScoreTest#testToString and FullScoreTest#testMinMaxPolicyConstants that uses kotlin reflection and fails if exclude_kotlinc_generated_files defaults to true. By setting explicitly exclude_kotlinc_generated_files to false on tests like FullScoreTest#testToString, we will be able to finally default this property to true so the kotlinc generated files can be removed for most modules that don't need them.
Bug: 204888276
Bug: 213966211
Test: atest
FrameworksNetTests: com.android.server.connectivity.FullScoreTest
Change-Id: I4ed2d27c27841cb7127f669c8db34c90b4a41b1f

Wei Li   commited 2022-01-26 18:25:23 +00:00
8a177f694a
Add getEnterpriseId api to network request
Bug: 194332512
CTS-Coverage-Bug: 216481336
Test: build
Change-Id: I1446f8eecf43f7c6d243dc82af08d04957dd60e3

Sooraj Sasindran   commited 2022-01-26 17:26:50 +00:00
7e9b25e7f9
[MS59.2] Add unit test for NetworkStatsDataMigrationUtils
Test: atest NetworkStatsDataMigrationUtilsTest
Bug: 204830222
Change-Id: Ia6e8aec9a828072a2a1e63bec600c2e20d3699b3

junyulai   authored and   Junyu Lai   commited 2022-01-26 16:53:06 +00:00
a1bb3a36cd
Change NETWORK_TYPE_5G_NSA reference package
NETWORK_TYPE_5G_NSA is moved to NetworkStatsManager

Bug: 210073043
Test: builds, FrameworksNetTests
Change-Id: I9226119ee4f67688a1b4ffdab7e5a86ec0b8e974

Aaron Huang   commited 2022-01-26 23:41:17 +08:00
b4ce0fa9b1
Merge changes Ie826477d,I5125a3ac am: f8ed984e9c am: c08c9c8d96 am: dc86ef31c6
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1961299

Change-Id: I10f20f83cce1f110bf17aca840b009dae36f3984

Nucca Chen   authored and   Automerger Merge Worker   commited 2022-01-26 15:40:40 +00:00
5e25f6f811
Merge changes Ie826477d,I5125a3ac am: f8ed984e9c am: c08c9c8d96
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1961299

Change-Id: I6bddf77824763929d694e153e8fa4cccde5d34ea

Nucca Chen   authored and   Automerger Merge Worker   commited 2022-01-26 15:22:50 +00:00
dc86ef31c6
Merge changes Ie826477d,I5125a3ac am: f8ed984e9c
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1961299

Change-Id: I52678ffbc74b10e5d74c8cce5886543df9a1ad57

Nucca Chen   authored and   Automerger Merge Worker   commited 2022-01-26 15:04:48 +00:00
c08c9c8d96
Merge changes Ie826477d,I5125a3ac
* changes:
  [CLATJ#26] ClatCoordinator: reword clatd starting failure logging
  [CLATJ#25] ClatCoordinator: stop clatd process gracefully

Nucca Chen   authored and   Gerrit Code Review   commited 2022-01-26 14:50:11 +00:00
f8ed984e9c
[CLATJ#26] ClatCoordinator: reword clatd starting failure logging
Bug: 212345928
Test: build
Change-Id: Ie826477d27db26cc49d113ec8bfacaaa3006e26e

Hungming Chen   authored and   Nucca Chen   commited 2022-01-26 12:23:45 +00:00
6fb21144b8
[CLATJ#25] ClatCoordinator: stop clatd process gracefully
Send SIGTERM with timeout first, if fail, SIGKILL.

Bug: 212345928
Test: connect/disconnect to IPv6 only network and ping 8.8.8.8
      repeat 3 times
Change-Id: I5125a3ac7e8ab6d4e8ae7fc7134b8ac8e42ce5dd

Hungming Chen   authored and   Nucca Chen   commited 2022-01-26 12:23:22 +00:00
1ff914a543
[MS78.2] Fix NetworkIdentity#Builder crashing on 5G NSA networks am: 30f06afda3 am: 0572b950b9 am: 8b9c7f6348
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1958895

Change-Id: Id9c4d9a62ca085b078947458cddde06afd7ef056

Junyu Lai   authored and   Automerger Merge Worker   commited 2022-01-26 11:24:46 +00:00
19870d2948
Use the network stack shims in services connectivity
Test: m
Change-Id: I8ac4f291cd78720fd3b0d433872881aa98f10d73

Chalard Jean   authored and   Sooraj Sasindran   commited 2022-01-26 03:12:21 -08:00
96400daaa9
[MS78.2] Fix NetworkIdentity#Builder crashing on 5G NSA networks am: 30f06afda3 am: 0572b950b9
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1958895

Change-Id: I80ba74b1373353f3f8abf84ad483706ad2d5ceca

Junyu Lai   authored and   Automerger Merge Worker   commited 2022-01-26 11:05:11 +00:00
8b9c7f6348
[MS78.2] Fix NetworkIdentity#Builder crashing on 5G NSA networks am: 30f06afda3
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1958895

Change-Id: Ie744e15f46fe4cab6bcd03fb3aaf27bffd1bae30

Junyu Lai   authored and   Automerger Merge Worker   commited 2022-01-26 10:47:26 +00:00
0572b950b9
[MS78.2] Fix NetworkIdentity#Builder crashing on 5G NSA networks
Test: atest NetworkIdentityTest
Fix: 216193400
Change-Id: I00abc97a98dfdf17d5f0c2e6b45d28be9899c5c3

Junyu Lai   commited 2022-01-26 07:53:57 +00:00
30f06afda3
Adding bt dependency
Bug: 206121418
Test: Compile
Merged-In: I92f3971ba1bb7e873166482f7051dcd2b9df5bf2
Change-Id: I92f3971ba1bb7e873166482f7051dcd2b9df5bf2

Roopa Sattiraju   authored and   Rahul Sabnis   commited 2022-01-25 20:27:30 -08:00
27acf0b677
Merge "Send exclude local routes value to netd for VPN network" am: 317be96553 am: 35a7b80089 am: 40496330cc
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1948168

Change-Id: I3a2fd7d1e7ed0de398dc7bf0a09fe0374988762c

Chiachang Wang   authored and   Automerger Merge Worker   commited 2022-01-26 03:41:07 +00:00
90a53b4060
Merge "Send exclude local routes value to netd for VPN network" am: 317be96553 am: 35a7b80089
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1948168

Change-Id: I4eaa5e55e5342d3bdf9ff3fbb8ca57868f92674d

Chiachang Wang   authored and   Automerger Merge Worker   commited 2022-01-26 02:40:58 +00:00
40496330cc
Merge "Send exclude local routes value to netd for VPN network" am: 317be96553
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1948168

Change-Id: Icb5b54a205fe07b704238d2f65f78a24f4e1e36d

Chiachang Wang   authored and   Automerger Merge Worker   commited 2022-01-26 02:22:45 +00:00
35a7b80089
Merge "Send exclude local routes value to netd for VPN network"
Chiachang Wang   authored and   Gerrit Code Review   commited 2022-01-26 02:09:35 +00:00
317be96553
Merge changes from topic "preparation_fork_clatd_from_system_server" am: 43f9729e90 am: 74fe555a17 am: bb4afc3167
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1934178

Change-Id: I2f8efd82483481827aa33425e71cebf727aecfc6

Maciej Żenczykowski   authored and   Automerger Merge Worker   commited 2022-01-26 01:09:13 +00:00
36eff12499
Merge changes from topic "preparation_fork_clatd_from_system_server" am: 43f9729e90 am: 74fe555a17
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1934178

Change-Id: I3d52eaa2a8306e2251ea0e416c77fd6b55fdcaf2

Maciej Żenczykowski   authored and   Automerger Merge Worker   commited 2022-01-26 00:51:32 +00:00
bb4afc3167
Merge "Correct typos in libnetworkstats" am: 1b5f93df43 am: 8cb78a196f am: 35a32f7549
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1957868

Change-Id: I52d6375059db4510b8511a0cf196c999c4cb35e8

Maciej Żenczykowski   authored and   Automerger Merge Worker   commited 2022-01-26 00:41:08 +00:00
db96931dba
Merge changes from topic "preparation_fork_clatd_from_system_server" am: 43f9729e90
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1934178

Change-Id: Id9a0d9fe4279aa8cd9ceafe475be31db5925f495

Maciej Żenczykowski   authored and   Automerger Merge Worker   commited 2022-01-26 00:41:03 +00:00
74fe555a17
Merge changes from topic "libnetworkstats" am: e1f8ad4d59 am: f1d14732f9 am: 9eaab00310
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1958140

Change-Id: I0d61424323e289125260fd6e51adc270d209d6c2

Maciej Żenczykowski   authored and   Automerger Merge Worker   commited 2022-01-26 00:40:01 +00:00
3a8e312c23
Copy libnetdbpf from system/net to tethering module am: f2bb7b1ae8 am: 6eabb57bc9 am: 80f24bfa4e
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1958139

Change-Id: Ib7e95cadd783887efc3e2acf4dab814a60f0b163

Ken Chen   authored and   Automerger Merge Worker   commited 2022-01-26 00:39:56 +00:00
9d34c4d01a