Commit Graph

43358 Commits

Author SHA1 Message Date
Remi NGUYEN VAN
258cd3bd46 [automerger skipped] Merge "Deprecate MANAGE_ACTIVITY_STACKS permission" am: 45f922a2ff am: f9e22d7f3c -s ours am: 8e9b20a556 -s ours
am skip reason: Merged-In I3c2563d4ae4e3715d0c6270344ba8f7ef067872f with SHA-1 2afd0986d3 is already in history

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

Change-Id: I78df8564d4a5a3f55d1077f29bef81dc8c648f61
2021-06-10 00:24:23 +00:00
Treehugger Robot
f841fc480f [automerger skipped] Fix restorePrivateDnsSetting with null hostnames am: 7fd2b373ff -s ours am: 50918e503c -s ours
am skip reason: Merged-In Ic5d8d8b729469e0eef89a0b53f166e604264c1ee with SHA-1 7fd2b373ff is already in history

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

Change-Id: I2e3dc3ff5b32c3dd21fa495ad47d523b637aa46d
2021-06-10 00:24:16 +00:00
Remi NGUYEN VAN
8e9b20a556 [automerger skipped] Merge "Deprecate MANAGE_ACTIVITY_STACKS permission" am: 45f922a2ff am: f9e22d7f3c -s ours
am skip reason: Merged-In I3c2563d4ae4e3715d0c6270344ba8f7ef067872f with SHA-1 2afd0986d3 is already in history

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

Change-Id: I4bc77d81a084de087def39025e2812cf4311bb7d
2021-06-10 00:23:28 +00:00
Treehugger Robot
01277a3dee [automerger skipped] Fix restorePrivateDnsSetting with null hostnames am: 7fd2b373ff am: 4db91ab936 -s ours
am skip reason: Merged-In Ic5d8d8b729469e0eef89a0b53f166e604264c1ee with SHA-1 908b002ed2 is already in history

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

Change-Id: I1f60f43ed78512dc671db1feca42d5f73d70c595
2021-06-10 00:23:22 +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
Treehugger Robot
4db91ab936 Fix restorePrivateDnsSetting with null hostnames am: 7fd2b373ff
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/14911838

Change-Id: If1e643887b191942217d5589f933bd924c0ff849
2021-06-10 00:06:44 +00:00
Treehugger Robot
50918e503c [automerger skipped] Fix restorePrivateDnsSetting with null hostnames am: 7fd2b373ff -s ours
am skip reason: Merged-In Ic5d8d8b729469e0eef89a0b53f166e604264c1ee with SHA-1 908b002ed2 is already in history

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

Change-Id: I60705cb9b8c95a156ea9e6c7bd22c2998c9885ed
2021-06-10 00:05:44 +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
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
Treehugger Robot
7fd2b373ff Fix restorePrivateDnsSetting with null hostnames
When private DNS setting was set to opportunistic (mode) and null
(hostname), CtsNetUtils would not restore it.

Make sure that private DNS settings are restored after every test. Also
fail if restore is called without having saved any setting beforehand.

Bug: 190465704
Test: atest CtsNetTestCases
Original-Change: https://android-review.googlesource.com/1729162
Merged-In: Ic5d8d8b729469e0eef89a0b53f166e604264c1ee
Change-Id: Ic5d8d8b729469e0eef89a0b53f166e604264c1ee
2021-06-09 10:05:18 +00: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
Junyu Lai
d521f0ff63 [automerger skipped] Merge changes from topic "cts-snapshots" am: 07f97b249c am: fd242c77b1 -s ours am: 58058998db -s ours
am skip reason: Merged-In I90d47ac9bd0570c0aed19402fa9be4e99e0f8621 with SHA-1 056b6649cd is already in history

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

Change-Id: I8fee9b5d7f9ae80571d44226b4eb21af682c31cf
2021-06-09 08:34:38 +00:00
junyulai
8084548385 [automerger skipped] Add CTS for getAllNetworkStateSnapshots am: cfefdea403 am: ccebee1ece -s ours am: 92333ed77f -s ours
am skip reason: Merged-In I573b009bd05bbc0c855aaa6e20cb8ebde6729936 with SHA-1 3a64e80dee is already in history

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

Change-Id: I34369597d0ff01d30bd9a4d302b103888d919423
2021-06-09 08:34:36 +00:00
junyulai
f3caa7e628 [automerger skipped] Check NETWORK_SETTINGS permission for getAllNetworkStateSnapshots am: eaaacb0d47 am: 1c2ffd5329 -s ours am: c559f4a4ac -s ours
am skip reason: Merged-In I3c2563d4ae4e3715d0c6270344ba8f7ef067872f with SHA-1 2afd0986d3 is already in history

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

