Commit Graph

3559 Commits

Author SHA1 Message Date
Treehugger Robot
65a20ad635 Merge "Disable CtsNetTestCases if needed" am: 2c75c0444d am: d42bf9e53b
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1892477

Change-Id: Iccc7f22c470cbc5c38b156c60452659d982309b2
2021-11-18 12:14:16 +00:00
Treehugger Robot
2c75c0444d Merge "Disable CtsNetTestCases if needed" 2021-11-18 11:43:07 +00:00
Chalard Jean
2f6631cd7c S- not to crash on NetworkInfo(null) or setDetailedState(null) am: dece0d805f am: 66bd87f0d4
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1892101

Change-Id: Iddb56ae95da59cfc9bc45b2f6139b1a578ad0c9d
2021-11-17 07:15:12 +00:00
Taras Antoshchuk
bc3f86dfa3 Disable CtsNetTestCases if needed
Apply NetworkStackNextEnableDefaults to CtsNetTestCases to disable it
in branches where NetworkStackNext and related targets should not be
built.

Test: presubmit
Change-Id: I850b4294aa4c3c01f8871760185ca7fedc0f8584
2021-11-15 17:40:42 +01:00
Chalard Jean
dece0d805f S- not to crash on NetworkInfo(null) or setDetailedState(null)
When NetworkInfo(null) or setDetailedState(null, any, any) are
called, S used to not crash but plant a null bomb for later
which may explode in some calls (notably, parceling) : see the
bug referenced below for details.

To help catching these errors earlier a patch was made to crash
as soon as one of these methods is called with a null argument,
but this will also crash incorrect use on existing code that
may never actually step on the mine, crashing code that used not
to crash. For safety, implement the new behavior only on T.

Bug: 145972387
Test: NetworkInfoTest
Change-Id: Ib710497d83b2d26439c2bd4d2f572310db97d6fd
2021-11-15 21:18:25 +09:00
markchien
7e7b752079 Rename tethering jni and get the jni by its package name am: f967b11087 am: de93cf9aba am: 6d52305aa9
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1885530

Change-Id: Iff63a9588d74a43346d9c18729c0e9f0e1a1b21e
2021-11-11 14:19:27 +00:00
markchien
6d52305aa9 Rename tethering jni and get the jni by its package name am: f967b11087 am: de93cf9aba
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1885530

Change-Id: I39d4a2a9bc402d3ea8f33a1ce5dfec6cb91f4b15
2021-11-11 14:02:34 +00:00
markchien
de93cf9aba Rename tethering jni and get the jni by its package name am: f967b11087
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1885530

Change-Id: Icc18029f126a4845d6d2071d9e36458cbab4c313
2021-11-11 13:42:39 +00:00
Maciej Żenczykowski
ff81692077 Merge changes from topics "rename-libbpfmapjni", "rename-libtetherutiljni"
* changes:
  Rename libbpfmapjni and include bpf common util library
  Rename tethering jni and get the jni by its package name
2021-11-11 13:19:48 +00:00
Treehugger Robot
511e606557 Merge "replace R + 1 with S" am: 7eb9f88a6e am: d5ad273033 am: 56d7b04870
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1888235

Change-Id: I4ed04aa023e712715f96c930cd9fbac7ff012a2f
2021-11-11 08:14:19 +00:00
Treehugger Robot
56d7b04870 Merge "replace R + 1 with S" am: 7eb9f88a6e am: d5ad273033
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1888235

Change-Id: Ifc7daa30ed3b963a2ba2991626eea59d16c8a682
2021-11-11 08:02:01 +00:00
Treehugger Robot
7eb9f88a6e Merge "replace R + 1 with S" 2021-11-11 07:26:39 +00:00
Remi NGUYEN VAN
3598bd16b6 Merge "Fix NetworkCapabilitiesTest on S" am: 4638c093ed am: 31969c1dc5 am: dbb110de2d
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1887835

Change-Id: I8841bbb775f966beda2e5a4d081f452490af7985
2021-11-11 05:22:40 +00:00
Remi NGUYEN VAN
dbb110de2d Merge "Fix NetworkCapabilitiesTest on S" am: 4638c093ed am: 31969c1dc5
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1887835

Change-Id: I8b9d732884b6c2344e1fccfe786ac2dc5aad6b23
2021-11-11 05:10:26 +00:00
Remi NGUYEN VAN
4638c093ed Merge "Fix NetworkCapabilitiesTest on S" 2021-11-11 04:42:36 +00:00
Remi NGUYEN VAN
daa03defee Fix NetworkCapabilitiesTest on S
Mark NetworkCapabilitiesTest as ConnectivityModuleTest so that it is
only run in MTS with the Connectivity module installed, and fix
parceling tests to use the right number of fields in that case.

NetworkCapabilitiesTest is only useful to test the Connectivity module,
and not other modules like NetworkStack, as it is a unit test of a class
in the Connectivity module.

