Sudheer Shanka
a8a84a64d5
Merge "Shorten the name for the dump file." into sc-dev
2021-03-22 17:12:25 +00:00
Treehugger Robot
88a8053afd
[automerger skipped] Merge "Revert^2 "Replace the usage of UidRange"" am: bf0c19e52f -s ours am: 1baa39f7b1 -s ours am: 3e0e2d99c5 -s ours
...
am skip reason: skip tag Change-Id I4bc0daf5ad9e4b4043f4a897ddab16aec8f8a536 with SHA-1 41918d6cd1 is already in history
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1646849
Change-Id: I2faee160c607f6784eb2fc2f951a638c2caecc18
2021-03-22 12:28:02 +00:00
Remi NGUYEN VAN
11e9938050
[automerger skipped] Move connectivity AIDLs to android.net am: cc305b2fa5 am: 1feb0c3076 am: 7c031b31b9 -s ours
...
am skip reason: skip tag Change-Id I23feb26c5de2fd7a4177797a3bc1d0dcbef4ade7 with SHA-1 9cb8dfc110 is already in history
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1596432
Change-Id: Ia5ece90fe5ac9e9bb745964577c6e9ab2e8f0d53
2021-03-22 12:26:13 +00:00
Remi NGUYEN VAN
836e3e1276
Merge "Add framework-connectivity to tethering tests" into sc-dev
2021-03-22 04:19:31 +00:00
Treehugger Robot
2f96650bb5
[automerger skipped] Merge "Revert^2 "Replace the usage of UidRange"" am: bf0c19e52f -s ours am: 1baa39f7b1 -s ours am: c4d114ad6f -s ours
...
am skip reason: skip tag Change-Id I4bc0daf5ad9e4b4043f4a897ddab16aec8f8a536 with SHA-1 41918d6cd1 is already in history
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1646849
Change-Id: Iae701c502dd7c17b33b8b3efaca38a632a71af0c
2021-03-21 18:28:38 +00:00
Remi NGUYEN VAN
07f733ed12
[automerger skipped] Move connectivity AIDLs to android.net am: cc305b2fa5 am: 1feb0c3076 am: ddd1a6b40a -s ours
...
am skip reason: skip tag Change-Id I23feb26c5de2fd7a4177797a3bc1d0dcbef4ade7 with SHA-1 9cb8dfc110 is already in history
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1596432
Change-Id: I86a18da2694561794d1f9d6f1995bd6c854da48a
2021-03-21 18:08:24 +00:00
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
c4d114ad6f
[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: I169190c331866089d76ba64faebc309dae827239
2021-03-21 17:27:12 +00:00
Remi NGUYEN VAN
ddd1a6b40a
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: Ifd637a65600cc1185d27b15e486fcaeb83b244db
2021-03-21 17:26:59 +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
Sudheer Shanka
2b5735165a
Shorten the name for the dump file.
...
The file name is getting truncated by tradefed and
we are missing the information to actually idenity
the test. So, instead shorten the filename to preserve
the test name.
Test: atest ./tests/cts/hostside/src/com/android/cts/net/HostsideRestrictBackgroundNetworkTests.java
Ignore-AOSP-First: Submitting internally first to avoid merge conflicts.
Change-Id: Ic0f87b97bb58e115fe81e2d688ce0e633397da42
2021-03-21 12:24:09 +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
Remi NGUYEN VAN
34d197bc2d
Add framework-connectivity to tethering tests
...
This is necessary for tethering tests to build against hidden
framework-connectivity APIs after it is moved out of
framework-minus-apex.
Bug: 179229316
Test: atest TetheringTests
Ignore-AOSP-First: Need manual cherry-picks
Change-Id: I912fcd19bacb75a5944409b07d8e014032657d4a
2021-03-19 13:16:01 +00:00
Maciej Żenczykowski
15c03bd9c8
bpf_progs - remove unused dependencies am: b1ffd2ce9b am: 2f780deb38 am: b40575e832
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1646235
Change-Id: I95bad9d6bba3f65a757b44b5890ec4cb7405c236
2021-03-19 11:11:37 +00:00
Remi NGUYEN VAN
66a8357ede
Merge "Move connectivity AIDLs to android.net" into sc-dev
2021-03-19 10:51:22 +00:00
Maciej Żenczykowski
3f3743eb65
bpf_progs - remove unused dependencies am: b1ffd2ce9b am: 2f780deb38 am: d65201b5a1
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1646235
Change-Id: Ie77273c3c40707d4324c1930a5be715968c0c2f8
2021-03-19 10:50:04 +00: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
b40575e832
bpf_progs - remove unused dependencies am: b1ffd2ce9b am: 2f780deb38
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1646235
Change-Id: I3b51769d1bb88d5febc1800d93cd7fcc6f6c13b3
2021-03-19 09:57:58 +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
Remi NGUYEN VAN
9cb8dfc110
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
Ignore-AOSP-First: needs manual cherry-pick
Change-Id: I23feb26c5de2fd7a4177797a3bc1d0dcbef4ade7
2021-03-19 08:57:00 +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
Chiachang Wang
41918d6cd1
Replace the usage of UidRange
...
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.
Ignore-AOSP-First: Prevent race in automerger
Bug: 172183305
Test: atest FrameworksNetTests CtsNetTestCasesLatestSdk
Change-Id: I4bc0daf5ad9e4b4043f4a897ddab16aec8f8a536
2021-03-19 00:51:19 +00:00
Maciej Żenczykowski
0bd705cac4
Merge changes Ibe325714,I44f3dc9e am: 63be468bf4 am: 3828871130 am: 5066bb74a5
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1644628
Change-Id: I93d7a5e78df8ba03a01f40037ea6475553f2ea89
2021-03-18 23:31:45 +00:00
Maciej Żenczykowski
13218831c5
Merge changes Ibe325714,I44f3dc9e am: 63be468bf4 am: 3828871130 am: cfd48295b3
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1644628
Change-Id: I9641a9838fb5d5a970e869530ab7399d23dc89da
2021-03-18 23:08:04 +00:00
Maciej Żenczykowski
cfd48295b3
Merge changes Ibe325714,I44f3dc9e am: 63be468bf4 am: 3828871130
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1644628
Change-Id: I456582e52c4991fb5e1c53e772ef14621d5434d6
2021-03-18 22:42:04 +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
453e777db7
Merge "Revert "Replace the usage of UidRange"" am: 83f77d83fd am: 0f97255402 am: 4d66e2262b
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1645769
Change-Id: Ibe8455c8dcc8ca48d7929b855b2f2938ae6acd5b
2021-03-18 18:29:41 +00:00
Chiachang Wang
d2ab7d890d
Merge "Replace the usage of UidRange" am: 1241156261 am: 73a03e9ca8 am: 9da0d42d61
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1597481
Change-Id: I0e5d4557ee6ec5d2542f5dd35993c04e63df480f
2021-03-18 18:26:43 +00:00
Anthony Stange
ed43a3d28d
Merge "Revert "Replace the usage of UidRange"" am: 83f77d83fd am: 0f97255402 am: abc4b59c47
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1645769
Change-Id: I7182b6f373405d7e12f92f29e7cbaf4ab66b8a13
2021-03-18 18:23:31 +00:00
Anthony Stange
abc4b59c47
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: I86886953ab47f4d176b11d64a915e637559b3987
2021-03-18 17:41:40 +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
871e5043d3
Merge "Replace the usage of UidRange" am: 1241156261 am: 73a03e9ca8 am: 54bf54b774
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1597481
Change-Id: I3998c164b05983a4f4528ed5bef8089e89868d3f
2021-03-18 15:12:52 +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
54bf54b774
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: I82fadd50f3141dab679d361cd17bf7a1f4349e9c
2021-03-18 14:28:24 +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
7f3037b661
Merge "Fix a bug where any() returns null" am: 3a1932cd79 am: dea6a318db am: 2b68c9c384
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1640139
Change-Id: I35511e62101f4415525f9cea98414c9b570c2d7b
2021-03-18 12:05:10 +00:00
Chalard Jean
1be69c5bb6
Merge "Fix a bug where any() returns null" am: 3a1932cd79 am: dea6a318db am: 3f46774f42
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1640139
Change-Id: Ie5f6b41c8025940a1897a2fec5feb2bc605b4d8b
2021-03-18 12:04:13 +00:00
Chalard Jean
3f46774f42
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: I07d5c7f5e2a49cf7229176abc398f4f138351920
2021-03-18 11:14:37 +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