Lorenzo Colitti
c236648ebd
[automerger skipped] Revert "Revert^2 "Add service-connectivity to tethering APEX"" am: 50caf56267 -s ours
...
am skip reason: Change-Id Ib0ac49609e444a53a6fee4575f5078e15f364eef with SHA-1 2812f607a0 is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/13693495
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I5d64493796540fc20a6a00f5de2f25ec91becaf4
2021-02-26 04:36:38 +00:00
Lorenzo Colitti
56e6d83d98
[automerger skipped] Merge remote-tracking branch 'goog/rvc-qpr-dev-plus-aosp' into merge-sc-dev-plus-aosp-then-rvc-qpr-dev-plus-aosp am: 09074df188 -s ours
...
am skip reason: Change-Id Ib0ac49609e444a53a6fee4575f5078e15f364eef with SHA-1 2812f607a0 is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/13693494
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I6d61532cfdedd31f2dd65902d2185bc5d3ddb75e
2021-02-26 04:36:36 +00:00
Lorenzo Colitti
cd6aaf7e60
[automerger skipped] Merge remote-tracking branch 'goog/sc-dev-plus-aosp' into merge-sc-dev-plus-aosp-then-rvc-qpr-dev-plus-aosp am: 1498ad9ac1 -s ours
...
am skip reason: Change-Id Ib0ac49609e444a53a6fee4575f5078e15f364eef with SHA-1 2812f607a0 is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/13693493
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ibe246bfddd5586d4dba3e798b099ebbd66e9f2a4
2021-02-26 04:36:34 +00:00
TreeHugger Robot
43e386bb95
[automerger skipped] Merge "Use ACCESS_WIFI_STATE when clearing wifi blacklist" into mainline-prod am: 54356b303d -s ours
...
am skip reason: Change-Id I63e76918421e5deb59fe67a64674348fb8d20265 with SHA-1 72c7fe9b0c is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/13149619
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I69bb902c084cda75f5073d52594f8bf19c699177
2021-02-26 04:36:06 +00:00
Chalard Jean
fb2192f670
Merge "Release test network in a test" am: 26c11595bc am: d3e8ae1f88 am: a1596090db
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1605235
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I96044cf7ee80a2d71114bc357b93001ec2c89df3
2021-02-25 10:22:03 +00:00
Chalard Jean
a1596090db
Merge "Release test network in a test" am: 26c11595bc am: d3e8ae1f88
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1605235
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: If5156e2a908c969c80eb09123fe88bef0ecc4285
2021-02-25 09:36:31 +00:00
Sudheer Shanka
54c8041ff0
Merge "Update CtsHostsideNetworkTests to take network capability into account." into sc-dev
2021-02-25 09:19:14 +00:00
Daulet Zhanguzin
39ae785e3f
Use unbundled version of BouncyCastle in Ike cts tests am: bb540131b7 am: c4f27ccd99 am: f82155f4b9
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1605037
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Iee67d255b39a153cfa3e02a652291bfe627708f0
2021-02-25 08:49:26 +00:00
Chalard Jean
d3e8ae1f88
Merge "Release test network in a test" am: 26c11595bc
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1605235
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Iae36d7f39bd1ff5287311df965829f6dee3de0d4
2021-02-25 08:46:15 +00:00
Chalard Jean
26c11595bc
Merge "Release test network in a test"
2021-02-25 08:06:15 +00:00
Daulet Zhanguzin
f82155f4b9
Use unbundled version of BouncyCastle in Ike cts tests am: bb540131b7 am: c4f27ccd99
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1605037
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I7dba95a6c7cdf6ea57b21136b40e8debcf9490db
2021-02-25 08:01:32 +00:00
Lorenzo Colitti
50caf56267
Revert "Revert^2 "Add service-connectivity to tethering APEX""
...
As part of syncing the tethering code from AOSP to mainline-prod,
revert the changes to the build file that added the connectivity
jar and made the module no longer updatable.
The intent is to build and release the tethering module in
mainline-prod, from latest AOSP code, without including the
connectivity code, which depends on S APIs.
This reverts commit 2812f607a0 .
Bug: 167645754
Test: m com.android.tethering
Ignore-AOSP-First: needed to sync mainline-prod with AOSP
Change-Id: Ic2491f04880ff66abc3b2d3aaee6168e18f6d68a
Merged-In: Ib0ac49609e444a53a6fee4575f5078e15f364eef
2021-02-25 16:53:24 +09:00
Daulet Zhanguzin
c4f27ccd99
Use unbundled version of BouncyCastle in Ike cts tests am: bb540131b7
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1605037
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I46509df9b0f5c69d698f14c5a253b75fd4f71729
2021-02-25 07:24:03 +00:00
Lorenzo Colitti
09074df188
Merge remote-tracking branch 'goog/rvc-qpr-dev-plus-aosp' into merge-sc-dev-plus-aosp-then-rvc-qpr-dev-plus-aosp
...
This CL merges rvc-qpr-dev-plus-aosp on top of sc-dev-plus-aosp
on top of mainline-prod. It picks up changes that were merged
into aosp/master before sc-dev-plus-aosp was on the path between
AOSP and master. One such very simple CL is aosp/1554765.
There were no merge conflicts.
Current diffstat with aosp/master is:
97 files changed, 2219 insertions(+), 84 deletions(-)
This includes 1800 lines of translations added in 72 files like
Tethering/res/values-*/strings.xml
Bug: 167645754
Test: no merge conflicts
Test: didn't even try to build
Ignore-AOSP-First: this is a merge from AOSP
Change-Id: I63af0b95e2d0e6bddc217c29014c03ea0dbda6ec
Merged-In: Ib0ac49609e444a53a6fee4575f5078e15f364eef
2021-02-25 16:23:06 +09:00
Lorenzo Colitti
1498ad9ac1
Merge remote-tracking branch 'goog/sc-dev-plus-aosp' into merge-sc-dev-plus-aosp-then-rvc-qpr-dev-plus-aosp
...
This CL merges sc-dev-plus-aosp into mainline-prod. It picks up
changes that:
- Were merged into sc-dev and automerged into sc-dev-plus-aosp
- Were merged into aosp master while sc-dev-plus-aosp was on the
path between AOSP and master.
It does not pick up changes that were merged into aosp before
sc-dev-plus-aosp was on the merge path from AOSP to master. One
such very simple CL is aosp/1554765.
There were no merge conflicts.
Current diffstat with aosp/master is:
161 files changed, 2923 insertions(+), 4005 deletions(-)
This includes 1800 lines of translations added in 72 files like
Tethering/res/values-*/strings.xml
Bug: 167645754
Test: no merge conflicts
Test: didn't even try to build
Ignore-AOSP-First: this is a merge from AOSP
Change-Id: Ie82ff0d3fcb82f0d66534b114af9f240f5574bfb
Merged-In: Ib0ac49609e444a53a6fee4575f5078e15f364eef
2021-02-25 16:22:15 +09:00
Sudheer Shanka
4a96c79495
Update CtsHostsideNetworkTests to take network capability into account.
...
Bug: 177641226
Test: atest ./tests/cts/hostside/src/com/android/cts/net/HostsideRestrictBackgroundNetworkTests.java
Ignore-AOSP-First: Expedited jobs are not available in AOSP
Change-Id: Ic75ebdc184764b7e7ac02d3e2ca18cbba1c55ee5
2021-02-24 08:00:12 -08:00
Chalard Jean
8a8bf7434c
Release test network in a test
...
This causes failures in subsequent tests that expect
only one test network to be up.
Bug: 181033598
Test: this
Change-Id: I74444f4aff7750a5bbd2564e5e22714d73c72d8b
2021-02-24 23:07:13 +09:00
Lorenzo Colitti
bd23387276
Add a BpfMap#clear method. am: ffb0ccd04b am: 10be22076e am: ad38d27ebb
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1604974
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I77144b7db5300bcddbfd97b72c5c958d126ca628
2021-02-24 13:18:44 +00:00
Daulet Zhanguzin
bb540131b7
Use unbundled version of BouncyCastle in Ike cts tests
...
Since BouncyCastle APIs provided by platform vary, use unbundled
BouncyCastle
Fixes: 180870458
Test: atest CtsNetTestCases
Change-Id: I78c053150bb9cf86173f869dd6e13e9a6917ffa7
2021-02-24 13:09:36 +00:00
Lorenzo Colitti
ad38d27ebb
Add a BpfMap#clear method. am: ffb0ccd04b am: 10be22076e
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1604974
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I1e4d5e6005cdd006ddd814692714fb80a6c46936
2021-02-24 12:30:56 +00:00
Lorenzo Colitti
10be22076e
Add a BpfMap#clear method. am: ffb0ccd04b
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1604974
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Idebe06d79cb8f6e91634057c59bb0cc022ba1ee0
2021-02-24 11:40:11 +00:00
Lorenzo Colitti
a26f72c34d
Make the CTS tests explicitly depend on modules-utils-build. am: 2be434ab12 am: 6af777632d am: f6603588ab
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1604973
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ib914dff2e0fe6b94902d53130eefe8bfce7b3a62
2021-02-24 07:39:10 +00:00
Lorenzo Colitti
1326473f6a
Move definitions used by tethering bpf code into the module. am: 56be03eb28 am: 69b0769eb0 am: 4d09a87075
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1601855
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ic9fddebf7ed3d384d2c2c89e85d3bbed58d9ea2d
2021-02-24 07:38:29 +00:00
Lorenzo Colitti
f6603588ab
Make the CTS tests explicitly depend on modules-utils-build. am: 2be434ab12 am: 6af777632d
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1604973
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Idfdd67fa1502614e57d7a2b3ea6fdae788024b4c
2021-02-24 07:00:05 +00:00
Lorenzo Colitti
4d09a87075
Move definitions used by tethering bpf code into the module. am: 56be03eb28 am: 69b0769eb0
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1601855
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I842250d341916f7d5a1f48ba8ec09c4235d20d51
2021-02-24 06:59:26 +00:00
Lorenzo Colitti
ffb0ccd04b
Add a BpfMap#clear method.
...
A caller can mostly already do this via forEach(), but having a
specific method is faster (since the code does not need to read
the value) and easier to use.
The semantics of this method (e.g., ignore ENOENT while deleting
a key, but throw on any other error) match those of the native
BpfMap::clear method.
Test: new unit tests
Change-Id: I5cd32efd0f87c823cd2d0a2fa3a95a83093fb6f9
2021-02-24 06:09:46 +00:00
Lorenzo Colitti
6af777632d
Make the CTS tests explicitly depend on modules-utils-build. am: 2be434ab12
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1604973
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Iedfba98ac066241a5959fc45d28d0feb8db159ab
2021-02-24 05:52:14 +00:00
Lorenzo Colitti
69b0769eb0
Move definitions used by tethering bpf code into the module. am: 56be03eb28
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1601855
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I9b84ca223c4a950a55cb63642a435e87e158949d
2021-02-24 05:51:57 +00:00
Lorenzo Colitti
2be434ab12
Make the CTS tests explicitly depend on modules-utils-build.
...
In AOSP master and downstream branches, this likely works via a
transitive dependency. In mainline-prod, this doesn't work. Add
the dependency explicitly, since it makes things build everywhere
and in general it's also good practice to "include what you use".
Bug: 167645754
Test: m CtsNetTestCasesLatestSdk in mainline-prod has fewer errors
Change-Id: Ie575372415a806deee9996aab7f920d2c15bff80
2021-02-24 05:43:36 +00:00
Lorenzo Colitti
56be03eb28
Move definitions used by tethering bpf code into the module.
...
Bug: 167645754
Test: m com.android.tethering
Change-Id: Ia4fb1201e5f4e0c35baba7865b26b4cec0945a64
2021-02-24 12:16:05 +09:00
Treehugger Robot
f151ba8ad9
Merge "Fix CTS test failed on R device" am: afa18f0256 am: 0919cc06c5 am: d517fa33a0
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1597475
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I6a60d442ddacc2dd45f0c301578450b76c7a6d51
2021-02-22 13:42:26 +00:00
Treehugger Robot
1ad4ee61fa
Merge "Add MUTABLE flag when creating PendingIntent" am: f754671f07 am: ac7587318f am: 1eed01b25c
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1598634
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ia0dc53b11897ee902f22eb915a25b476de7870fe
2021-02-22 13:42:02 +00:00
Treehugger Robot
d517fa33a0
Merge "Fix CTS test failed on R device" am: afa18f0256 am: 0919cc06c5
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1597475
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I652339d80d81e97399a35e5c2740d878a458a560
2021-02-22 12:49:20 +00:00
Treehugger Robot
1eed01b25c
Merge "Add MUTABLE flag when creating PendingIntent" am: f754671f07 am: ac7587318f
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1598634
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ie8b0bf1eb1c93dd568d8a5bb9cf002c9b67b81bf
2021-02-22 12:48:39 +00:00
Treehugger Robot
0919cc06c5
Merge "Fix CTS test failed on R device" am: afa18f0256
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1597475
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: If786db7b5635bcd4bb41043169e1c187b13d0eee
2021-02-22 11:50:46 +00:00
Treehugger Robot
ac7587318f
Merge "Add MUTABLE flag when creating PendingIntent" am: f754671f07
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1598634
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I7260575a7b680dbe09599aba59ef597ed42d387b
2021-02-22 11:47:12 +00:00
Treehugger Robot
6afc54561b
Merge "Fix flaky test by extending timeout" am: 2108eada65 am: e46d5eb40f am: f59622b124
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1597473
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ie0fc94ab8e034d3935f628623ca73f62fbc55533
2021-02-22 11:13:04 +00:00
Treehugger Robot
afa18f0256
Merge "Fix CTS test failed on R device"
2021-02-22 10:37:29 +00:00
Treehugger Robot
f754671f07
Merge "Add MUTABLE flag when creating PendingIntent"
2021-02-22 10:29:31 +00:00
Treehugger Robot
f59622b124
Merge "Fix flaky test by extending timeout" am: 2108eada65 am: e46d5eb40f
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1597473
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I06a738c6a7d74951e3c13dd3cf557b4de88f18f2
2021-02-22 10:23:43 +00:00
Treehugger Robot
e46d5eb40f
Merge "Fix flaky test by extending timeout" am: 2108eada65
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1597473
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Iad9a392266b878e97244181f6398ca421160f311
2021-02-22 08:55:09 +00:00
Treehugger Robot
2108eada65
Merge "Fix flaky test by extending timeout"
2021-02-22 07:58:10 +00:00
Xin Li
2fc4905385
[automerger skipped] Skip ab/7061308 in stage. am: b2d124c0c8 -s ours am: 4b10de6751 -s ours
...
am skip reason: Change-Id I04ef025ed537623511a3d346d4c59d6efb6bef3f with SHA-1 8e1e05ec1e is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/13658380
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I8a4d2cb1d6cde2e45f7398efe67d1b8e20b247fe
2021-02-22 07:28:29 +00:00
junyulai
62f5117bfd
Add MUTABLE flag when creating PendingIntent
...
By the new feature introduced in next Android release.
Any PendingIntent needs to be specified about the mutability.
While ConnectivityService would put extra info such as
network or request id before broadcasting the inner intent.
The MUTABLE flag needs to be added accordingly.
Test: this
Fix: 178121691
Change-Id: I87d0efaf51a91556ef9f8e18db38803e4861cfd7
2021-02-22 15:06:32 +08:00
Xin Li
4b10de6751
[automerger skipped] Skip ab/7061308 in stage. am: b2d124c0c8 -s ours
...
am skip reason: Change-Id I04ef025ed537623511a3d346d4c59d6efb6bef3f with SHA-1 8e1e05ec1e is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/13658380
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Id70404269c79a1c211628e04ed90dad9aeb8676a
2021-02-22 06:38:38 +00:00
junyulai
e26bbf8032
Fix CTS test failed on R device
...
The test failed since the API is not available on R device.
Add conditions to ignore it.
Test: atest CtsNetTestCasesLatestSdk:android.net.cts.ConnectivityManagerTest
Bug: None
Change-Id: I3cbc623a84f7313e1155fe83a44ebef042a04076
2021-02-22 14:26:27 +08:00
junyulai
607985b57f
Fix flaky test by extending timeout
...
The asserted capabilities change callback event took 170ms
in average to fire on cuttlefish, which causes 35% of
flakiness since the event might delay up to 500ms in practice.
Extend to 30s timeout value which is the standard value
of waiting for network callback events in CTS.
This change also ignore the test up to Android R since the API
is not available for R devices or below.
Test: atest CtsNetTestCases:android.net.cts.ConnectivityManagerTest#testRequestBackgroundNetwork \
--rerun-until-failure 500
Test: atest CtsNetTestCasesLatestSdk:android.net.cts.ConnectivityManagerTest
on R device
Bug: 179694867
Change-Id: Ic5e11d4a4f326150848bc48038fa01cde39f7661
2021-02-22 14:26:05 +08:00
Xin Li
b2d124c0c8
Skip ab/7061308 in stage.
...
Bug: 180401296
Merged-In: I04ef025ed537623511a3d346d4c59d6efb6bef3f
Change-Id: I35760b156d247f33a6512bcbb3e10cf858b4bee3
2021-02-21 20:37:24 -08:00
Bob Badour
cfaae9a3b2
Merge "[LSC] Add LOCAL_LICENSE_KINDS to packages/modules/Connectivity" am: f5b346ed1d am: c384c677ef am: a3f610a7b2
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1587901
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I51b1e86a8740ca95a948c1cf1d8bc0bbd48bce88
2021-02-21 19:04:24 +00:00
Bob Badour
a3f610a7b2
Merge "[LSC] Add LOCAL_LICENSE_KINDS to packages/modules/Connectivity" am: f5b346ed1d am: c384c677ef
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1587901
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I2f5af6eb56b232f1b79ff48ca6824f2ec726f01a
2021-02-19 07:48:38 +00:00