Commit graph android_packages_modules_Co.../tests/unit/Android.bp
Message SHA1
Merge "Fix NullPointerException happens in dumpCheckin" am: 6b7e457988 am: 44a02af11a am: a4d60dd2ad
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2059628

Change-Id: If9933b6aad05abf79e85f9172ba6eb6f8492d648
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

Aaron Huang   authored and   Automerger Merge Worker   commited 2022-04-20 06:12:50 +00:00
d79f543df0
Fix NullPointerException happens in dumpCheckin
Currently dumpCheckin passes a null object to create
the contructor of NetworkStatsCollection.Key but the
constructor requires non-null object. Thus, it caused
the NPE in dumpCheckin. To fix this exception, create
an NetworkIdentitySet() object instead of using an
null object.

Bug: 225131008
Bug: 226539404
Test: dumpsys netstats --checkin is fine
      FrameworksNetTests
Change-Id: I7f2dadf0647b3f42e0f667d96291d2ae37e23faf

Aaron Huang   commited 2022-04-19 17:49:30 +08:00
c3a43b4063
Merge "Remove NativeDaemonConnector relevant files" am: 631c2387a6 am: 4eaeac9baa
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2059332

Change-Id: If12e2a9dff214da5541d4002b33d313898aa2b18
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

Paul Hu   authored and   Automerger Merge Worker   commited 2022-04-12 08:16:33 +00:00
104c01390a
Merge "Remove NativeDaemonConnector relevant files" am: 631c2387a6
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2059332

Change-Id: I9eb51122c0d6ad5867e1ad7759c36933b10cc971
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

Paul Hu   authored and   Automerger Merge Worker   commited 2022-04-12 07:51:40 +00:00
4eaeac9baa
Merge "Remove NativeDaemonConnector relevant files"
Paul Hu   authored and   Gerrit Code Review   commited 2022-04-12 07:37:16 +00:00
631c2387a6
Remove NativeDaemonConnector relevant files
NsdService is using binder call to communicate with
mdnsresponder, so there is no one to use NativeDaemonConnector
now. Thus, remove NativeDaemonConnector relevant files.

Bug: 209894875
Test: atest FrameworksNetTests
Change-Id: Ic70d9417dc85c04c537e09d8f8586a762ac9a97b

paulhu   authored and   Paul Hu   commited 2022-04-12 07:35:31 +00:00
cee953bd09
Merge "Update test for new IkeTunnelConnectionParams field" am: 5850372963 am: 73242c8a0e
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1976972

Change-Id: I25cd0a8614b8b1c400026f655b34b67fd5116e3e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

Chiachang Wang   authored and   Automerger Merge Worker   commited 2022-04-07 11:37:31 +00:00
5e16c68d00
Merge "Update test for new IkeTunnelConnectionParams field" am: 5850372963
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1976972

Change-Id: If20d5af24f2c9139ed3f41c62ecbec20433e1fba
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

Chiachang Wang   authored and   Automerger Merge Worker   commited 2022-04-07 10:45:24 +00:00
73242c8a0e
Merge "Update test for new IkeTunnelConnectionParams field"
Chiachang Wang   authored and   Gerrit Code Review   commited 2022-04-07 10:24:03 +00:00
5850372963
Merge changes Id533cdb4,I6a9ce3d6,I345bf073 into sc-mainline-prod am: c3315f2560
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/17530925

Change-Id: I9e1375f47ab85db92cf602f0be63bac0160aab78
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

Remi NGUYEN VAN   authored and   Automerger Merge Worker   commited 2022-04-01 08:29:40 +00:00
9dcc6c676d
Merge EthernetServiceTests into FrameworksNetTests
As per the TODO, merge EthernetServiceTests into the larger
FrameworksNetTests suite.

Similarly to NetworkStats, NSD or IpSec tests, the tests are also marked
as "non-connectivity-module-test", where "module" actually refers to
modules being built for release (from an S-based branch) today. This is
necessary as the tests and associated code cannot build without T APIs.

Also add FrameworksNetTests to presubmit as non-connectivity-module
tests are not run in presubmit without this.

