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
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
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
541495d3c4
Merge "Remove networkAttributes resource usage" am: 584cfc6b67 am: 5916c38d92 am: 0835287e0e
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1639708
Change-Id: Ibd6a880835ea60e9592ac64d6c2154448b682f99
2021-03-17 22:18:55 +00:00
Kimberly Kreider
559f04b0db
Merge "Enable networking tests to be included in partial MTS files as well as full mts." am: 6f4d35119f am: 8266302ee7 am: 56c0b8c40a
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1531141
Change-Id: I90d6e59689917192ddfe4df251d90ccd2b42c0c2
2021-03-17 17:00:00 +00:00
Maciej Żenczykowski
a8798965cb
Merge "Test conntrack event monitor on R" am: d5f07c1243 am: 4c9bfb1fbd am: 9788c4a2e6
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1639707
Change-Id: Iff25e4df195abb02ca8e7b94decaaa404f742652
2021-03-17 16:38:38 +00:00
Treehugger Robot
0d3596d4f7
Merge "Do not start conntrack event monitor when running on R" am: c162fc297f am: de2d7bef3b am: cde05e5133
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1639703
Change-Id: Iecbed59bf7dcc249b288164e43d5357eff3f94f2
2021-03-17 16:16:28 +00:00
Chalard Jean
5b0021764a
Merge "[NS01.cn] Adjust calls for NetworkScore" am: bc786632cf am: 1834461387 am: c85ade177f
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1620870
Change-Id: I216b0cc96d9f736e20e11a569edf6637fa00b8c0
2021-03-17 16:04:22 +00:00
Maciej Żenczykowski
e209d1d3b9
Merge "add test for TetheringUtils::setupNsSocket()" am: d3bb5a544c am: b0c92ad6c8 am: d3bc95b1d2
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1638165
Change-Id: Ib8d1dd46a7f7a417eed78855b6ee64f233d19da8
2021-03-17 16:04:02 +00:00
Lorenzo Colitti
469aca2f10
Merge "Add a test for TetheringUtils.setupNaSocket." am: d5edbb9eb4 am: 706d7ffb3e am: 804a3e1f98
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1639699
Change-Id: Ieec0d01a0cf3cb043202e32b728c379a03c0f78a
2021-03-17 16:03:55 +00:00
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
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
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
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
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
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