Maciej Żenczykowski
8726a8bc8e
Merge "Test conntrack event monitor on R" am: d5f07c1243 am: 4c9bfb1fbd am: 870595ef67
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1639707
Change-Id: I8f24ab0b2fdabb71991c2cf77833e6dbf4f8046c
2021-03-16 14:31:47 +00:00
Maciej Żenczykowski
870595ef67
Merge "Test conntrack event monitor on R" am: d5f07c1243 am: 4c9bfb1fbd
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1639707
Change-Id: Ifadec3b2360f535ace9504c0a3aa57950bbf1919
2021-03-16 13:27:10 +00:00
Maciej Żenczykowski
4c9bfb1fbd
Merge "Test conntrack event monitor on R" am: d5f07c1243
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1639707
Change-Id: I669b5b66d9a538365668788e2b4d45be41718ab9
2021-03-16 13:03:43 +00:00
Maciej Żenczykowski
d5f07c1243
Merge "Test conntrack event monitor on R"
2021-03-16 12:29:20 +00:00
Hungming Chen
62afc9809b
Test conntrack event monitor on R
...
Should not {start, stop} conntrack event monitor on R because
it is used by S feature.
Test: atest TetheringCoverageTests
Change-Id: I57a0a84d46e973660b24fc10d314820ada0d45b9
2021-03-16 18:14:38 +08:00
Treehugger Robot
c394bc2089
Merge "Do not start conntrack event monitor when running on R" am: c162fc297f am: de2d7bef3b am: cf31e5cbe4
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1639703
Change-Id: Ic5b03b49e605057a048100fcc1e5b22b158e47c3
2021-03-16 09:49:12 +00:00
Treehugger Robot
cf31e5cbe4
Merge "Do not start conntrack event monitor when running on R" am: c162fc297f am: de2d7bef3b
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1639703
Change-Id: Iaebb922ecd5a62eb548f0ed6fede51c0ae8618a3
2021-03-16 09:05:49 +00:00
Treehugger Robot
de2d7bef3b
Merge "Do not start conntrack event monitor when running on R" am: c162fc297f
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1639703
Change-Id: Ib43879926b0b6789025ab2360c8dc0de1f28090f
2021-03-16 08:46:05 +00:00
Treehugger Robot
c162fc297f
Merge "Do not start conntrack event monitor when running on R"
2021-03-16 08:03:46 +00:00
Chalard Jean
9ade183256
Merge "[NS01.cn] Adjust calls for NetworkScore" am: bc786632cf am: 1834461387 am: 830216e3f8
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1620870
Change-Id: Id40e21d52e0c8bd059f91004b69f5993652c7b54
2021-03-16 07:11:40 +00:00
Maciej Żenczykowski
5fee5079dc
Merge "add test for TetheringUtils::setupNsSocket()" am: d3bb5a544c am: b0c92ad6c8 am: 277bed477f
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1638165
Change-Id: I497be045f1884e8a5ca166a812a4cc04768dde3e
2021-03-16 07:11:35 +00:00
Lorenzo Colitti
c4cff79329
Merge "Add a test for TetheringUtils.setupNaSocket." am: d5edbb9eb4 am: 706d7ffb3e am: d1107edddd
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1639699
Change-Id: Id940af07f2191e0460dee40bdffa5a0ffc3745ba
2021-03-16 07:11:29 +00:00
Remi NGUYEN VAN
0da784c694
[automerger skipped] Merge changes from topic "conn_resources_cp" am: 016e0b9261 am: 16763614c0 -s ours am: 2adb9f1206 -s ours
...
am skip reason: Change-Id Ic2491f04880ff66abc3b2d3aaee6168e18f6d68a with SHA-1 50caf56267 is in history
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1635019
Change-Id: I6685aac76a7281bb8ce845d0f2b2b3fb1974ae5f
2021-03-16 07:11:13 +00:00
Remi NGUYEN VAN
c22057771c
[automerger skipped] Add ServiceConnectivityResources to tethering am: 60f4c2f425 am: fb1f5458d0 -s ours am: a2a4fd0767 -s ours
...
am skip reason: Change-Id I3c7fc6285f10318ecef05a64e1179054bb831d99 with SHA-1 affd94b26d is in history
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1620872
Change-Id: I83884903dda33c6bd8566000d464a7942296a38f
2021-03-16 07:11:12 +00:00
Chalard Jean
830216e3f8
Merge "[NS01.cn] Adjust calls for NetworkScore" am: bc786632cf am: 1834461387
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1620870
Change-Id: Ib4318c685e4dd62ce68004041551e26437a8a631
2021-03-16 07:07:59 +00:00
Maciej Żenczykowski
277bed477f
Merge "add test for TetheringUtils::setupNsSocket()" am: d3bb5a544c am: b0c92ad6c8
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1638165
Change-Id: I8649019d166ccc13d37daacd1cd14dda398b6ca3
2021-03-16 07:07:46 +00:00
Lorenzo Colitti
d1107edddd
Merge "Add a test for TetheringUtils.setupNaSocket." am: d5edbb9eb4 am: 706d7ffb3e
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1639699
Change-Id: Ib03fde8607b62802f897a5075ad0b638e9039fe6
2021-03-16 07:07:28 +00:00
Chalard Jean
1834461387
Merge "[NS01.cn] Adjust calls for NetworkScore" am: bc786632cf
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1620870
Change-Id: I1aa441d41d9256e843dee7745e865df8b0ccee53
2021-03-16 06:53:52 +00:00
Maciej Żenczykowski
b0c92ad6c8
Merge "add test for TetheringUtils::setupNsSocket()" am: d3bb5a544c
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1638165
Change-Id: I2dcb5a315a3abc81a88c2625f28392fd6933af20
2021-03-16 06:47:53 +00:00
Lorenzo Colitti
706d7ffb3e
Merge "Add a test for TetheringUtils.setupNaSocket." am: d5edbb9eb4
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1639699
Change-Id: I2f7f6a5dcbc363bca3d113c0b2cb8e87aae450f2
2021-03-16 06:47:42 +00:00
Chalard Jean
bc786632cf
Merge "[NS01.cn] Adjust calls for NetworkScore"
2021-03-16 06:36:07 +00:00
Maciej Żenczykowski
d3bb5a544c
Merge "add test for TetheringUtils::setupNsSocket()"
2021-03-16 06:23:06 +00:00
Hungming Chen
23ee901e76
Do not start conntrack event monitor when running on R
...
Starting conntrack event monitor on R devices is unnecessary because
no code uses them.
Bug: 177884581
Test: atest TetheringCoverageTests
Change-Id: I036cb8e29b32a4e220da9a52849b978a6ab821e4
2021-03-16 14:18:32 +08:00
Lorenzo Colitti
d5edbb9eb4
Merge "Add a test for TetheringUtils.setupNaSocket."
2021-03-16 06:17:37 +00:00
Maciej Żenczykowski
e7c57368f8
add test for TetheringUtils::setupNsSocket()
...
Bug: 154669942
Test: test-only change
Change-Id: I33fe5a92667a0a6ee38bbcfdee40405cd37cc30f
2021-03-15 21:10:21 -07:00
Lorenzo Colitti
82d4b9956d
Add a test for TetheringUtils.setupNaSocket.
...
Because most of the tethering tests are unprivileged, we cannot
test this code on real sockets. So use an AF_UNIX socketpair.
Bug: 154669942
Bug: 182785371
Test: test-only change
Change-Id: I843fddb3aaeab33628438f3bcd6a4166062de962
2021-03-15 21:01:42 -07:00
Remi NGUYEN VAN
2adb9f1206
[automerger skipped] Merge changes from topic "conn_resources_cp" am: 016e0b9261 am: 16763614c0 -s ours
...
am skip reason: Change-Id Ic2491f04880ff66abc3b2d3aaee6168e18f6d68a with SHA-1 50caf56267 is in history
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1635019
Change-Id: Ib42d908a0136b5694f44c68ac1e58bd304dd0e5c
2021-03-16 03:50:00 +00:00
Remi NGUYEN VAN
a2a4fd0767
[automerger skipped] Add ServiceConnectivityResources to tethering am: 60f4c2f425 am: fb1f5458d0 -s ours
...
am skip reason: Change-Id Ic2491f04880ff66abc3b2d3aaee6168e18f6d68a with SHA-1 50caf56267 is in history
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1620872
Change-Id: Id4402eeca6b1ef035a1ca4f25a53b416a81f1609
2021-03-16 03:49:58 +00:00
Remi NGUYEN VAN
16763614c0
Merge changes from topic "conn_resources_cp" am: 016e0b9261
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1635019
Change-Id: I2e4fa4c5f04463163a058806633571862d4eefd5
2021-03-16 03:11:28 +00:00
Remi NGUYEN VAN
fb1f5458d0
Add ServiceConnectivityResources to tethering am: 60f4c2f425
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1620872
Change-Id: Ieed8fd3fe6cca6857c8c398f73143df41ac2d743
2021-03-16 03:11:26 +00:00
Remi NGUYEN VAN
016e0b9261
Merge changes from topic "conn_resources_cp"
...
* changes:
Add ServiceConnectivityResources to in-process APEX
Add ServiceConnectivityResources to tethering
2021-03-16 02:29:31 +00:00
Lorenzo Colitti
80c351fdb7
Merge "Add test for RouterAdvertisementDaemon." am: e8e91c1726 am: 464a83c23f am: 89c5bcf023
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1485809
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ia42c55833c532a4786ea750f52d7b9551cbad60e
2021-03-15 15:51:38 +00:00
Lorenzo Colitti
0540f45ebf
Merge "Do not open BPF maps when running on R." am: d12f867cb0 am: 9bcb23851b am: b0f7c1ce6a
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1635300
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I37db3a58ac0c86e7b1403fd76e1615bd50386af0
2021-03-15 15:50:45 +00:00
Lorenzo Colitti
f9f5b73e76
Merge "Fix NullPointerException when running testRequestBackgroundNetwork" am: 25e4e50f25 am: 79cd256ec2 am: ecada021e7
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1635299
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I4b4f48b68e2e00b07378a30f237ad255b580cde1
2021-03-15 15:26:35 +00:00
Lorenzo Colitti
ba0fd02a29
Merge "Add test for RouterAdvertisementDaemon." am: e8e91c1726 am: 464a83c23f am: b5c74b7f55
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1485809
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ia895fc8925ab6ff1ba925c299ae7345894341ede
2021-03-15 15:10:03 +00:00
Lorenzo Colitti
88180f37b1
Merge "Do not open BPF maps when running on R." am: d12f867cb0 am: 9bcb23851b am: 9c1e719174
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1635300
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I4d5236d220f0f4ec2eacabd05610af5c27ea5753
2021-03-15 15:09:57 +00:00
Lorenzo Colitti
71a25a49ff
Merge "Fix NullPointerException when running testRequestBackgroundNetwork" am: 25e4e50f25 am: 79cd256ec2 am: 6643be3850
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1635299
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ie3cf6439b4d2873cc12a8c0a79b815db83f4c483
2021-03-15 15:09:22 +00:00
Lorenzo Colitti
89c5bcf023
Merge "Add test for RouterAdvertisementDaemon." am: e8e91c1726 am: 464a83c23f
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1485809
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I7e75b2e2d80949864ec98ba2dc91012a8bc73793
2021-03-15 14:25:35 +00:00
Lorenzo Colitti
b0f7c1ce6a
Merge "Do not open BPF maps when running on R." am: d12f867cb0 am: 9bcb23851b
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1635300
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Idf409e9d933b5a92e90597bcc3d8e9f16fa17b70
2021-03-15 14:25:29 +00:00
Lorenzo Colitti
ecada021e7
Merge "Fix NullPointerException when running testRequestBackgroundNetwork" am: 25e4e50f25 am: 79cd256ec2
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1635299
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Iefc6962434fd20ed37c13904227ebc0cc9ee04f4
2021-03-15 14:25:23 +00:00
Lorenzo Colitti
b5c74b7f55
Merge "Add test for RouterAdvertisementDaemon." am: e8e91c1726 am: 464a83c23f
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1485809
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: If012da4b4eb6b4aaf4999702708e63651cc9c249
2021-03-15 14:24:59 +00:00
Lorenzo Colitti
9c1e719174
Merge "Do not open BPF maps when running on R." am: d12f867cb0 am: 9bcb23851b
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1635300
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I734b4e0ac01f3cb8d0cc3cbdad0cbcc2515d9a47
2021-03-15 14:24:52 +00:00
Lorenzo Colitti
6643be3850
Merge "Fix NullPointerException when running testRequestBackgroundNetwork" am: 25e4e50f25 am: 79cd256ec2
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1635299
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I4aba2412ddc9d1542bb85a6e4df4afa88cddbbde
2021-03-15 14:24:34 +00:00
Lorenzo Colitti
464a83c23f
Merge "Add test for RouterAdvertisementDaemon." am: e8e91c1726
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1485809
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I4ede15f58bc875b49f410366cabe96a02cd89b65
2021-03-15 13:50:37 +00:00
Lorenzo Colitti
9bcb23851b
Merge "Do not open BPF maps when running on R." am: d12f867cb0
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1635300
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I6ca4cb0fe13ee3b9c76577a5f21760f6f6cfcf36
2021-03-15 13:50:25 +00:00
Lorenzo Colitti
79cd256ec2
Merge "Fix NullPointerException when running testRequestBackgroundNetwork" am: 25e4e50f25
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1635299
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ica55e1ae0cbda05a456add36e8fbcd6c866e63cb
2021-03-15 13:48:39 +00:00
Lorenzo Colitti
e8e91c1726
Merge "Add test for RouterAdvertisementDaemon."
2021-03-15 13:21:03 +00:00
Lorenzo Colitti
d12f867cb0
Merge "Do not open BPF maps when running on R."
2021-03-15 13:13:15 +00:00
Lorenzo Colitti
25e4e50f25
Merge "Fix NullPointerException when running testRequestBackgroundNetwork"
2021-03-15 13:09:14 +00:00
lucaslin
bfaefe42d1
Fix NullPointerException when running testRequestBackgroundNetwork
...
aosp/1622675 made handler to be nonnull but
testRequestBackgroundNetwork still pass null as handler when
calling requestBackgroundNetwork, so there is a NullPointerException
when running testRequestBackgroundNetwork.
Bug: 175662146
Test: atest CtsNetTestCases:ConnectivityManagerTest#testRequestBackgroundNetwork
Change-Id: I871992549dfc8cc356221164f1dd49c64f0dae67
2021-03-15 18:49:10 +08:00