Commit Graph

45733 Commits

Author SHA1 Message Date
Les Lee
d6f2ce6fed [automerger skipped] [resolved conflict] Add test case to test normalize am: f444e9d182 am: fc719b474a -s ours
am skip reason: Merged-In I2f5790b9217357ddcf3f466cec1b2b1afbb47210 with SHA-1 f444e9d182 is already in history

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

Change-Id: I13b7568fd53d16ad450e73d66664d6ef190b8a9e
2021-11-15 15:39:27 +00:00
Les Lee
fc719b474a [resolved conflict] Add test case to test normalize am: f444e9d182
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/16214695

Bug: 206073065
Change-Id: I2bbac80ae1b2f64166d6598f72e156b23c0f019e
Merged-In: I80c9f887cf8b4714716d657da92ed273a532ce27
Merged-In: I2f5790b9217357ddcf3f466cec1b2b1afbb47210
Test: Test: I solemnly swear I tested this conflict resolution.
2021-11-15 11:26:34 +00:00
Les Lee
e75effbfe6 [automerger skipped] Add test case to test normalize am: f444e9d182 -s ours am: 63077d4c7c -s ours
am skip reason: Merged-In I2f5790b9217357ddcf3f466cec1b2b1afbb47210 with SHA-1 5299a2b307 is already in history

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

Change-Id: I0513da65ff068c7d371832895893c64bf40c7e6f
2021-11-12 11:18:44 +00:00
Les Lee
63077d4c7c [automerger skipped] Add test case to test normalize am: f444e9d182 -s ours
am skip reason: Merged-In I2f5790b9217357ddcf3f466cec1b2b1afbb47210 with SHA-1 5299a2b307 is already in history

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

Change-Id: I4bd575a0a26c0a4deacc6ca87373c7aa55e39e24
2021-11-12 11:03:36 +00:00
Maciej Żenczykowski
83231e49df Merge changes from topics "rename-libbpfmapjni", "rename-libtetherutiljni" am: ff81692077 am: 694ecd1c53 am: 0a34b679f4 am: d8594a51fa
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1886108

Change-Id: I4b623e87cbb13b797ea2e029250f0204e426175d
2021-11-11 14:31:21 +00:00
markchien
6c1659d26e Rename tethering jni and get the jni by its package name am: f967b11087 am: de93cf9aba am: 6d52305aa9 am: 7e7b752079
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1885530

Change-Id: Ie7aa98d74332eac0c38b6378764523574e84e650
2021-11-11 14:31:18 +00:00
Maciej Żenczykowski
d8594a51fa Merge changes from topics "rename-libbpfmapjni", "rename-libtetherutiljni" am: ff81692077 am: 694ecd1c53 am: 0a34b679f4
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1886108

Change-Id: I413e270249599c23b7d0980ab21a2d13be3c913b
2021-11-11 14:19:29 +00:00
markchien
7e7b752079 Rename tethering jni and get the jni by its package name am: f967b11087 am: de93cf9aba am: 6d52305aa9
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1885530

Change-Id: Iff63a9588d74a43346d9c18729c0e9f0e1a1b21e
2021-11-11 14:19:27 +00:00
Maciej Żenczykowski
0a34b679f4 Merge changes from topics "rename-libbpfmapjni", "rename-libtetherutiljni" am: ff81692077 am: 694ecd1c53
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1886108

Change-Id: I1cd2bb86d2307965e635a61cb11324794681726c
2021-11-11 14:02:36 +00:00
markchien
6d52305aa9 Rename tethering jni and get the jni by its package name am: f967b11087 am: de93cf9aba
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1885530

Change-Id: I39d4a2a9bc402d3ea8f33a1ce5dfec6cb91f4b15
2021-11-11 14:02:34 +00:00
Maciej Żenczykowski
694ecd1c53 Merge changes from topics "rename-libbpfmapjni", "rename-libtetherutiljni" am: ff81692077
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1886108

Change-Id: I14463253c218b1a6f7964566fbc1c93fe48de672
2021-11-11 13:42:41 +00:00
markchien
de93cf9aba Rename tethering jni and get the jni by its package name am: f967b11087
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1885530