Bug: 205901761
Test: atest NetworkCapabilitiesTest
Change-Id: I10ba0f866bc7a39b2c90bdde12a79feefea2d5ee
2021-11-11 12:30:07 +09:00
Maciej Żenczykowski
8834250ef8 replace R + 1 with S
Test: TreeHugger
Bug: 170424293
Signed-off-by: Maciej Żenczykowski <maze@google.com>
Change-Id: I43f53268b6c1605d928ce3431cc95b8a66b6c052
2021-11-10 18:20:01 -08:00
markchien
f967b11087 Rename tethering jni and get the jni by its package name
tetherutiljni is renamed to com_android_networkstack_tethering_jni_util

Bug: 205088391
Test: atest TetheringTests
      atest CtsTetheringTest
      atest TetheringPrivilegedTests
Change-Id: Ifd1f4473625e33d3ebe190c9f8a2b5d54aa1ff49
2021-11-10 14:07:24 +08:00
Remi NGUYEN VAN
c32b4e9ef3 Don't rematch all requests when adding new ones am: 959d2cb6bd am: b92f209a18 am: 0cd2be4ab9
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1784387

Change-Id: Ia87ab722412c3a534d70327595180338f1ff1cf3
2021-11-10 05:00:44 +00:00
Remi NGUYEN VAN
0cd2be4ab9 Don't rematch all requests when adding new ones am: 959d2cb6bd am: b92f209a18
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1784387

Change-Id: I31e55ccdfe8b4a4bf432fd03035602d044d6b2a4
2021-11-10 04:42:48 +00:00
Remi NGUYEN VAN
959d2cb6bd Don't rematch all requests when adding new ones
With the network selection rewrite in S, rematching a single request can
now easily be done; this can be used as an optimization in
handleRegisterNetworkRequests to avoid rematching all requests when
registering a new one.

This can be disabled by a flag that is unset by default,
REMATCH_ALL_REQUESTS_ON_REGISTER.

Test: atest ConnectivityServiceTest
Change-Id: If76f79b41ac88863974f7025624667134bea2570
2021-11-08 19:17:57 +09:00
Treehugger Robot
90427f67b0 Merge "Include the failing stats in stats failure assertions." am: 27979bd116 am: db33b9ea65 am: 06fe60cef1
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1883772

Change-Id: Iee2caabd9adbdfdffea197582c8005d444ca32c8
2021-11-08 07:10:53 +00:00
Treehugger Robot
06fe60cef1 Merge "Include the failing stats in stats failure assertions." am: 27979bd116 am: db33b9ea65
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1883772

Change-Id: Ib0202cc1198d49a99c7f927ace1207e91795d901
2021-11-08 06:53:20 +00:00
Treehugger Robot
27979bd116 Merge "Include the failing stats in stats failure assertions." 2021-11-08 06:20:39 +00:00
Lorenzo Colitti
5156e787f3 Include the failing stats in stats failure assertions.
Currently debugging IpSecManagerTest counter test failures is
difficult because the assertion message does not say how many
bytes/packets were expected.

Add this information to the assertion message.

Bug: 204860049
Test: test-only change
Change-Id: I4e12be9a58a688fcee3362dceb31d9f21e981d6c
2021-11-08 13:25:45 +09:00
Les Lee
9381fb73df Merge "Add test case to test normalize" am: b5ee639fe0 am: 663dfcaec0 am: a02490446c
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1881008

Change-Id: I5aa2cd09e100518d131a8df60beae0c7a581ba80
2021-11-06 01:47:37 +00:00
Les Lee
a02490446c Merge "Add test case to test normalize" am: b5ee639fe0 am: 663dfcaec0
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1881008

Change-Id: Ib19a96d6ccbd32d7bd33c2465ee1f195e3118bb4
2021-11-06 01:30:15 +00:00
Les Lee
b5ee639fe0 Merge "Add test case to test normalize" 2021-11-06 00:54:14 +00:00
Les Lee
5299a2b307 Add test case to test normalize
Bug: 194939211
Test: atest -c NetworkTemplateTest
Change-Id: I2f5790b9217357ddcf3f466cec1b2b1afbb47210
2021-11-05 16:59:10 +08:00
Remi NGUYEN VAN
2a731f7cda Merge "Use ConnectivityCheckTargetPreparer in CTS" am: defc74fb2f am: e453beefc5 am: 03b6907523
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1844185

Change-Id: I96079c9c680c3cd196cf94f7f9838e54d8220cb6
2021-11-05 05:13:20 +00:00
Remi NGUYEN VAN
03b6907523 Merge "Use ConnectivityCheckTargetPreparer in CTS" am: defc74fb2f am: e453beefc5
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1844185

Change-Id: Iabe5b0488223412afeb6674e499f450429a27dd4
2021-11-05 04:56:13 +00:00
Remi NGUYEN VAN
defc74fb2f Merge "Use ConnectivityCheckTargetPreparer in CTS" 2021-11-05 04:27:47 +00:00
Remi NGUYEN VAN
f0e3265adc Merge "Move fromStableParcelable to KeepaliveController" am: 1d1b1fe999 am: ead12ae16a am: e07f913453
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1876687

