Treehugger Robot
dcb5161417
Merge "Move CtsHostsideNetworkTests to group presubmit-large" am: c3bac64a94 am: b0e2855252 am: 7a4a243750
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1674227
Change-Id: Ib268ad82b883e527858067b7dd92db1236c309bd
2021-04-19 04:15:40 +00:00
Treehugger Robot
c7d350f66a
Merge "Move CtsHostsideNetworkTests to group presubmit-large" am: c3bac64a94 am: b0e2855252 am: 45a26a4aa2
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1674227
Change-Id: Ice6daa7d9f5bfb3481fa7579398416cd42c6f3c8
2021-04-19 04:14:41 +00:00
Treehugger Robot
7a4a243750
Merge "Move CtsHostsideNetworkTests to group presubmit-large" am: c3bac64a94 am: b0e2855252
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1674227
Change-Id: Ie3cdcb7a7b5a4147c84f830a688b588add73ea16
2021-04-19 03:54:02 +00:00
Treehugger Robot
45a26a4aa2
Merge "Move CtsHostsideNetworkTests to group presubmit-large" am: c3bac64a94 am: b0e2855252
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1674227
Change-Id: I2ff565e0a753cd133972f34eff2fb9fc9bd27678
2021-04-19 03:53:58 +00:00
Treehugger Robot
b0e2855252
Merge "Move CtsHostsideNetworkTests to group presubmit-large" am: c3bac64a94
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1674227
Change-Id: I38dae7f191204502c9c9d2abaa9468d843763605
2021-04-19 03:32:18 +00:00
Treehugger Robot
c3bac64a94
Merge "Move CtsHostsideNetworkTests to group presubmit-large"
2021-04-19 03:05:59 +00:00
Junyu Lai
21efd39fef
[automerger skipped] Merge "[VCN20.2] Change requestBackgroundNetwork argument order" am: afd18ddd57 am: d1c84ae89c am: 3d6ee87893 -s ours
...
am skip reason: skip tag Change-Id I09ff7461b655cbfc6ed5a7db07e02a388cd3d079 with SHA-1 8b5e4b4b4d is already in history
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1676442
Change-Id: I0a91a900cb9b71410698119c6071916d469224c7
2021-04-16 17:16:07 +00:00
Junyu Lai
b6efeebb05
[automerger skipped] Merge "[VCN20.2] Change requestBackgroundNetwork argument order" am: afd18ddd57 am: d1c84ae89c am: 34006332a1 -s ours
...
am skip reason: skip tag Change-Id I09ff7461b655cbfc6ed5a7db07e02a388cd3d079 with SHA-1 8b5e4b4b4d is already in history
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1676442
Change-Id: Icd8af84eefac86862c88776fce2fa598cd80986e
2021-04-16 17:15:30 +00:00
Junyu Lai
34006332a1
Merge "[VCN20.2] Change requestBackgroundNetwork argument order" am: afd18ddd57 am: d1c84ae89c
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1676442
Change-Id: I68ab7fc43774c3ea977219261857930c703f6ea9
2021-04-16 16:52:15 +00:00
Junyu Lai
3d6ee87893
Merge "[VCN20.2] Change requestBackgroundNetwork argument order" am: afd18ddd57 am: d1c84ae89c
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1676442
Change-Id: I394ca7487b5168c0f5d7b69d4f6fee2debd86fac
2021-04-16 16:52:07 +00:00
Junyu Lai
d1c84ae89c
Merge "[VCN20.2] Change requestBackgroundNetwork argument order" am: afd18ddd57
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1676442
Change-Id: Ie99d30e70de1cf1593448629532a90b4edc2d17b
2021-04-16 16:25:55 +00:00
Junyu Lai
afd18ddd57
Merge "[VCN20.2] Change requestBackgroundNetwork argument order"
2021-04-16 16:04:31 +00:00
Treehugger Robot
e2b12753cd
Merge "Fix CTS fail to register network callback since lack of permission" am: f7d188c8c9 am: 9da7347603 am: 9e7affed67
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1674237
Change-Id: Ie7d72fb1f86626d1bcef3efd305731c6fd85deb4
2021-04-15 17:13:50 +00:00
Treehugger Robot
15bc33f87d
Merge "Fix CTS fail to register network callback since lack of permission" am: f7d188c8c9 am: 9da7347603 am: 0dc94a353e
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1674237
Change-Id: I7564fa7cf1f8c5d9e73044ccf8411f08f42a3c77
2021-04-15 16:32:49 +00:00
Treehugger Robot
1658e23bed
Merge "Put tether/untether calls into handler queue" am: 2576c457de am: 0ea3966a88 am: c54b165f05
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1535794
Change-Id: I3f51724e8b1e3775cbe65fb8b603b4d1e307469c
2021-04-15 16:32:40 +00:00
Treehugger Robot
f15ac35316
Merge "Put tether/untether calls into handler queue" am: 2576c457de am: 0ea3966a88 am: 95587e12d5
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1535794
Change-Id: I7f3be74f5315e4f21f01ea5e2fb67c6200e92707
2021-04-15 16:31:43 +00:00
junyulai
989cf46ba0
[VCN20.2] Change requestBackgroundNetwork argument order
...
Test: atest FrameworksNetTests FrameworksVcnTests
Fix: 185215095
Merged-In: I09ff7461b655cbfc6ed5a7db07e02a388cd3d079
Change-Id: I09ff7461b655cbfc6ed5a7db07e02a388cd3d079
(cherry-picked from ag/14185520)
2021-04-16 00:29:20 +08:00
Treehugger Robot
9e7affed67
Merge "Fix CTS fail to register network callback since lack of permission" am: f7d188c8c9 am: 9da7347603
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1674237
Change-Id: I76e3e4536e592f61243e1afa46811a8992996bb5
2021-04-15 16:05:01 +00:00
Treehugger Robot
95587e12d5
Merge "Put tether/untether calls into handler queue" am: 2576c457de am: 0ea3966a88
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1535794
Change-Id: I8525c8f800641defa45ef3e4072e6a7a8ac86c49
2021-04-15 16:04:57 +00:00
Treehugger Robot
0dc94a353e
Merge "Fix CTS fail to register network callback since lack of permission" am: f7d188c8c9 am: 9da7347603
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1674237
Change-Id: I94a28683ae06568b451514fb7a5356352ec935c7
2021-04-15 16:04:45 +00:00
Treehugger Robot
c54b165f05
Merge "Put tether/untether calls into handler queue" am: 2576c457de am: 0ea3966a88
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1535794
Change-Id: If849ee52573b9cf0d5edd7fc81e2f285bd067305
2021-04-15 16:04:42 +00:00
Junyu Lai
41e033f8f1
Merge "[VCN20.2] Change requestBackgroundNetwork argument order" into sc-dev
2021-04-15 15:57:43 +00:00
Treehugger Robot
9da7347603
Merge "Fix CTS fail to register network callback since lack of permission" am: f7d188c8c9
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1674237
Change-Id: I0e849ab438734eae7e0577a463459405062d8124
2021-04-15 15:14:34 +00:00
Treehugger Robot
0ea3966a88
Merge "Put tether/untether calls into handler queue" am: 2576c457de
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1535794
Change-Id: I29be842c2faa24d4f49d3ed36eb71c047e5f1cc0
2021-04-15 15:14:23 +00:00
Treehugger Robot
f7d188c8c9
Merge "Fix CTS fail to register network callback since lack of permission"
2021-04-15 15:03:15 +00:00
Treehugger Robot
2576c457de
Merge "Put tether/untether calls into handler queue"
2021-04-15 14:46:25 +00:00
junyulai
8b5e4b4b4d
[VCN20.2] Change requestBackgroundNetwork argument order
...
Test: atest FrameworksNetTests FrameworksVcnTests
Fix: 185215095
Ignore-AOSP-First: avoid build break caused by multipatch automerge
Change-Id: I09ff7461b655cbfc6ed5a7db07e02a388cd3d079
2021-04-15 20:59:08 +08:00
Treehugger Robot
e3ce85587d
Merge changes from topic "connectivitymanager-blockedreason-shim" am: bea56fbe11 am: 0cbabb7316 am: 333db9a5f0
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1676430
Change-Id: Id33e580060f5d35f3cbaa15f1c0ed4c7e2039c05
2021-04-15 11:40:52 +00:00
Treehugger Robot
9675c9da0b
Merge changes from topic "connectivitymanager-blockedreason-shim" am: bea56fbe11 am: 0cbabb7316 am: 6f7e10d3ef
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1676430
Change-Id: Icba8d6ffebafb907578e1893f0567eafdfc9dfd2
2021-04-15 10:58:31 +00:00
Treehugger Robot
333db9a5f0
Merge changes from topic "connectivitymanager-blockedreason-shim" am: bea56fbe11 am: 0cbabb7316
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1676430
Change-Id: I9f71c66d037a7e32b084951c01d46d9d01cc8f3a
2021-04-15 10:01:04 +00:00
Treehugger Robot
6f7e10d3ef
Merge changes from topic "connectivitymanager-blockedreason-shim" am: bea56fbe11 am: 0cbabb7316
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1676430
Change-Id: Ib905d9247d8b19c5854a707f2870478be4b98eb8
2021-04-15 10:00:43 +00:00
Treehugger Robot
0cbabb7316
Merge changes from topic "connectivitymanager-blockedreason-shim" am: bea56fbe11
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1676430
Change-Id: I6d9dc4e6fd3fa832efbafa4893cc20dccfe3d7a3
2021-04-15 08:27:32 +00:00
Treehugger Robot
bea56fbe11
Merge changes from topic "connectivitymanager-blockedreason-shim"
...
* changes:
Fix CtsNetTestCasesLatestSdk in AOSP.
Use the non-API static UserHandle.getUid method in tests.
Import ConnectivityManager.BLOCKED_REASON_* from ConstantsShim.
2021-04-15 07:30:24 +00:00
Lorenzo Colitti
ddeb269ca0
Fix CtsNetTestCasesLatestSdk in AOSP.
...
This test suite is broken in AOSP due to a number of tests that
depend on S APIs. We attempted to prevent those tests running on
R builds with:
@IgnoreUpTo(Build.VERSION_CODES.R)
but this is not sufficient for them to pass when the test is
compiled against the R SDK (e.g., in CtsNetTestCasesLatestSdk).
This is because when compiling against the R SDK, the test uses
the API 30 shims, which throw UnsupportedApiLevelException even
though the method actually exists on device.
Fix this using:
assumeTrue(shouldTestSApis());
This is not great, but at least it unbreaks the tests for now.
Test: atest CtsNetTestCases:android.net.cts.ConnectivityManagerTest
Test: atest CtsNetTestCasesLatestSdk:android.net.cts.ConnectivityManagerTest
Change-Id: Ifee0aea5afef6bd4bc762a4b1f25fc05e562d49a
2021-04-15 13:30:02 +09:00
Lorenzo Colitti
7ba366de0b
Use the non-API static UserHandle.getUid method in tests.
...
The code was updated in AOSP to use the new non-static
UserHandle#getUid(int), which is only available in S or above.
This fails to build in mainline-prod. Instead of defining a shim
for this, simply use an older method that takes a userId.
Bug: 165835257
Test: atest CtsNetTestCases:android.net.cts.ConnectivityManagerTest
Test: CtsNetTestCasesLatestSdk:android.net.cts.ConnectivityManagerTest
Change-Id: Id529f8b201cc871aa3155aef0f44574d88040c2d
2021-04-15 13:20:02 +09:00
Junyu Lai
19a7cda181
Merge "Add CTS to verify NetworkAgent#setLingerDuration" into sc-dev
2021-04-15 03:23:54 +00:00
Lorenzo Colitti
aa9db67edc
Import ConnectivityManager.BLOCKED_REASON_* from ConstantsShim.
...
This is needed for the tests to compile in mainline-prod.
Bug: 165835257
Test: atest CtsNetTestCases:android.net.ConnectivityManagerTest
Change-Id: I32924824e9968996f379e31f1b28eb6a8f29bc5d
2021-04-15 10:25:46 +09:00
Lorenzo Colitti
c7048ed83d
Merge "Test ConnectivityManager module-lib APIs for VPNs and blocking." am: f6875cc583 am: 682cb315ee am: fcdf0c2894
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1671528
Change-Id: I1217a2475b0aeb58910570fe3046f0949f41af37
2021-04-14 17:21:44 +00:00
Lorenzo Colitti
52d0924665
Merge "Test ConnectivityManager module-lib APIs for VPNs and blocking." am: f6875cc583 am: 682cb315ee am: ddc265e884
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1671528
Change-Id: I17293cdf47468d634c3a6c26ea1673aa3a799b57
2021-04-14 16:59:58 +00:00
Lorenzo Colitti
fcdf0c2894
Merge "Test ConnectivityManager module-lib APIs for VPNs and blocking." am: f6875cc583 am: 682cb315ee
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1671528
Change-Id: Iaa2d6c4b497eba6a0340094294ba0c6f2ff74f04
2021-04-14 16:10:55 +00:00
Lorenzo Colitti
ddc265e884
Merge "Test ConnectivityManager module-lib APIs for VPNs and blocking." am: f6875cc583 am: 682cb315ee
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1671528
Change-Id: Ib3605afe37ef9ffab8008a187f99816b37c1bad8
2021-04-14 16:10:37 +00:00
Lorenzo Colitti
682cb315ee
Merge "Test ConnectivityManager module-lib APIs for VPNs and blocking." am: f6875cc583
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1671528
Change-Id: I4d3f3c905fde3e9da08df5c3efa203fe570a2407
2021-04-14 15:29:03 +00:00
Lorenzo Colitti
f6875cc583
Merge "Test ConnectivityManager module-lib APIs for VPNs and blocking."
2021-04-14 14:46:29 +00:00
junyulai
3a7d92513f
Fix CTS fail to register network callback since lack of permission
...
Currently, NetworkCallbackTest gets the capabilities of current
active network to track the network used for the tests. And
construct the request with the capabilities gets from the
network. This causes test fails if the capabilities contain
signal strength, since it requires NETWORK_SIGNAL_STRENGTH_WAKEUP
to be declared.
Thus, this patch null out several fields from capabilities
of the current active network to construct the new request
in order to prevent over-specifying the requirement.
Test: atest CtsHostsideNetworkTests:com.android.cts.net.HostsideNetworkCallbackTests
Bug: 182516128
Change-Id: Ib79b38e63ad2083c29fd71a24b8686b3f6f4e12f
2021-04-14 22:18:39 +08:00
junyulai
cfb2af8659
Add CTS to verify NetworkAgent#setLingerDuration
...
Test: this
Bug: 184227264
Fix: 184796264
Ignore-AOSP-First: prevent merge conflict
Change-Id: I77818685b2bfea499c0294874d205544161677c5
2021-04-14 20:46:20 +08:00
Remi NGUYEN VAN
254ba1512a
Fix proguard rules for Struct in NetworkStack am: 9a82bbf368 am: 9aaeab539b am: 54024858a6
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1674688
Change-Id: I4262236535ec9e1c7ff46ca84723e673647fb3c9
2021-04-14 06:12:25 +00:00
Remi NGUYEN VAN
00ca0671b4
Fix proguard rules for Struct in NetworkStack am: 9a82bbf368 am: 9aaeab539b am: 237561ebdf
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1674688
Change-Id: Id9ea41e2831af5a01e3088dc1d3feca89946c926
2021-04-14 06:11:59 +00:00
Remi NGUYEN VAN
237561ebdf
Fix proguard rules for Struct in NetworkStack am: 9a82bbf368 am: 9aaeab539b
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1674688
Change-Id: I722885350e2514dbf7af5c58602e6b94bd876ff8
2021-04-14 05:45:19 +00:00
Remi NGUYEN VAN
54024858a6
Fix proguard rules for Struct in NetworkStack am: 9a82bbf368 am: 9aaeab539b
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1674688
Change-Id: I815875d909142ae2b1d860a3009daeafad23ab8c
2021-04-14 05:45:19 +00:00
Remi NGUYEN VAN
9aaeab539b
Fix proguard rules for Struct in NetworkStack am: 9a82bbf368
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1674688
Change-Id: I49cf42126e03c4fd449577bd1167dd74dec1b6a5
2021-04-14 05:03:26 +00:00