Test: TH
Merged-In: Id533cdb4ac184b963f570af299dea04754ba88e9
Change-Id: I9950fcb49fdc2217134a59e993941cbe5da0b556

Remi NGUYEN VAN   commited 2022-04-01 15:12:18 +09:00
40da62da48
Merge EthernetServiceTests into FrameworksNetTests
As per the TODO, merge EthernetServiceTests into the larger
FrameworksNetTests suite.

Similarly to NetworkStats, NSD or IpSec tests, the tests are also marked
as "non-connectivity-module-test", where "module" actually refers to
modules being built for release (from an S-based branch) today. This is
necessary as the tests and associated code cannot build without T APIs.

Also add FrameworksNetTests to presubmit as non-connectivity-module
tests are not run in presubmit without this.

Test: TH
Ignore-AOSP-First: Merged in topic, will be cherry-picked
Change-Id: Id533cdb4ac184b963f570af299dea04754ba88e9

Remi NGUYEN VAN   commited 2022-04-01 15:08:48 +09:00
6ad9287432
Update test for new IkeTunnelConnectionParams field
Bug: 184750836
Test: atest FrameworksNetTests
Change-Id: Iab55eba74b94f295a358c6e8474ebf9230c9b019

Chiachang Wang   commited 2022-03-31 14:45:59 +08:00
69aa988090
Merge "Add test for EthernetNetworkUpdateRequest" am: 6758a5dfff am: 396091b4b1
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2012897

Change-Id: I3caea7ea56c7b020c3a13ecfe5e8978960b37a88

Patrick Rohr   authored and   Automerger Merge Worker   commited 2022-03-09 10:12:36 +00:00
2f9ab72177
Merge "Add test for EthernetNetworkUpdateRequest" am: 6758a5dfff
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2012897

Change-Id: Ia159ef5459390bb49bb67be26022f942743a20ba

Patrick Rohr   authored and   Automerger Merge Worker   commited 2022-03-09 09:48:38 +00:00
396091b4b1
Merge "Add test for EthernetNetworkUpdateRequest"
Patrick Rohr   authored and   Gerrit Code Review   commited 2022-03-09 09:16:29 +00:00
6758a5dfff
[Resolved conflict] Merge "Merge Android 12L" am: e6953d54a5
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2013399

Ignore-AOSP-First: automerger CL from AOSP
Change-Id: Ib5909fcd5078da0beaf399695bc25b28c4eb7918

Xin Li   commited 2022-03-08 17:13:34 +00:00
dc0aa2e9bf
Add test for EthernetNetworkUpdateRequest
Test: atest EthernetNetworkUpdateRequest
Change-Id: I2aeacca81f07cf2d73814d20fc9e63e9f1a65843

Patrick Rohr   commited 2022-03-08 16:29:43 +01:00
30d33f4ee3
Merge "Remove unused libraries" am: e4848734a9 am: 0e4e270314
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2005450

Change-Id: I547e9c82bff23c426418466cfa85321cbb3717fb

Jean Chalard   authored and   Automerger Merge Worker   commited 2022-03-02 08:41:05 +00:00
5d38c8ce06
Merge "Remove unused libraries" am: e4848734a9
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2005450

Change-Id: I831ada348828d28c4abcd961932bdbb7c0c4ec07

Jean Chalard   authored and   Automerger Merge Worker   commited 2022-03-02 08:21:36 +00:00
fb73190bd6
Merge "Remove unused libraries" am: e4848734a9
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2005450

Change-Id: I94d1fa0167c143478938342f6d4d41e7a6bdf894

Jean Chalard   authored and   Automerger Merge Worker   commited 2022-03-02 08:19:29 +00:00
0e4e270314
Merge "Remove unused libraries"
Jean Chalard   authored and   Gerrit Code Review   commited 2022-03-02 07:48:51 +00:00
e4848734a9
Remove unused libraries
Test: m, TH
Change-Id: I59c0f8ecc94837635758c7667ea6413a5e6a7e81

Chalard Jean   commited 2022-03-02 14:32:38 +09:00
1f3e110ae6
Add JNI stats libraries to connectivity am: d95048929c
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1987449