Change-Id: Icc18029f126a4845d6d2071d9e36458cbab4c313
2021-11-11 13:42:39 +00:00
Maciej Żenczykowski
ff81692077 Merge changes from topics "rename-libbpfmapjni", "rename-libtetherutiljni"
* changes:
  Rename libbpfmapjni and include bpf common util library
  Rename tethering jni and get the jni by its package name
2021-11-11 13:19:48 +00:00
Treehugger Robot
8f1c12a8f1 Merge "replace R + 1 with S" am: 7eb9f88a6e am: d5ad273033 am: 56d7b04870 am: 511e606557
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1888235

Change-Id: Iba216770137e1af79fabf3bf29d15044d07c3ef2
2021-11-11 08:31:31 +00:00
Treehugger Robot
511e606557 Merge "replace R + 1 with S" am: 7eb9f88a6e am: d5ad273033 am: 56d7b04870
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1888235

Change-Id: I4ed04aa023e712715f96c930cd9fbac7ff012a2f
2021-11-11 08:14:19 +00:00
Treehugger Robot
56d7b04870 Merge "replace R + 1 with S" am: 7eb9f88a6e am: d5ad273033
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1888235

Change-Id: Ifc7daa30ed3b963a2ba2991626eea59d16c8a682
2021-11-11 08:02:01 +00:00
Treehugger Robot
d5ad273033 Merge "replace R + 1 with S" am: 7eb9f88a6e
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1888235

Change-Id: I81fd120c00c876399a69644fa2fe2dd2738b2310
2021-11-11 07:41:53 +00:00
Treehugger Robot
7eb9f88a6e Merge "replace R + 1 with S" 2021-11-11 07:26:39 +00:00
markchien
782a56809b Rename libbpfmapjni and include bpf common util library
1. libbpfmapjni.so is rename to libnet_utils_device_common_bpf.so
2. net-utils-device-common-bpf.jar is separated from
   net-utils-device-common-netlink.jar

Bug: 205088391
Test: atest TetheringTests
      atest CtsTetheringTest
      atest TetheringPrivilegedTests

Change-Id: If59b35b3429ebd597c18678499ff458183f89026
2021-11-11 13:49:15 +08:00
Remi NGUYEN VAN
eae2769799 Merge "Fix NetworkCapabilitiesTest on S" am: 4638c093ed am: 31969c1dc5 am: dbb110de2d am: 3598bd16b6
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1887835

Change-Id: I8d7901d4fc7c9af00c00185dc50115de811f125a
2021-11-11 05:39:01 +00:00
Remi NGUYEN VAN
3598bd16b6 Merge "Fix NetworkCapabilitiesTest on S" am: 4638c093ed am: 31969c1dc5 am: dbb110de2d
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1887835

Change-Id: I8841bbb775f966beda2e5a4d081f452490af7985
2021-11-11 05:22:40 +00:00
Remi NGUYEN VAN
dbb110de2d Merge "Fix NetworkCapabilitiesTest on S" am: 4638c093ed am: 31969c1dc5
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1887835

Change-Id: I8b9d732884b6c2344e1fccfe786ac2dc5aad6b23
2021-11-11 05:10:26 +00:00
Remi NGUYEN VAN
31969c1dc5 Merge "Fix NetworkCapabilitiesTest on S" am: 4638c093ed
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1887835

Change-Id: I7e2c6a22a7314584c05bf12083648cad45249bb2
2021-11-11 04:54:53 +00:00
Remi NGUYEN VAN
4638c093ed Merge "Fix NetworkCapabilitiesTest on S" 2021-11-11 04:42:36 +00:00
Remi NGUYEN VAN
daa03defee Fix NetworkCapabilitiesTest on S
Mark NetworkCapabilitiesTest as ConnectivityModuleTest so that it is
only run in MTS with the Connectivity module installed, and fix
parceling tests to use the right number of fields in that case.

NetworkCapabilitiesTest is only useful to test the Connectivity module,
and not other modules like NetworkStack, as it is a unit test of a class
in the Connectivity module.