Change-Id: I5c5d45a2ecb959edb2b0ff69b3fe2fd68f3dc81f
2021-11-04 07:01:17 +00:00
Remi NGUYEN VAN
e07f913453 Merge "Move fromStableParcelable to KeepaliveController" am: 1d1b1fe999 am: ead12ae16a
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1876687

Change-Id: I82d6d9c38c6998a042c920f0cbeb666d2d42d336
2021-11-04 06:45:04 +00:00
Remi NGUYEN VAN
1d1b1fe999 Merge "Move fromStableParcelable to KeepaliveController" 2021-11-04 06:19:17 +00:00
Kimberly Kreider
13589b1fa7 Merge "Replace "mts" with "mts-tethering"." am: 200e42063c am: 57699090be am: 6219b5d007
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1864894

Change-Id: If55632a6e27c543d991764fdb01af6c9ee624721
2021-11-02 00:29:08 +00:00
Kimberly Kreider
6219b5d007 Merge "Replace "mts" with "mts-tethering"." am: 200e42063c am: 57699090be
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1864894

Change-Id: Ib2d1ff1400f37ab7cfcbbdaf3601cb3e52b1bb1e
2021-11-02 00:18:08 +00:00
Kimberly Kreider
200e42063c Merge "Replace "mts" with "mts-tethering"." 2021-11-01 23:43:53 +00:00
Treehugger Robot
6a1754e7cd Merge "Shorten a timeout" am: a200fe8c1c am: f4016713ae am: b65a52ae31
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1877219

Change-Id: I438627f51aeebd18f05156d6a2f4c240dd3b26d3
2021-11-01 13:07:18 +00:00
Treehugger Robot
b65a52ae31 Merge "Shorten a timeout" am: a200fe8c1c am: f4016713ae
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1877219

Change-Id: Iae749b9f2bc189ce41c7c0b4523db543469f515d
2021-11-01 12:50:06 +00:00
Treehugger Robot
a200fe8c1c Merge "Shorten a timeout" 2021-11-01 12:19:28 +00:00
Chalard Jean
f5a4805020 Merge "Replace mDeps with a custom object" am: 31ac212428 am: 0aa49aa970 am: aa6314e229
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1868567

Change-Id: Ibf65d816f37d6e9912922cc789cefe70a4e660fd
2021-11-01 11:08:19 +00:00
Chalard Jean
aa6314e229 Merge "Replace mDeps with a custom object" am: 31ac212428 am: 0aa49aa970
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1868567

Change-Id: I2f33da7376c4f788d6c6159710b26071247b5430
2021-11-01 10:56:05 +00:00
Chalard Jean
31ac212428 Merge "Replace mDeps with a custom object" 2021-11-01 10:31:53 +00:00
Chalard Jean
f63e4597a3 Shorten a timeout
This timeout is not very useful but will be incurred every
time

Test: ConnectivityServiceTest
Change-Id: Ia7c76c7c7a148f14844d098be267e16c215776f5
2021-11-01 19:30:10 +09:00
Lucas Lin
faa8cbf5bb Merge "Add tests for testing if [start|finish]Op is called or not" am: 5bf4cd9a73 am: 3e7abf056d am: a360f715df
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1853600

Change-Id: I4a398ca7fb50e377c6ae8e6a4f999ac3940c228c
2021-11-01 09:20:37 +00:00
Lucas Lin
a360f715df Merge "Add tests for testing if [start|finish]Op is called or not" am: 5bf4cd9a73 am: 3e7abf056d
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1853600

Change-Id: I286c855211e8b61af47b880973d79352b2fe9faf
2021-11-01 09:02:07 +00:00
Lucas Lin
5bf4cd9a73 Merge "Add tests for testing if [start|finish]Op is called or not" 2021-11-01 08:33:36 +00:00
Chalard Jean
21f4f70d46 Replace mDeps with a custom object
Mockito's mocks are not thread-safe. The dependencies object
is used both on the test thread (to set it up) and in the CS
handler thread. This can't work with a mock.

Bug: 195626111
Test: ConnectivityServiceTest
Change-Id: Ia989dd71c3133513a90bc1d1957419fb1b74c300
2021-11-01 16:30:56 +09:00
Remi NGUYEN VAN
5d99aa78f7 Move fromStableParcelable to KeepaliveController
TcpKeepaliveController is the only user of
KeepalivePacketDataUtil.fromStableParcelable. Because of
fromStableParcelable, networkstack-client needs to depend on
net-utils-framework-commonm, which pulls a lot of unnecessary classes.
This is particularly problematic considering that networkstack-client
may need to be redistributed as a prebuilt.

Move the method to TcpKeepaliveController, simplifying dependencies.
This also shows that fromStableParcelable could be removed altogether
(or moved to tests) if TcpKeepaliveController built a
TcpKeepalivePacketData class directly.

Test: atest ConnectivityCoverageTests
Change-Id: I554318f6bcd07c73d153598a0231e9fcaf912e90
2021-11-01 13:23:27 +09:00