Change-Id: Ibae3c96be03017135b9aff4caf6f3f5f1a86075a

Remi NGUYEN VAN   authored and   Automerger Merge Worker   commited 2022-02-28 06:26:45 +00:00
97edc959c2
Add JNI stats libraries to connectivity am: d95048929c
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1987449

Change-Id: Ice5c8e468807a93b334a6c8f25f18bb9c6cf3a2d

Remi NGUYEN VAN   authored and   Automerger Merge Worker   commited 2022-02-28 06:08:41 +00:00
3918a1a8b5
Add JNI stats libraries to connectivity
Add new symbols to libservice-connectivity loaded on T only, and the
framework libraries to apex and tests.

Bug: 197717846
Test: atest FrameworksNetTests
  (cherry-picked and splitting apex Android.bp to aosp/1994130)
Change-Id: Iae44344701a3267110e5cbf271120201134d59e5
Merged-In: Iae44344701a3267110e5cbf271120201134d59e5

Remi NGUYEN VAN   authored and   Junyu Lai   commited 2022-02-28 04:16:17 +00:00
d95048929c
Merge sc-v2-dev-plus-aosp-without-vendor@8084891
Bug: 214455710
Merged-In: I5894450f3089b2ea105722a18ddf8f1eed1c28a0
Change-Id: If2045705da821c90705f7dd1e6944c0bb92e3289

Xin Li   commited 2022-02-11 06:57:49 +00:00
a459e6a12d
Merge "remove unneeded inclusions of libbpf_android" am: 0fc2ec6d68 am: 2ccd0d527a
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1977891

Change-Id: Ic435dd83c184f2b194dbf8c704fc8cd9f61d0f49

Treehugger Robot   authored and   Automerger Merge Worker   commited 2022-02-10 20:33:03 +00:00
9ce59597a6
Merge "remove unneeded inclusions of libbpf_android" am: 0fc2ec6d68
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1977891

Change-Id: I74d9611f27056e4d37dacfdd55d24fc6ee1d5480

Treehugger Robot   authored and   Automerger Merge Worker   commited 2022-02-10 20:16:17 +00:00
2ccd0d527a
remove unneeded inclusions of libbpf_android
Test: TreeHugger
Signed-off-by: Maciej Żenczykowski <maze@google.com>
Change-Id: I6aedf507e09effd9076de85a0acc7aaf1b8e4a1e

Maciej Żenczykowski   commited 2022-02-09 22:10:22 -08:00
11ab996252
Split out connectivity-t-pre-jarjar and tests am: 2ba9dbe163
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1975069

Change-Id: Ia410e89d09c8470469a38afa0442e4b9ce42077f

Remi NGUYEN VAN   authored and   Automerger Merge Worker   commited 2022-02-09 13:08:58 +00:00
c033c24658
Split out connectivity-t-pre-jarjar and tests
The pre-jarjar variant is necessary so that service-t can depend on
hidden symbols in framework-t that reference (for example as parameter)
classes that are jarjared.
Without this, when depending on framework-connectivity-tiramisu.impl,
service-connectivity-t would see post-jarjar symbols that do not match
the classnames it uses in its code.

Also split FrameworksNetTestsLib so that the same jarjar rules can be
applied between the tests and the module, avoiding different errors
between FrameworksNetTests and ConnectivityCoverageTests.

Ignore-AOSP-First: Avoiding conflicts; cherry-pick will follow
Bug: 204830222
Test: m
Change-Id: I3d0c081c4a7422e128beee11c0156f01b0377c96
Merged-In: I3d0c081c4a7422e128beee11c0156f01b0377c96

Remi NGUYEN VAN   authored and   junyulai   commited 2022-02-09 18:29:30 +08:00
2ba9dbe163
Add JNI stats libraries to connectivity
Add new symbols to libservice-connectivity loaded on T only, and the
framework libraries to apex and tests.

Ignore-AOSP-First: Avoiding conflicts; cherry-pick will follow
Bug: 197717846
Test: atest FrameworksNetTests
Change-Id: Iae44344701a3267110e5cbf271120201134d59e5