Bug: 205901761
Test: atest NetworkCapabilitiesTest
Change-Id: I10ba0f866bc7a39b2c90bdde12a79feefea2d5ee
2021-11-11 12:30:07 +09:00
Maciej Żenczykowski
8834250ef8 replace R + 1 with S
Test: TreeHugger
Bug: 170424293
Signed-off-by: Maciej Żenczykowski <maze@google.com>
Change-Id: I43f53268b6c1605d928ce3431cc95b8a66b6c052
2021-11-10 18:20:01 -08:00
Mark Chien
52192a3b80 Merge "Rename tethering util folder and its package name" am: ea0cfd1897 am: e4235b83be am: 1738c7fda3 am: 1329691f70
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1879620

Change-Id: I6ed87541297b86ab629a1adc5e9bc8eefdc7dcbd
2021-11-10 07:12:37 +00:00
Mark Chien
1329691f70 Merge "Rename tethering util folder and its package name" am: ea0cfd1897 am: e4235b83be am: 1738c7fda3
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1879620

Change-Id: I418293b54c9b34b6e51671223fda1c7e8bd29010
2021-11-10 07:00:55 +00:00
Mark Chien
1738c7fda3 Merge "Rename tethering util folder and its package name" am: ea0cfd1897 am: e4235b83be
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1879620

Change-Id: I31cb70339dde338060a52eefd1175912ceaa8f74
2021-11-10 06:43:44 +00:00
Mark Chien
e4235b83be Merge "Rename tethering util folder and its package name" am: ea0cfd1897
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1879620

Change-Id: Ifb50013d1bca2b99d8c492992ab2ec0a1fec7e32
2021-11-10 06:26:11 +00:00
Mark Chien
ea0cfd1897 Merge "Rename tethering util folder and its package name" 2021-11-10 06:08:28 +00:00
markchien
f967b11087 Rename tethering jni and get the jni by its package name
tetherutiljni is renamed to com_android_networkstack_tethering_jni_util

Bug: 205088391
Test: atest TetheringTests
      atest CtsTetheringTest
      atest TetheringPrivilegedTests
Change-Id: Ifd1f4473625e33d3ebe190c9f8a2b5d54aa1ff49
2021-11-10 14:07:24 +08:00
Remi NGUYEN VAN
eb96b60f67 Don't rematch all requests when adding new ones am: 959d2cb6bd am: b92f209a18 am: 0cd2be4ab9 am: c32b4e9ef3
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1784387

Change-Id: I83a8fffbc81531b64aa8d945e264ead373b9733a
2021-11-10 05:12:15 +00:00
Remi NGUYEN VAN
c32b4e9ef3 Don't rematch all requests when adding new ones am: 959d2cb6bd am: b92f209a18 am: 0cd2be4ab9
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1784387

Change-Id: Ia87ab722412c3a534d70327595180338f1ff1cf3
2021-11-10 05:00:44 +00:00
Remi NGUYEN VAN
0cd2be4ab9 Don't rematch all requests when adding new ones am: 959d2cb6bd am: b92f209a18
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1784387

Change-Id: I31e55ccdfe8b4a4bf432fd03035602d044d6b2a4
2021-11-10 04:42:48 +00:00
Remi NGUYEN VAN
b92f209a18 Don't rematch all requests when adding new ones am: 959d2cb6bd
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1784387

Change-Id: I6fda0e23d242b54e33bf6e4085ef3146c4d51a55
2021-11-10 04:25:52 +00:00
markchien
d02f9af918 Rename tethering util folder and its package name
Move tethering util files from android.net.util into
com.android.networkstack.tethering.util. The goal is move all of
tethering internal files into its own namespace
com.android.networkstack.tethering.util.

Bug: 205088391
Test: atest TetheringTests
      atest CtsTetheringTest
      atest TetheringPrivilegedTests

