Remi NGUYEN VAN
4bb45d88ea
Merge "Revert "Use mockito-extended in FrameworksNetTests"" am: a6c06af0fa am: 6f6035a29e am: 9134dac0b1
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1734372
Change-Id: Ie28db4a25144eb558bb3c7c72e24c66a38091e2c
2021-06-11 02:12:04 +00:00
Remi NGUYEN VAN
9134dac0b1
Merge "Revert "Use mockito-extended in FrameworksNetTests"" am: a6c06af0fa am: 6f6035a29e
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1734372
Change-Id: I8c8a2f734c433c0cf6fe158fcbf26a75a82d0d0a
2021-06-11 01:56:43 +00:00
Remi NGUYEN VAN
6f6035a29e
Merge "Revert "Use mockito-extended in FrameworksNetTests"" am: a6c06af0fa
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1734372
Change-Id: I0b5b976cf9de9beb0db7eca9205196a5afd3eab6
2021-06-11 01:38:23 +00:00
Remi NGUYEN VAN
a6c06af0fa
Merge "Revert "Use mockito-extended in FrameworksNetTests""
2021-06-11 01:26:44 +00:00
Remi NGUYEN VAN
7a80ae85d6
Merge changes I8d15b626,I993e8da9 am: d15e52eca9 am: 3cc611d69a am: 45dd5391ed
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1733772
Change-Id: Ie41a3726bd3f90a957e2507c0c2f90c5024440e4
2021-06-11 00:19:41 +00:00
Remi NGUYEN VAN
45dd5391ed
Merge changes I8d15b626,I993e8da9 am: d15e52eca9 am: 3cc611d69a
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1733772
Change-Id: Ice0291696167275ae20a423b74671d252fe09fb4
2021-06-11 00:05:52 +00:00
Remi NGUYEN VAN
3cc611d69a
Merge changes I8d15b626,I993e8da9 am: d15e52eca9
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1733772
Change-Id: I5bfe6d82ce37628a8b7dfec59f9a8216a3c5dcdf
2021-06-10 23:50:06 +00:00
Remi NGUYEN VAN
d15e52eca9
Merge changes I8d15b626,I993e8da9
...
* changes:
Revert "Remove ConnectivityServiceTest signature perms use"
Revert "Use shell permission to query current user"
2021-06-10 23:39:11 +00:00
xingdai
892a0ef152
Revert "Use mockito-extended in FrameworksNetTests"
...
This reverts commit 98b76cc2ec .
Reason for revert: <INSERT REASONING HERE>
b/190622577
Change-Id: Ief39f82875e6fa885829aea62eed00f2f2e6774e
2021-06-10 21:41:54 +00:00
Treehugger Robot
1a328dc5b5
Merge "Partial revert of "Remove ConnectivityServiceTest signature perms use"" am: b9d05685fc am: 80b28dec8c am: 972b65d492
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1733172
Change-Id: I24ae86acd0c228066bcdd4c1932ee15a6f176055
2021-06-10 15:22:38 +00:00
Treehugger Robot
972b65d492
Merge "Partial revert of "Remove ConnectivityServiceTest signature perms use"" am: b9d05685fc am: 80b28dec8c
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1733172
Change-Id: I3eae11b536613efa377de130a69b58b321a6ae52
2021-06-10 15:10:37 +00:00
Remi NGUYEN VAN
3cd164225b
Revert "Remove ConnectivityServiceTest signature perms use"
...
This reverts commit bba8ec0d43 .
Reason for revert: Broken tests b/190622577
Change-Id: I8d15b626fcd8da67094ebf461d381b3922f69024
2021-06-10 15:05:47 +00:00
Remi NGUYEN VAN
499219702b
Revert "Use shell permission to query current user"
...
This reverts commit 95bc8d7067 .
Reason for revert: Conflict with revert for b/190622577
Change-Id: I993e8da9737634d0cc815cd75b461699170602cc
2021-06-10 15:05:17 +00:00
Treehugger Robot
80b28dec8c
Merge "Partial revert of "Remove ConnectivityServiceTest signature perms use"" am: b9d05685fc
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1733172
Change-Id: I0b7f2048bfc390f53314d3fcdbc7cba41a407361
2021-06-10 14:54:13 +00:00
Treehugger Robot
b9d05685fc
Merge "Partial revert of "Remove ConnectivityServiceTest signature perms use""
2021-06-10 14:35:25 +00:00
Paul Hobbs
cdfeb11719
Partial revert of "Remove ConnectivityServiceTest signature perms use"
...
This reverts the Android.bp changes in commit
bba8ec0d43 .
Reason for revert: This broke ConnectivityServiceTest (https://android-build.googleplex.com/builds/tests/view?invocationId=I90700009364410436&testResultId=TR01525128446370769 )
A full revert has a merge conflict in the other file, and is likely
not necessary to fix the failure.
Change-Id: Icc0c2500590a6b936016574be4f234b9f748cb80
2021-06-10 08:43:44 +00:00
Remi NGUYEN VAN
ee395bb629
Merge "Use shell permission to query current user" am: dbb2a23a38 am: 7252278df7 am: 62f6e19968
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1730549
Change-Id: I66d06b6217abaa55001d348cdd3ae0b0c1d89a5d
2021-06-10 06:05:00 +00:00
Remi NGUYEN VAN
62f6e19968
Merge "Use shell permission to query current user" am: dbb2a23a38 am: 7252278df7
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1730549
Change-Id: I74b82e3ff03f0bc540c5023b4a9af9799915e559
2021-06-10 05:53:29 +00:00
Remi NGUYEN VAN
7252278df7
Merge "Use shell permission to query current user" am: dbb2a23a38
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1730549
Change-Id: I8a019cc8925ae4abc7e64247aa3cef69b558ce3d
2021-06-10 05:36:39 +00:00
Remi NGUYEN VAN
dbb2a23a38
Merge "Use shell permission to query current user"
2021-06-10 05:19:57 +00:00
Remi NGUYEN VAN
f9e22d7f3c
Merge "Deprecate MANAGE_ACTIVITY_STACKS permission" am: 45f922a2ff
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1731235
Change-Id: I535c12bc058cb3e3782badac38c11ed763236e4c
2021-06-10 00:06:48 +00:00
Remi NGUYEN VAN
45f922a2ff
Merge "Deprecate MANAGE_ACTIVITY_STACKS permission"
2021-06-09 23:45:29 +00:00
Treehugger Robot
203343abe3
Merge "Skip CaptivePortalTest for wearables" am: 3a1a22b82a am: b931a1f392 am: 5fe9b7bcbe
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1727591
Change-Id: I53d639099bf42d5f4e480607ec8009ca2b844591
2021-06-09 19:52:35 +00:00
Treehugger Robot
5fe9b7bcbe
Merge "Skip CaptivePortalTest for wearables" am: 3a1a22b82a am: b931a1f392
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1727591
Change-Id: I69fce78c69b847fc7dded60f1c293f0dcc7e8733
2021-06-09 19:29:37 +00:00
Treehugger Robot
b931a1f392
Merge "Skip CaptivePortalTest for wearables" am: 3a1a22b82a
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1727591
Change-Id: Iaca1c0ae1db503c0f025af737cc83ce60f4ab7e2
2021-06-09 18:42:59 +00:00
Treehugger Robot
3a1a22b82a
Merge "Skip CaptivePortalTest for wearables"
2021-06-09 17:59:04 +00:00
Frank Li
c9c8770bc0
Merge "Add CTS test for NetworkAgent/NetworkAgentConfig API" am: 99e50a0fc9 am: e803a53246 am: c1ea6b691f
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1693668
Change-Id: Ie9b1edf6b90d647b689e6abbc8f340913c86e153
2021-06-09 12:57:53 +00:00
Frank Li
c1ea6b691f
Merge "Add CTS test for NetworkAgent/NetworkAgentConfig API" am: 99e50a0fc9 am: e803a53246
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1693668
Change-Id: If7ddb3f87320a91e1cdda33c99f108c32a760b6d
2021-06-09 12:42:02 +00:00
Frank Li
e803a53246
Merge "Add CTS test for NetworkAgent/NetworkAgentConfig API" am: 99e50a0fc9
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1693668
Change-Id: Ib650541c2ff86c0055d97b7dd2d86965126a26f2
2021-06-09 12:28:08 +00:00
Frank Li
99e50a0fc9
Merge "Add CTS test for NetworkAgent/NetworkAgentConfig API"
2021-06-09 12:12:05 +00:00
Treehugger Robot
d08369c53a
Merge "Improve handling of invalid private DNS settings" am: b80e88d604 am: 67bb33e5cc am: 4c22076ae4
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1730543
Change-Id: I08e8b479570fbbeb9f890c9c1437b838f0dee461
2021-06-09 11:51:08 +00:00
Treehugger Robot
4c22076ae4
Merge "Improve handling of invalid private DNS settings" am: b80e88d604 am: 67bb33e5cc
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1730543
Change-Id: I735561c48510ff5d4771888d815d7a336f4ccea7
2021-06-09 11:30:08 +00:00
Treehugger Robot
67bb33e5cc
Merge "Improve handling of invalid private DNS settings" am: b80e88d604
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1730543
Change-Id: Iddbe866b7df7dbb93f1e6d4cef95ee6e01739abe
2021-06-09 11:09:35 +00:00
Treehugger Robot
b80e88d604
Merge "Improve handling of invalid private DNS settings"
2021-06-09 10:52:14 +00:00
Remi NGUYEN VAN
95bc8d7067
Use shell permission to query current user
...
Use shell permissions to obtain CREATE_USERS to call
ActivityManager.getCurrentUser in ConnectivityServiceTest.
This is necessary to allow the tests to run in coverage tests without
the platform certificate.
Bug: 187935317
Test: atest FrameworksNetTests:ConnectivityServiceTest
Change-Id: I5a56ffab4820d351dcdb132046698cd0d3b8bdb1
2021-06-09 19:28:16 +09:00
Remi NGUYEN VAN
f900c45afa
Deprecate MANAGE_ACTIVITY_STACKS permission
...
This is a partial cherry-pick of change:
I894ee66e058b1024a731d3be4b33b69626451f08
The permission is actually not used, but this change aligns the manifest
with contents in downstream branches, so it can be modified (including
removing the permission) without conflicts.
Bug: 157876448
Test: atest FrameworksNetTests
Merged-In: I3c2563d4ae4e3715d0c6270344ba8f7ef067872f
Change-Id: Id50e41a0ea970350eae0a2afab303c022b452bf9
2021-06-09 19:28:10 +09:00
lifr
561547a537
Add CTS test for NetworkAgent/NetworkAgentConfig API
...
The following is a list of APIs:
1. NetworkAgent.setLegacySubtype
2. NetworkAgentConfig.Builder.setLegacySubType
3. NetworkAgentConfig.Builder.setLegacySubTypeName
4. NetworkAgentConfig.Builder.setLegacyExtraInfo
Bug: 190413710
Test: atest android.net.cts.NetworkAgentTest
atest CtsNetTestCasesLatestSdk:NetworkAgentTest
Change-Id: Ia67b963b8e18af8440b1b9bd91f53439848bb838
2021-06-09 17:31:23 +08:00
Remi NGUYEN VAN
af23ceedef
Merge "Remove ConnectivityServiceTest signature perms use" am: 545f6cf95f am: 4c21d6c2a6 am: e4fa2ac5ac
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1727819
Change-Id: I6dc91f7ef4b9f58717b44c3d6236fc5e9f7dfd11
2021-06-09 09:31:03 +00:00
Remi NGUYEN VAN
003f5d0f96
Merge "Use mockito-extended in FrameworksNetTests" am: 35e6108119 am: 98ea169c22 am: 4b6239c2c8
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1727825
Change-Id: I49ed35dfcaa6c045c1e425dc5ed70421ae3ea6d7
2021-06-09 09:30:44 +00:00
Remi NGUYEN VAN
e4fa2ac5ac
Merge "Remove ConnectivityServiceTest signature perms use" am: 545f6cf95f am: 4c21d6c2a6
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1727819
Change-Id: I7f2a05be80117dad19b5e7fafb71f562466096f9
2021-06-09 09:15:06 +00:00
Remi NGUYEN VAN
4b6239c2c8
Merge "Use mockito-extended in FrameworksNetTests" am: 35e6108119 am: 98ea169c22
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1727825
Change-Id: I0fb914110ec6e2c34544831619157f05a8e57661
2021-06-09 09:14:57 +00:00
Remi NGUYEN VAN
4c21d6c2a6
Merge "Remove ConnectivityServiceTest signature perms use" am: 545f6cf95f
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1727819
Change-Id: Id60ce478abe26c82f79bdce0b025e9629cdd0d89
2021-06-09 08:54:47 +00:00
Remi NGUYEN VAN
98ea169c22
Merge "Use mockito-extended in FrameworksNetTests" am: 35e6108119
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1727825
Change-Id: Ied36d4711c9c12d0991c00c28a78931ae3ea58f9
2021-06-09 08:54:38 +00:00
Remi NGUYEN VAN
545f6cf95f
Merge "Remove ConnectivityServiceTest signature perms use"
2021-06-09 08:39:33 +00:00
Remi NGUYEN VAN
35e6108119
Merge "Use mockito-extended in FrameworksNetTests"
2021-06-09 08:39:24 +00:00
Lorenzo Colitti
0730c9315c
Merge "Don't send onLinkPropertiesChanged after onLost for 464xlat." am: a3f12dd52c am: b4e1b65298 am: 7d9f43c6f3
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1727829
Change-Id: I35258b459a59d39ec8606ec84bf9b345ddd07b11
2021-06-09 08:34:24 +00:00
Lorenzo Colitti
fa26e894a3
Merge "Improve test coverage for disconnecting networks with clat." am: f55fa638c8 am: 7e79954915 am: 97adf6a8b4
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1729093
Change-Id: Ibee94710b4b84d9e2c58b49c73d94cf01a5205f1
2021-06-09 08:34:18 +00:00
Lorenzo Colitti
7d9f43c6f3
Merge "Don't send onLinkPropertiesChanged after onLost for 464xlat." am: a3f12dd52c am: b4e1b65298
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1727829
Change-Id: Iad96cfcdd5f385c084be76b3b25ffd10b080df7f
2021-06-09 08:33:36 +00:00
Lorenzo Colitti
97adf6a8b4
Merge "Improve test coverage for disconnecting networks with clat." am: f55fa638c8 am: 7e79954915
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1729093
Change-Id: Idf372d6f3305d6678837d36ce901af8ac482ea58
2021-06-09 08:33:31 +00:00
Junyu Lai
fd242c77b1
Merge changes from topic "cts-snapshots" am: 07f97b249c
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1727822
Change-Id: I0fc00956cc8891e45bb2b76f6e35063949d5f0ba
2021-06-09 08:16:01 +00:00