Remi NGUYEN VAN   commited 2022-02-07 10:11:40 +09:00
c8aa43cab1
Split out connectivity-t-pre-jarjar and tests
The pre-jarjar variant is necessary so that service-t can depend on
hidden symbols in framework-t that reference (for example as parameter)
classes that are jarjared.
Without this, when depending on framework-connectivity-tiramisu.impl,
service-connectivity-t would see post-jarjar symbols that do not match
the classnames it uses in its code.

Also split FrameworksNetTestsLib so that the same jarjar rules can be
applied between the tests and the module, avoiding different errors
between FrameworksNetTests and ConnectivityCoverageTests.

Ignore-AOSP-First: Avoiding conflicts; cherry-pick will follow
Bug: 204830222
Test: m
Change-Id: I3d0c081c4a7422e128beee11c0156f01b0377c96

Remi NGUYEN VAN   commited 2022-02-02 16:42:49 +09:00
7858562b31
Merge changes from topic "dscp_policies" am: 2a947ceb50 am: aa8facf3ac
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1963241

Change-Id: Icf9a3aa63533e606d477ad6712983a28322ecd77

Lorenzo Colitti   authored and   Automerger Merge Worker   commited 2022-01-27 23:54:58 +00:00
591035e7f8
Merge changes from topic "dscp_policies" am: 2a947ceb50
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1963241

Change-Id: Ibf006cef2191a407978edbae20ac9910e03a7be5

Lorenzo Colitti   authored and   Automerger Merge Worker   commited 2022-01-27 23:37:51 +00:00
aa8facf3ac
Merge "[MS59.2] Add unit test for NetworkStatsDataMigrationUtils" am: bfdd0f3c3c am: 9d39295472 am: 63b0335dae am: 1f00085fa3
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1958907

Change-Id: Ib2f1d8d6661c9f3e89e4dc14b382adf69587ceef

Junyu Lai   authored and   Automerger Merge Worker   commited 2022-01-27 10:47:40 +00:00
c1ca4f786a
Allow using BpfMap and TcUtils in unit tests.
Create a Java library that allows the BpfMap class and the
TcUtils class to find their JNI code when they are jarjard to the
package name we use in our unit tests.

Test: atest ConnectivityServiceTest
Change-Id: I2f17b1c366b2b8164eac34b94c9659bc7c0f68e0

Lorenzo Colitti   commited 2022-01-27 10:18:35 +00:00
0c26c9ed37
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
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1958907

Change-Id: Ie4255d82cf593a848e1ef64c88dd43e5839b955e

Junyu Lai   authored and   Automerger Merge Worker   commited 2022-01-27 09:35:03 +00:00
11124c2106
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 "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: 386dc4008d
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1950403

Change-Id: I1330ba61ab4b9ee3552d273b2de9291b4646588d

Wei Li   authored and   Automerger Merge Worker   commited 2022-01-27 00:49:47 +00:00
324e5363a3
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: I39e10504317c52c43c15c07f8884bf3dc2685bdf

Wei Li   authored and   Automerger Merge Worker   commited 2022-01-27 00:38:05 +00:00
386dc4008d
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
[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
Merge changes from topic "libnetworkstats" am: e1f8ad4d59 am: 3495b52981
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1958140

Change-Id: I0cef427117653d3666d1df4a94a33d4accac9285

Maciej Żenczykowski   authored and   Automerger Merge Worker   commited 2022-01-26 00:46:45 +00:00
b38b72323f
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
Merge changes from topic "libnetworkstats" am: e1f8ad4d59
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1958140

Change-Id: I9efbd8c0bfffc1b7ca779de2978dec3e01da48cb

Maciej Żenczykowski   authored and   Automerger Merge Worker   commited 2022-01-26 00:04:29 +00:00
3495b52981
Merge changes from topic "libnetworkstats"
* changes:
  Rename libnetdbpf to libnetworkstats
  Copy libnetdbpf from system/net to tethering module

Maciej Żenczykowski   authored and   Gerrit Code Review   commited 2022-01-25 23:52:06 +00:00
e1f8ad4d59