Change-Id: I6559fb4f873b3cad5b210b10e49df1b6c6914a70
2021-11-09 17:02:47 +08:00
Les Lee
f444e9d182 Add test case to test normalize
Bug: 194939211
Test: atest -c NetworkTemplateTest
Merged-In: I2f5790b9217357ddcf3f466cec1b2b1afbb47210
Change-Id: I2f5790b9217357ddcf3f466cec1b2b1afbb47210
2021-11-09 10:31:56 +08:00
Treehugger Robot
f83c080ea8 Merge "Add TetheredInterface{Request, Callback} interface" am: 7269fb17fd am: 5b6e2b3509 am: 12f02fa941 am: 0287eafe07
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1873874

Change-Id: I34b9fae1da161ae3db5d22f56334ea7c9c3b9278
2021-11-08 10:48:13 +00:00
Treehugger Robot
0287eafe07 Merge "Add TetheredInterface{Request, Callback} interface" am: 7269fb17fd am: 5b6e2b3509 am: 12f02fa941
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1873874

Change-Id: I984cb442face986744fa51a2771ddd6c3d4fc9f7
2021-11-08 10:38:29 +00:00
Treehugger Robot
12f02fa941 Merge "Add TetheredInterface{Request, Callback} interface" am: 7269fb17fd am: 5b6e2b3509
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1873874

Change-Id: I982af95c8251c4520aabef3ebf2384d9f6d353e3
2021-11-08 10:21:32 +00:00
Remi NGUYEN VAN
959d2cb6bd Don't rematch all requests when adding new ones
With the network selection rewrite in S, rematching a single request can
now easily be done; this can be used as an optimization in
handleRegisterNetworkRequests to avoid rematching all requests when
registering a new one.

This can be disabled by a flag that is unset by default,
REMATCH_ALL_REQUESTS_ON_REGISTER.

Test: atest ConnectivityServiceTest
Change-Id: If76f79b41ac88863974f7025624667134bea2570
2021-11-08 19:17:57 +09:00
Treehugger Robot
5b6e2b3509 Merge "Add TetheredInterface{Request, Callback} interface" am: 7269fb17fd
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1873874

Change-Id: Iae7cf249cd17ad9eff30932d686b338763b2b5e5
2021-11-08 10:08:30 +00:00
Treehugger Robot
7269fb17fd Merge "Add TetheredInterface{Request, Callback} interface" 2021-11-08 09:54:54 +00:00
markchien
48e271bdcb Add TetheredInterface{Request, Callback} interface
Define interfaces that match the signature of the existing
EthernetManager.TetheredInterfaceRequest and TetheredInterfaceCallback
classes and make EthernetManager.TetheredInterfaceRequest and
TetheredInterfaceCallback implement/subinterface these interfaces. The
new bluetooth API could also implement these interfaces to make API surface
consistent.

Test: TH would test the existing tests that use the subclass.
Bug: 190438212
Change-Id: I093972c111cb1d921076782492716d5a046be8fc
2021-11-08 16:44:34 +08:00
Mark Chien
8515d8dd93 Merge "Separate tethering build target to Tethering and TetheringNext" am: 7509c7a67e am: ab61c4e42f am: 006c3f1e5e am: 9ef86b385f
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1870417

Change-Id: Icdaf76296fa816f3895f33bb69552343f66f2e06
2021-11-08 08:31:41 +00:00
Mark Chien
9ef86b385f Merge "Separate tethering build target to Tethering and TetheringNext" am: 7509c7a67e am: ab61c4e42f am: 006c3f1e5e
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1870417

Change-Id: Ic4816c970cc5f50c162faf163c649af0a702ba7e
2021-11-08 08:14:52 +00:00
Mark Chien
006c3f1e5e Merge "Separate tethering build target to Tethering and TetheringNext" am: 7509c7a67e am: ab61c4e42f
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1870417

Change-Id: I3ad17fcd7cb2218792651061e0d2b28656094cac
2021-11-08 07:57:18 +00:00
Mark Chien
ab61c4e42f Merge "Separate tethering build target to Tethering and TetheringNext" am: 7509c7a67e
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1870417

Change-Id: I4ba4f4ac5fe1dbce46a78b11063cbc9e6a664aa0
2021-11-08 07:44:33 +00:00
Mark Chien
7509c7a67e Merge "Separate tethering build target to Tethering and TetheringNext" 2021-11-08 07:29:55 +00:00