LineageOS/android_packages_modules_Connectivity
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
10,068 Commits 2 Branches 0 Tags
3e0e2d99c5ff44bb8f1721bb881ce806bb680ff6
Commit Graph

10068 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Treehugger Robot
3e0e2d99c5 [automerger skipped] Merge "Revert^2 "Replace the usage of UidRange"" am: bf0c19e52f -s ours am: 1baa39f7b1 -s ours 
am skip reason: skip tag Change-Id I4bc0daf5ad9e4b4043f4a897ddab16aec8f8a536 with SHA-1 c1f14634a4 is already in history

Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1646849

Change-Id: I301142303402edb2a801014b937b5fbc37d1a8c7
 2021-03-21 17:30:02 +00:00
Remi NGUYEN VAN
7c031b31b9 Move connectivity AIDLs to android.net am: cc305b2fa5 am: 1feb0c3076 
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1596432

Change-Id: I45bfb05a3091d322b3395907d87334d406fee1cc
 2021-03-21 17:29:04 +00:00
Treehugger Robot
1baa39f7b1 [automerger skipped] Merge "Revert^2 "Replace the usage of UidRange"" am: bf0c19e52f -s ours 
am skip reason: skip tag Change-Id I4bc0daf5ad9e4b4043f4a897ddab16aec8f8a536 with SHA-1 c1f14634a4 is already in history

Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1646849

Change-Id: Id633ed17067ec06bb2a296d9e6c07a11db47978b
 2021-03-21 16:55:29 +00:00
Treehugger Robot
bf0c19e52f Merge "Revert^2 "Replace the usage of UidRange"" 2021-03-21 16:41:13 +00:00
Remi NGUYEN VAN
1feb0c3076 Move connectivity AIDLs to android.net am: cc305b2fa5 
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1596432

Change-Id: I5825db16d1fc8f41f8ec99eb08fae550aed2cbc9
 2021-03-21 16:37:03 +00:00
Remi NGUYEN VAN
cc305b2fa5 Move connectivity AIDLs to android.net 
java_sdk_libraries and apexes need to contain bootclasspath classes
under predefined packages. Tethering currently uses android.net, so make
sure all the connectivity bootclasspath classes are under android.net.

This avoids maintaining two packages for the tethering APEX, where
com.android.connectivity.aidl is only used by internal AIDL files.

Bug: 182984842
Test: m
Change-Id: I23feb26c5de2fd7a4177797a3bc1d0dcbef4ade7
Merged-In: I23feb26c5de2fd7a4177797a3bc1d0dcbef4ade7
 2021-03-20 22:24:08 +09:00
Maciej Żenczykowski
d65201b5a1 bpf_progs - remove unused dependencies am: b1ffd2ce9b am: 2f780deb38 
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1646235

Change-Id: I7fbb943db076cf3a70686a9c208bc82798a02cf1
 2021-03-19 09:58:37 +00:00
Maciej Żenczykowski
2f780deb38 bpf_progs - remove unused dependencies am: b1ffd2ce9b 
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1646235

Change-Id: I36ee32c100eeb1f0fb89ea13fcb3c0b8c0869259
 2021-03-19 09:38:40 +00:00
Maciej Żenczykowski
b1ffd2ce9b bpf_progs - remove unused dependencies 
Test: builds, atest, TreeHugger
Signed-off-by: Maciej Żenczykowski <maze@google.com>
Change-Id: I9414bde566bb73b696593587db854de3fb14cdcc
 2021-03-19 03:39:42 +00:00
Chiachang Wang
2fb0846d70 Revert^2 "Replace the usage of UidRange" 
274c796731

The parameter of NetworkCapabilities.setUids() and
NetworkRequest.Builder.setUids() are updated to take a set of
integer Range instead of a set of UidRange because of refactor
work for the incoming connectivity mainline module.

The parameter change stops NetworkRequestTest to work in the
different API levels. Replace the usage with shims to work in
both current and stable APIs.

Bug: 172183305
Test: atest FrameworksNetTests CtsNetTestCasesLatestSdk

Change-Id: I7d18402f051051371f3054f6897b05b6da072105
Merged-In: I4bc0daf5ad9e4b4043f4a897ddab16aec8f8a536
 2021-03-19 02:10:06 +00:00
Maciej Żenczykowski
5066bb74a5 Merge changes Ibe325714,I44f3dc9e am: 63be468bf4 am: 3828871130 
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1644628

Change-Id: I1636d12476f44d6b1e92ecc6d5335626cc07ea76
 2021-03-18 22:41:56 +00:00
Maciej Żenczykowski
3828871130 Merge changes Ibe325714,I44f3dc9e am: 63be468bf4 
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1644628

Change-Id: Ic9317d85c0a8ea637dbc626b704ef354fc9e295f
 2021-03-18 22:05:58 +00:00
