Remi NGUYEN VAN
554745cae7
[automerger skipped] Merge changes from topic "conn_resources_cp" am: 016e0b9261 am: 16763614c0 am: c53077244f -s ours
...
am skip reason: skip tag Change-Id Ic2491f04880ff66abc3b2d3aaee6168e18f6d68a with SHA-1 50caf56267 is already in history
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1635019
Change-Id: Id2bd09364da050578e7168cf7a38a87b1a724204
2021-03-17 16:02:21 +00:00
Remi NGUYEN VAN
d9e76fbf0e
[automerger skipped] Add ServiceConnectivityResources to tethering am: 60f4c2f425 am: fb1f5458d0 am: 51bddeaaec -s ours
...
am skip reason: skip tag Change-Id I3c7fc6285f10318ecef05a64e1179054bb831d99 with SHA-1 affd94b26d is already in history
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1620872
Change-Id: I7cc4c83c906b041f8b7aa60064cad022fe0154e2
2021-03-17 16:02:18 +00:00
Remi NGUYEN VAN
48aac8f642
Merge "Remove networkAttributes resource usage" am: 584cfc6b67 am: 5916c38d92 am: 13e433b63e
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1639708
Change-Id: Ia59896f5fb23f4bdd07641485c516f30bde7588f
2021-03-17 13:17:06 +00:00
Remi NGUYEN VAN
13e433b63e
Merge "Remove networkAttributes resource usage" am: 584cfc6b67 am: 5916c38d92
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1639708
Change-Id: Ib09dccf181d2d9fa9cf31e8da3d4ee7454d2dc68
2021-03-17 12:34:22 +00:00
Remi NGUYEN VAN
5916c38d92
Merge "Remove networkAttributes resource usage" am: 584cfc6b67
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1639708
Change-Id: I94c174ca3ee356706947f213cb05d0a47deff233
2021-03-17 11:51:17 +00:00
Remi NGUYEN VAN
584cfc6b67
Merge "Remove networkAttributes resource usage"
2021-03-17 11:24:28 +00:00
Kimberly Kreider
38e41e4404
Merge "Enable networking tests to be included in partial MTS files as well as full mts." am: 6f4d35119f am: 8266302ee7 am: 17eae52145
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1531141
Change-Id: Ic16ee449e5eec1e947ac215d5aa27845c0e2e675
2021-03-17 03:48:42 +00:00
Aaron Huang
517cfad3e6
Merge "Update import class of TAG_SYSTEM_NEIGHBOR" into sc-dev
2021-03-17 03:16:56 +00:00
Kimberly Kreider
17eae52145
Merge "Enable networking tests to be included in partial MTS files as well as full mts." am: 6f4d35119f am: 8266302ee7
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1531141
Change-Id: Id1fc29e6bfcc8422a2a2b8b0f609035b6ab9ae09
2021-03-17 03:07:27 +00:00
Kimberly Kreider
8266302ee7
Merge "Enable networking tests to be included in partial MTS files as well as full mts." am: 6f4d35119f
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1531141
Change-Id: I5aed0f6bfc7bbb30c5c6794431276e40a110b3a4
2021-03-17 02:47:32 +00:00
Kimberly Kreider
6f4d35119f
Merge "Enable networking tests to be included in partial MTS files as well as full mts."
2021-03-17 02:23:54 +00:00
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
Remi NGUYEN VAN
f1c04fb6b3
Remove networkAttributes resource usage
...
Supported network types are now deduced from system features, not the
networkAttributes resource.
Update the test to expect network types to be configured as per
resources before S, and to match system features on S+.
Bug: 146206136
Test: atest CtsNetTestCases:android.net.cts.ConnectivityManagerTest
Change-Id: I715924d562f439f7239c1c95d2dc5bca7095a123
2021-03-16 16:54:17 +09: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
c53077244f
Merge changes from topic "conn_resources_cp" am: 016e0b9261 am: 16763614c0
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1635019
Change-Id: Ib1c92cf86dbdae88ad384d7aa0bf71f84dbb85d4
2021-03-16 03:50:49 +00:00
Remi NGUYEN VAN
51bddeaaec
Add ServiceConnectivityResources to tethering am: 60f4c2f425 am: fb1f5458d0
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1620872
Change-Id: I9f87e230b74478658c603d83f98b4ede71f45b94
2021-03-16 03:50:47 +00: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
Aaron Huang
8369a74fab
Update import class of TAG_SYSTEM_NEIGHBOR
...
TrafficStatsConstants.TAG_SYSTEM_NEIGHBOR is moved to
NetworkStackConstants so update the import class name for it.
Bug: 182349970
Test: FrameworksNetTests
NetworkStackTests
TetheringTests
Ignore-AOSP-First: this topic needs to be cherry-picked manually
to AOSP to avoid automerging differences.
Change-Id: I8fcd2772ed873d318233d3029184e4352245d4cd
2021-03-16 00:02:29 +08: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