Aaron Huang
3bde36484b
Merge "Use real ProxyTracker in ConnectivityServiceTest" am: c7037475fa am: 4fc403c3b0 am: 1faca14f77
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1885529
Change-Id: I2f4a689aae9dafbad0bb5e3cd74f43a5c72fd898
2021-11-22 06:03:37 +00:00
Aaron Huang
1faca14f77
Merge "Use real ProxyTracker in ConnectivityServiceTest" am: c7037475fa am: 4fc403c3b0
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1885529
Change-Id: Id9b717824540504570de9b4c27503f04c2b41fda
2021-11-22 05:53:14 +00:00
Aaron Huang
4fc403c3b0
Merge "Use real ProxyTracker in ConnectivityServiceTest" am: c7037475fa
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1885529
Change-Id: Id685a51b37d59a822aaa9307f9d4b55053211612
2021-11-22 05:41:34 +00:00
Aaron Huang
c7037475fa
Merge "Use real ProxyTracker in ConnectivityServiceTest"
2021-11-22 05:25:28 +00:00
Remi NGUYEN VAN
d1ed21007a
Remove unused service and test dependencies am: f96ecf2708 am: e03f77170a am: 7d865f3e10
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1895317
Change-Id: I22260179985637d82e20b346786bed44148e5dc2
2021-11-19 16:27:47 +00:00
Remi NGUYEN VAN
7d865f3e10
Remove unused service and test dependencies am: f96ecf2708 am: e03f77170a
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1895317
Change-Id: I86b43cdf7f28d640f0598238141490996036c4aa
2021-11-19 16:17:44 +00:00
Remi NGUYEN VAN
e03f77170a
Remove unused service and test dependencies am: f96ecf2708
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1895317
Change-Id: I677a6b4c0b68648b4fab0e6f67edc88aa8be77b2
2021-11-19 15:59:07 +00:00
Remi NGUYEN VAN
f96ecf2708
Remove unused service and test dependencies
...
Nothing uses StateMachine in service-connectivity, and
FrameworksNetTestsLib pulled a lot of unused dependencies with
services.core and services.net.
Remove unused dependencies. This helps measure code coverage more
accurately.
Bug: 207020032
Test: atest ConnectivityCoverageTests
Change-Id: I39857865594a3263c4b1deeda23312c8e4f86a77
2021-11-19 21:14:39 +09:00
Xin Li
5859946ca3
[automerger skipped] Merge "Merge sc-qpr1-dev-plus-aosp-without-vendor@7810918" into stage-aosp-master am: c96c26077b -s ours am: caad89cf93 -s ours
...
am skip reason: Merged-In I745ef4d42ecaf06bb81d9dbe0b7162267fea65a8 with SHA-1 67ee516732 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/16278867
Change-Id: If96692993899e74d0c80375c14897ea3df5843d9
2021-11-18 22:25:13 +00:00
Xin Li
caad89cf93
[automerger skipped] Merge "Merge sc-qpr1-dev-plus-aosp-without-vendor@7810918" into stage-aosp-master am: c96c26077b -s ours
...
am skip reason: Merged-In I745ef4d42ecaf06bb81d9dbe0b7162267fea65a8 with SHA-1 67ee516732 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/16278867
Change-Id: Ic59ae51eb3fc341e90d645b4da319c0447fbdccc
2021-11-18 22:00:57 +00:00
Xin Li
c96c26077b
Merge "Merge sc-qpr1-dev-plus-aosp-without-vendor@7810918" into stage-aosp-master
2021-11-18 21:29:06 +00:00
Treehugger Robot
1233439894
Merge "Disable CtsNetTestCases if needed" am: 2c75c0444d am: d42bf9e53b am: 65a20ad635
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1892477
Change-Id: Icdd62c981cbc18e6fdf47998b60b196887f182a8
2021-11-18 12:26:30 +00:00
Treehugger Robot
65a20ad635
Merge "Disable CtsNetTestCases if needed" am: 2c75c0444d am: d42bf9e53b
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1892477
Change-Id: Iccc7f22c470cbc5c38b156c60452659d982309b2
2021-11-18 12:14:16 +00:00
Treehugger Robot
d42bf9e53b
Merge "Disable CtsNetTestCases if needed" am: 2c75c0444d
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1892477
Change-Id: I3e3d8fde1970407f40657136d3a411008aaa99c0
2021-11-18 11:56:24 +00:00
Treehugger Robot
2c75c0444d
Merge "Disable CtsNetTestCases if needed"
2021-11-18 11:43:07 +00:00
Maciej Żenczykowski
93873d956d
explicitly specify that offload.o & test.o bpf programs are S+ am: a457bf7ea8 am: 961b290878 am: a93046a9d9
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1895606
Change-Id: I91436e8303e672455c11160390bda6597167717e
2021-11-18 05:51:39 +00:00
Maciej Żenczykowski
a93046a9d9
explicitly specify that offload.o & test.o bpf programs are S+ am: a457bf7ea8 am: 961b290878
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1895606
Change-Id: I4f7d7d9b376df392ce64aebe752cb8196269af1a
2021-11-18 05:35:51 +00:00
Maciej Żenczykowski
961b290878
explicitly specify that offload.o & test.o bpf programs are S+ am: a457bf7ea8
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1895606
Change-Id: I39b24e96b5adc766473e7d369b44f5bfbdc40e5c
2021-11-18 05:18:15 +00:00
Les Lee
21fe2e30d4
[automerger skipped] Merge "[conflict] Add test case to test normalize am: f444e9d182" into sc-v2-dev am: 28da18e286 -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/+/16247421
Change-Id: I6fd2d10a258a7dd68c18cc69cb7c1493e222c512
2021-11-18 02:05:50 +00:00
Les Lee
28da18e286
Merge "[conflict] Add test case to test normalize am: f444e9d182" into sc-v2-dev
2021-11-18 01:49:03 +00:00
Maciej Żenczykowski
a457bf7ea8
explicitly specify that offload.o & test.o bpf programs are S+
...
Note: due to the release version of the Connectivity/Tethering mainline
module being built from sc-mainline-prod, this won't actually take effect
until system/bpf bpfloader at version 0.6+ is merged in to that tree.
This doesn't really matter, since currently things default to v0.0+.
But there is no mainline module updatable pre-v0.2 supported OS
anyway. BpfLoader v0.2 is what shipped in Android S Beta 4 through
Android S Final.
Before S there simply was no bpfloader support for mainline updatable
ebpf code, while S Beta 3 and earlier shipped v0.0 which is badly
incompatible with even the current version of the mainline module.
Additionally v0.0 doesn't even parse this field, while v0.1 which
does was very short lived [~3 days] and can thus be utterly ignored.
As such this change is effectively a no-op, and even post merge
of bpfloader v0.6+ into sc-mainline-prod will still be effectively
a no-op.
So why do it? I want to explicitly document that these programs are S+,
so that I can change the default in the future to be T+.
Test: TreeHugger
Signed-off-by: Maciej Żenczykowski <maze@google.com >
Change-Id: I7e5d0124700c7045abe16b1f3b504c9e88054ff2
2021-11-17 12:04:44 -08:00
Treehugger Robot
096cd70a04
Merge "Always use OWNERS from master branch." am: d8d887bd39 am: bc0c9111f3 am: 6de9d4b950
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1894899
Change-Id: I1efbeae63c7ee857bbe814da6d8f856e8c31195a
2021-11-17 09:01:50 +00:00
Treehugger Robot
6de9d4b950
Merge "Always use OWNERS from master branch." am: d8d887bd39 am: bc0c9111f3
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1894899
Change-Id: If564e6af51a39593195f8ad160bea80fdbf12732
2021-11-17 08:45:14 +00:00
Treehugger Robot
bc0c9111f3
Merge "Always use OWNERS from master branch." am: d8d887bd39
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1894899
Change-Id: I7767c1ec16b4a4dcc0becdc134f195c1edd66cb0
2021-11-17 08:07:38 +00:00
Treehugger Robot
d8d887bd39
Merge "Always use OWNERS from master branch."
2021-11-17 07:55:00 +00:00
Chalard Jean
bfc2b02f14
S- not to crash on NetworkInfo(null) or setDetailedState(null) am: dece0d805f am: 66bd87f0d4 am: 2f6631cd7c
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1892101
Change-Id: I968710654234e9756ef5f3cc39a5cb4741887366
2021-11-17 07:25:40 +00:00
Chalard Jean
2f6631cd7c
S- not to crash on NetworkInfo(null) or setDetailedState(null) am: dece0d805f am: 66bd87f0d4
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1892101
Change-Id: Iddb56ae95da59cfc9bc45b2f6139b1a578ad0c9d
2021-11-17 07:15:12 +00:00
Chalard Jean
66bd87f0d4
S- not to crash on NetworkInfo(null) or setDetailedState(null) am: dece0d805f
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1892101
Change-Id: Idfb993a40d43a4ead862c229c93b8cb680b7bc1a
2021-11-17 06:49:44 +00:00
Maciej Żenczykowski
101f39bb66
Always use OWNERS from master branch.
...
Since you cannot include yourself we need an extra level of indirection,
to make sure that OWNERS remains current even in historical branches.
Also vastly increase the number of OWNERS
Test: N/A
Signed-off-by: Maciej Żenczykowski <maze@google.com >
Change-Id: I19723fd9fbcee8fe3d8c9386ec5290d2764f2104
2021-11-17 05:58:02 +00:00
Les Lee
109b1246c3
[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
Bug: 206448852
Test: Test: I solemnly swear I tested this conflict resolution.
Merged-In: I80c9f887cf8b4714716d657da92ed273a532ce27
Merged-In: I2f5790b9217357ddcf3f466cec1b2b1afbb47210
2021-11-16 03:46:22 +00:00
Oriol Prieto Gasco
a3d2f72c82
[automerger skipped] Revert "[resolved conflict] Add test case to test normalize am: f444e9d182" am: 48683e2439 -s ours
...
am skip reason: Merged-In I2f5790b9217357ddcf3f466cec1b2b1afbb47210 with SHA-1 f444e9d182 is already in history. Merged-In was found from reverted change.
Reverted change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/16251687
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/16264980
Change-Id: I14c167625d8f098388d0c3012385989af0ef2b4c
2021-11-16 00:55:48 +00:00
Oriol Prieto Gasco
48683e2439
Revert "[resolved conflict] Add test case to test normalize am: f444e9d182"
...
This reverts commit fc719b474a .
Reason for revert: DroidMonitor-triggered revert due to breakage bug b/206448852
Bug: 206448852
Change-Id: I7f685bc1b2e4b2b3b33a2d2f0e430a321d7493fe
2021-11-15 23:39:55 +00:00
Taras Antoshchuk
bc3f86dfa3
Disable CtsNetTestCases if needed
...
Apply NetworkStackNextEnableDefaults to CtsNetTestCases to disable it
in branches where NetworkStackNext and related targets should not be
built.
Test: presubmit
Change-Id: I850b4294aa4c3c01f8871760185ca7fedc0f8584
2021-11-15 17:40:42 +01:00
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
Chalard Jean
dece0d805f
S- not to crash on NetworkInfo(null) or setDetailedState(null)
...
When NetworkInfo(null) or setDetailedState(null, any, any) are
called, S used to not crash but plant a null bomb for later
which may explode in some calls (notably, parceling) : see the
bug referenced below for details.
To help catching these errors earlier a patch was made to crash
as soon as one of these methods is called with a null argument,
but this will also crash incorrect use on existing code that
may never actually step on the mine, crashing code that used not
to crash. For safety, implement the new behavior only on T.
Bug: 145972387
Test: NetworkInfoTest
Change-Id: Ib710497d83b2d26439c2bd4d2f572310db97d6fd
2021-11-15 21:18:25 +09:00
Aaron Huang
e3879abb07
Use real ProxyTracker in ConnectivityServiceTest
...
Currently CS test uses a mock ProxyTracker object to verify that
the sendProxyBroadcast() is called. Also, if the network is a
default network then sendProxyBroadcast() will be indirectly
called in setDefaultProxy(). This only verifies that the method
is called but it doesn't verify that the broadcast is sent.
Instead of testing setDefaultProxy() is called, it is better to
verify that the broadcast is actually sent. Therefore, use a
real ProxyTracker in the test to verify the broadcast is sent.
Test: FrameworksNetTests:ConnectivityServiceTest
Change-Id: Id5c9e07e8326f24bd2665b4bb08f96d6d57d999c
2021-11-15 20:01:12 +08: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