Maciej Żenczykowski
63be468bf4 Merge changes Ibe325714,I44f3dc9e 
* changes:
  fix whitespace in offload.c macro
  change PRIO_CLAT into a comment
 2021-03-18 19:53:24 +00:00
Anthony Stange
4d66e2262b Merge "Revert "Replace the usage of UidRange"" am: 83f77d83fd am: 0f97255402 
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1645769

Change-Id: I05f7b4d1a54f032a57cd6a3771e016fbeafb7e40
 2021-03-18 17:26:18 +00:00
Anthony Stange
0f97255402 Merge "Revert "Replace the usage of UidRange"" am: 83f77d83fd 
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1645769

Change-Id: I2c1ea63ffad95538e8ae54d9cf601235191c6af0
 2021-03-18 17:03:00 +00:00
Anthony Stange
83f77d83fd Merge "Revert "Replace the usage of UidRange"" 2021-03-18 16:40:53 +00:00
Anthony Stange
274c796731 Revert "Replace the usage of UidRange" 
Revert "Replace the usage of UidRange"

Revert "Add shims for NetworkRequest"

Revert submission 1626206-replaceUidRange

Reason for revert: Breaking build - b/183106405
Reverted Changes:
I0b79c73e8:Add shims for NetworkRequest
I4bc0daf5a:Replace the usage of UidRange
I4e5aec6ef:Replace the usage of UidRange
I107c329d4:Expose uids related APIs in NetworkRequest and Net...

Change-Id: I5a4addc562d180487e2891fd2081c593126e6ffc
 2021-03-18 16:30:59 +00:00
Chiachang Wang
9da0d42d61 Merge "Replace the usage of UidRange" am: 1241156261 am: 73a03e9ca8 
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1597481

Change-Id: Ib958517e695c9cec173d503954a44f3dcd6eabed
 2021-03-18 14:28:59 +00:00
Chiachang Wang
73a03e9ca8 Merge "Replace the usage of UidRange" am: 1241156261 
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1597481

Change-Id: Ia6ed617c849fd8ae68874b530f108428676068e6
 2021-03-18 14:01:33 +00:00
Chiachang Wang
1241156261 Merge "Replace the usage of UidRange" 2021-03-18 13:36:39 +00:00
Chalard Jean
2b68c9c384 Merge "Fix a bug where any() returns null" am: 3a1932cd79 am: dea6a318db 
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1640139

Change-Id: I12e93d0197f7920c240d9eae5d3fba2628756a20
 2021-03-18 11:14:33 +00:00
Chalard Jean
dea6a318db Merge "Fix a bug where any() returns null" am: 3a1932cd79 
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1640139

Change-Id: Icb56bbae07dc6de85668c0a202829c92422cbb3d
 2021-03-18 10:36:29 +00:00
Chalard Jean
3a1932cd79 Merge "Fix a bug where any() returns null" 2021-03-18 09:59:21 +00:00
Maciej Żenczykowski
3f32a83207 fix whitespace in offload.c macro 
Test: atest, TreeHugger
Signed-off-by: Maciej Żenczykowski <maze@google.com>
Change-Id: Ibe325714f95a1accce8add16220a31ca15913816
 2021-03-18 02:34:01 -07:00
Maciej Żenczykowski
af1f314cbd change PRIO_CLAT into a comment 
Test: atest, TreeHugger
Signed-off-by: Maciej Żenczykowski <maze@google.com>
Change-Id: I44f3dc9e3a3462f275a04ed5601370f664b985a2
 2021-03-18 02:33:56 -07:00
Remi NGUYEN VAN
0835287e0e Merge "Remove networkAttributes resource usage" am: 584cfc6b67 am: 5916c38d92 
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1639708

Change-Id: Iaa49de3f678181d9aaf6f009321f85c63b163689
 2021-03-17 12:34:48 +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
56c0b8c40a 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: Ida996c15aeed86febda6a44aa3625f53a882fda0
 2021-03-17 03:07:45 +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
9788c4a2e6 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: Ib3f2e2253fafdf6bd306d065c6d8a8101cfcc6a1
 2021-03-16 13:27:03 +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
Chalard Jean
1705798d13 Fix a bug where any() returns null 
The type needs to be specified

Test: NetworkAgentTest
Change-Id: I7128ae520cb7175f1fb9467a94edfd1a4bdeb9da
 2021-03-16 21:49:29 +09: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
cde05e5133 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: I566869dbb5e14ced269e286597381533d6f92c1b
 2021-03-16 09:05:40 +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
c85ade177f 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: I07fffa5883000d966a8101f9950c03e18028d214
 2021-03-16 07:08:25 +00:00
Maciej Żenczykowski
d3bc95b1d2 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: If39dd7f5d6d4dbe1a0bbc487b743d6fbc360cd98
 2021-03-16 07:07:10 +00:00
Lorenzo Colitti
804a3e1f98 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: I957fc61a12f514de19496dd84d739dd794f040eb
 2021-03-16 07:06:55 +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