Change-Id: I304a2871f56410b7c00c9d18acba21923fb283d1
2021-06-09 08:34:34 +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
TreeHugger Robot
1c3c0583ee [automerger skipped] Merge "Fix TetheringTest crash on eng build" into sc-dev am: f15137fb9f -s ours am: f216aa9fa7 -s ours
am skip reason: Merged-In I61f6088783d521fd17ae1e87370842b4239fbe75 with SHA-1 9c5d40beca is already in history

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

Change-Id: I9a5557bf521da860b4823e4bfeca5dc83f838d7a
2021-06-09 08:34:13 +00:00
Junyu Lai
58058998db [automerger skipped] Merge changes from topic "cts-snapshots" am: 07f97b249c am: fd242c77b1 -s ours
am skip reason: Merged-In I90d47ac9bd0570c0aed19402fa9be4e99e0f8621 with SHA-1 056b6649cd is already in history

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

Change-Id: Iaf7247b1fd065b90ee35858672c263e41b6bd1e7
2021-06-09 08:33:47 +00:00
junyulai
92333ed77f [automerger skipped] Add CTS for getAllNetworkStateSnapshots am: cfefdea403 am: ccebee1ece -s ours
am skip reason: Merged-In I573b009bd05bbc0c855aaa6e20cb8ebde6729936 with SHA-1 3a64e80dee is already in history

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

Change-Id: I18cb581ff57498561b969fa3c17d126f797dde7f
2021-06-09 08:33:46 +00:00
junyulai
c559f4a4ac [automerger skipped] Check NETWORK_SETTINGS permission for getAllNetworkStateSnapshots am: eaaacb0d47 am: 1c2ffd5329 -s ours
am skip reason: Merged-In I3c2563d4ae4e3715d0c6270344ba8f7ef067872f with SHA-1 2afd0986d3 is already in history

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

Change-Id: I37eb436b3a148cbcca48a41d333f5c8d9b64457f
2021-06-09 08:33:45 +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
TreeHugger Robot
f19e216465 [automerger skipped] Merge "Fix TetheringTest crash on eng build" into sc-dev am: f15137fb9f am: 04453f641a -s ours
am skip reason: Merged-In I61f6088783d521fd17ae1e87370842b4239fbe75 with SHA-1 7ba566dbf7 is already in history

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

Change-Id: Ib913395e0771bc1b708f6ba1409744eb6e75bdd3
2021-06-09 08:33:12 +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
junyulai
ccebee1ece Add CTS for getAllNetworkStateSnapshots am: cfefdea403
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1708091

Change-Id: I8217f4e4c0de2de5f12066e567f56c0f5432d9f7
2021-06-09 08:15:58 +00:00
junyulai
1c2ffd5329 Check NETWORK_SETTINGS permission for getAllNetworkStateSnapshots am: eaaacb0d47
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1730542

Change-Id: I8f5e007749baa057f1a5a231736d7038fb69204f
2021-06-09 08:15:55 +00:00
TreeHugger Robot
04453f641a Merge "Fix TetheringTest crash on eng build" into sc-dev am: f15137fb9f
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/14637501

Change-Id: I8cd2c8a60e72f28aaf3b931ad7701263d8fd9b29
2021-06-09 08:14:54 +00:00
Lorenzo Colitti
b4e1b65298 Merge "Don't send onLinkPropertiesChanged after onLost for 464xlat." am: a3f12dd52c
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1727829

Change-Id: I1e42216dc10552861253f719d1178e3143ac83c3
2021-06-09 08:14:54 +00:00
Lorenzo Colitti
7e79954915 Merge "Improve test coverage for disconnecting networks with clat." am: f55fa638c8
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1729093

Change-Id: Ieb08904445cabf01ed5ba6f4543699a1585fda50
2021-06-09 08:14:44 +00:00
TreeHugger Robot
f216aa9fa7 [automerger skipped] Merge "Fix TetheringTest crash on eng build" into sc-dev am: f15137fb9f -s ours
am skip reason: Merged-In I61f6088783d521fd17ae1e87370842b4239fbe75 with SHA-1 7ba566dbf7 is already in history

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

Change-Id: Ia40558871b1ea9ea4ae8ca23501f407c3046589e
2021-06-09 08:13:10 +00:00