Treehugger Robot
0c5a65837a
[automerger skipped] Merge "DO NOT MERGE Revert "Ensure CONFIGURED_NETWORKS_CHANGED not received without permissions"" into oreo-mr1-cts-dev am: 4542e0c819 -s ours
...
am skip reason: subject contains skip directive
Original change: https://android-review.googlesource.com/c/platform/cts/+/1485239
Change-Id: I9939c93cc295f972fc010bb4e2b654a65a0aac81
2020-11-03 19:58:08 +00:00
David Su
5799e9167a
DO NOT MERGE Revert "Ensure CONFIGURED_NETWORKS_CHANGED not received without permissions"
...
This reverts commit 956f4dc231
2020-11-03 03:01:50 +00:00
David Su
5dd45ebc2b
DO NOT MERGE CTS: Ensure CONFIGURED_NETWORKS_CHANGED_ACTION broadcast is received
...
Android Pie CtsNetTestCases AndroidManifest.xml has both
ACCESS_WIFI_STATE & ACCESS_FINE_LOCATION permission.
Thus, it should receive the CONFIGURED_NETWORKS_CHANGED_ACTION
broadcast when a network is removed.
Bug: 159373687
Bug: 171022033
Test: atest CtsNetTestCases
Change-Id: I9d194424469d204c4f95e98b937d67ba728f2122
Merged-In: I4669a6ff79b3d2e99795015e42bfa611cffb9070
2020-10-28 17:06:54 +00:00
Automerger Merge Worker
9b59163ff4
Merge "Merge "Merge "Merge "Merge "Update the QUIC packet format." into nougat-cts-dev am: f6a0cdcba6" into nougat-mr1-cts-dev am: 657d75b4bf" into oreo-cts-dev am: 56c21dd47b" into oreo-mr1-cts-dev am: 087370b5e1" into pie-cts-dev
2020-10-14 01:30:16 +00:00
Automerger Merge Worker
f62f154faf
Merge "Merge "Merge "Merge "Update the QUIC packet format." into nougat-cts-dev am: f6a0cdcba6" into nougat-mr1-cts-dev am: 657d75b4bf" into oreo-cts-dev am: 56c21dd47b" into oreo-mr1-cts-dev am: 087370b5e1
...
Original change: https://android-review.googlesource.com/c/platform/cts/+/1457991
Change-Id: I0c40c9f027efed8c29439e8ff50dde0d064410a8
2020-10-14 01:30:09 +00:00
Automerger Merge Worker
087370b5e1
Merge "Merge "Merge "Merge "Update the QUIC packet format." into nougat-cts-dev am: f6a0cdcba6" into nougat-mr1-cts-dev am: 657d75b4bf" into oreo-cts-dev am: 56c21dd47b" into oreo-mr1-cts-dev
2020-10-14 01:18:56 +00:00
Automerger Merge Worker
b66af87ddf
Merge "Merge "Merge "Update the QUIC packet format." into nougat-cts-dev am: f6a0cdcba6" into nougat-mr1-cts-dev am: 657d75b4bf" into oreo-cts-dev am: 56c21dd47b
...
Original change: https://android-review.googlesource.com/c/platform/cts/+/1457991
Change-Id: I55d39f866717823fa0ddb4cc6eaef5bafe6b5a44
2020-10-14 01:18:51 +00:00
Automerger Merge Worker
56c21dd47b
Merge "Merge "Merge "Update the QUIC packet format." into nougat-cts-dev am: f6a0cdcba6" into nougat-mr1-cts-dev am: 657d75b4bf" into oreo-cts-dev
2020-10-14 01:09:37 +00:00
Automerger Merge Worker
2f113052fa
Merge "Merge "Update the QUIC packet format." into nougat-cts-dev am: f6a0cdcba6" into nougat-mr1-cts-dev am: 657d75b4bf
...
Original change: https://android-review.googlesource.com/c/platform/cts/+/1457991
Change-Id: I0d8debd9688681170abe0d08249d42b2c3badf1f
2020-10-14 01:09:27 +00:00
Automerger Merge Worker
657d75b4bf
Merge "Merge "Update the QUIC packet format." into nougat-cts-dev am: f6a0cdcba6" into nougat-mr1-cts-dev
2020-10-14 01:02:31 +00:00
Treehugger Robot
a37ee1c4df
Merge "Update the QUIC packet format." into nougat-cts-dev am: f6a0cdcba6
...
Original change: https://android-review.googlesource.com/c/platform/cts/+/1457991
Change-Id: Ie36145fb92e6efb20e6b15ca4b0dc57dafc63a92
2020-10-14 01:02:23 +00:00
Treehugger Robot
f6a0cdcba6
Merge "Update the QUIC packet format." into nougat-cts-dev
2020-10-14 00:39:13 +00:00
Automerger Merge Worker
a114d93542
Merge "Merge "Merge "Ensure CONFIGURED_NETWORKS_CHANGED not received without permissions" into oreo-cts-dev am: f23d174804" into oreo-mr1-cts-dev am: 09eb86e9af" into pie-cts-dev
2020-10-13 15:08:06 +00:00
Automerger Merge Worker
7fa7aa033b
Merge "Merge "Ensure CONFIGURED_NETWORKS_CHANGED not received without permissions" into oreo-cts-dev am: f23d174804" into oreo-mr1-cts-dev am: 09eb86e9af
...
Original change: https://android-review.googlesource.com/c/platform/cts/+/1452057
Change-Id: I73e88886644d87ad67e16af1713f0339d83eec45
2020-10-13 15:07:59 +00:00
Automerger Merge Worker
09eb86e9af
Merge "Merge "Ensure CONFIGURED_NETWORKS_CHANGED not received without permissions" into oreo-cts-dev am: f23d174804" into oreo-mr1-cts-dev
2020-10-13 14:53:09 +00:00
Treehugger Robot
a3e0d990be
Merge "Ensure CONFIGURED_NETWORKS_CHANGED not received without permissions" into oreo-cts-dev am: f23d174804
...
Original change: https://android-review.googlesource.com/c/platform/cts/+/1452057
Change-Id: Icf1c069f515ba31dff6d2ca501ee43042ea9ab9f
2020-10-13 14:53:02 +00:00
Lorenzo Colitti
25da49b7ff
Update the QUIC packet format.
...
The QUIC packet format has changed again. Update the test to
ensure that the GFE can drop support for the old packet format
without causing all devices to fail CTS.
Packet format changes suggested by dschinazi@.
Bug: 170724836
Test: atest --rerun-until-failure 100 CtsNetTestCasesLatestSdk:MultinetworkApiTest#testNativeDatagramTransmission
Change-Id: I8625ac9a58c55fc19dfb9fdb5f34a89cee40caaf
Merged-In: I8625ac9a58c55fc19dfb9fdb5f34a89cee40caaf
(cherry picked from commit c2b9b83bf353a1fe0669e327fa03ddb024e4f21d)
2020-10-13 23:45:00 +09:00
Treehugger Robot
f23d174804
Merge "Ensure CONFIGURED_NETWORKS_CHANGED not received without permissions" into oreo-cts-dev
2020-10-13 14:33:26 +00:00
David Su
956f4dc231
Ensure CONFIGURED_NETWORKS_CHANGED not received without permissions
...
Ensure that the CONFIGURED_NETWORKS_CHANGED_ACTION broadcast is not
received without the required permissions.
Bug: 159373687
Test: cts-tradefed run cts -m CtsNetTestCases --test android.net.wifi.cts.WifiManagerTest#testWifiManagerNetWork
Change-Id: I2e3f38b05d63571e838b148fbbb2ce6f68c19c01
Merged-In: I4669a6ff79b3d2e99795015e42bfa611cffb9070
2020-10-07 01:30:11 +00:00
jgkim
b38f0df3f9
CtsNetTestCases: Fix issues in android.net.wifi.cts.WifiEnterpriseConfigTest
...
1.android.net.wifi.cts.WifiEnterpriseConfigTest#testAddEapNetwork
2.android.net.wifi.cts.WifiEnterpriseConfigTest#testEnterpriseConfigDoesNotPrintPassword
3.android.net.wifi.cts.WifiEnterpriseConfigTest#testSettersAndGetters
Bug:143000258
Test: run cts-on-gsi -m CtsNetTestCases-t android.net.wifi.cts.WifiEnterpriseConfigTest#testAddEapNetwork
Test: run cts-on-gsi -m CtsNetTestCases-t android.net.wifi.cts.WifiEnterpriseConfigTest#testEnterpriseConfigDoesNotPrintPassword
Test: run cts-on-gsi -m CtsNetTestCases-t android.net.wifi.cts.WifiEnterpriseConfigTest#testSettersAndGetters
Change-Id: Iaed949693c8ac8ce67dbde6acb622f90f0e638da
Merged-In: Iaed949693c8ac8ce67dbde6acb622f90f0e638da
2020-01-30 01:24:41 +00:00
Android Merger
3a915f2921
Merge "Merge "Merge "Merge "Merge "Attempt "fix" the broken QUIC packet to be slightly less broken" into nougat-cts-dev am: af4499cf45" into nougat-mr1-cts-dev am: 28dbc1ff07" into oreo-cts-dev am: 6bc025004b" into oreo-mr1-cts-dev am: acfa8b7bb7" into pie-cts-dev
2019-08-26 21:18:31 +00:00
Chalard Jean
cc2444de25
Merge "Merge "Merge "Merge "Attempt "fix" the broken QUIC packet to be slightly less broken" into nougat-cts-dev am: af4499cf45" into nougat-mr1-cts-dev am: 28dbc1ff07" into oreo-cts-dev am: 6bc025004b" into oreo-mr1-cts-dev
...
am: acfa8b7bb7
2019-08-26 14:18:20 -07:00
Android Merger
c347654003
Merge "Merge "Merge "[automerger skipped] Merge "Merge "Exempt adb socket for hostside VpnTest" into nougat-cts-dev am: 873f2d8aa3" into nougat-mr1-cts-dev am: 63dda3513d -s ours am: 335491989f -s ours am: 4f182df10a -s ours am skip reason: change_id I91b4ab018a9e7fc73dcb7969e4a6520d6b27d629 with SHA1 52b82e3312 is in history" into pie-cts-dev
2019-08-26 21:17:50 +00:00
markchien
b3c63b6961
Merge "Merge "[automerger skipped] Merge "Merge "Exempt adb socket for hostside VpnTest" into nougat-cts-dev am: 873f2d8aa3" into nougat-mr1-cts-dev am: 63dda3513d -s ours am: 335491989f -s ours
...
am: 4f182df10a52b82e3312
2019-08-26 14:17:38 -07:00
Android Merger
ddb681cafe
Merge "Merge "[automerger skipped] Merge "Exempt adb socket for hostside VpnTest" into oreo-cts-dev am: 0ff953bf1b -s ours am: 956b28af13 -s ours am skip reason: change_id I91b4ab018a9e7fc73dcb7969e4a6520d6b27d629 with SHA1 52b82e3312 is in history" into pie-cts-dev
2019-08-26 21:05:29 +00:00
markchien
8367edd304
Merge "[automerger skipped] Merge "Exempt adb socket for hostside VpnTest" into oreo-cts-dev am: 0ff953bf1b -s ours
...
am: 956b28af1352b82e3312
2019-08-26 14:05:15 -07:00
Android Merger
acfa8b7bb7
Merge "Merge "Merge "Merge "Attempt "fix" the broken QUIC packet to be slightly less broken" into nougat-cts-dev am: af4499cf45" into nougat-mr1-cts-dev am: 28dbc1ff07" into oreo-cts-dev am: 6bc025004b" into oreo-mr1-cts-dev
2019-08-26 19:08:35 +00:00
Chalard Jean
d5c8e158bc
Merge "Merge "Merge "Attempt "fix" the broken QUIC packet to be slightly less broken" into nougat-cts-dev am: af4499cf45" into nougat-mr1-cts-dev am: 28dbc1ff07" into oreo-cts-dev
...
am: 6bc025004b
2019-08-26 12:08:22 -07:00
Android Merger
4f182df10a
Merge "Merge "[automerger skipped] Merge "Merge "Exempt adb socket for hostside VpnTest" into nougat-cts-dev am: 873f2d8aa3" into nougat-mr1-cts-dev am: 63dda3513d -s ours am: 335491989f -s ours am skip reason: change_id I91b4ab018a9e7fc73dcb7969e4a6520d6b27d629 with SHA1 d51ae5760d is in history" into oreo-mr1-cts-dev
2019-08-26 19:07:43 +00:00
markchien
c7e558b100
Merge "[automerger skipped] Merge "Merge "Exempt adb socket for hostside VpnTest" into nougat-cts-dev am: 873f2d8aa3" into nougat-mr1-cts-dev am: 63dda3513d -s ours
...
am: 335491989fd51ae5760d
2019-08-26 12:07:31 -07:00
Android Merger
6bc025004b
Merge "Merge "Merge "Attempt "fix" the broken QUIC packet to be slightly less broken" into nougat-cts-dev am: af4499cf45" into nougat-mr1-cts-dev am: 28dbc1ff07" into oreo-cts-dev
2019-08-26 18:56:14 +00:00
Chalard Jean
b50dd23f95
Merge "Merge "Attempt "fix" the broken QUIC packet to be slightly less broken" into nougat-cts-dev am: af4499cf45" into nougat-mr1-cts-dev
...
am: 28dbc1ff07
2019-08-26 11:56:05 -07:00
Android Merger
335491989f
Merge "[automerger skipped] Merge "Merge "Exempt adb socket for hostside VpnTest" into nougat-cts-dev am: 873f2d8aa3" into nougat-mr1-cts-dev am: 63dda3513d -s ours am skip reason: change_id I91b4ab018a9e7fc73dcb7969e4a6520d6b27d629 with SHA1 d51ae5760d is in history" into oreo-cts-dev
2019-08-26 18:55:30 +00:00
markchien
0619ed30a2
[automerger skipped] Merge "Merge "Exempt adb socket for hostside VpnTest" into nougat-cts-dev am: 873f2d8aa3" into nougat-mr1-cts-dev
...
am: 63dda3513dd51ae5760d
2019-08-26 11:55:21 -07:00
Android Merger
28dbc1ff07
Merge "Merge "Attempt "fix" the broken QUIC packet to be slightly less broken" into nougat-cts-dev am: af4499cf45" into nougat-mr1-cts-dev
2019-08-26 18:38:33 +00:00
Chalard Jean
dbafd34852
Merge "Attempt "fix" the broken QUIC packet to be slightly less broken" into nougat-cts-dev
...
am: af4499cf45
2019-08-26 11:38:25 -07:00
Android Merger
63dda3513d
Merge "Merge "Exempt adb socket for hostside VpnTest" into nougat-cts-dev am: 873f2d8aa3" into nougat-mr1-cts-dev
2019-08-26 18:37:58 +00:00
markchien
0d6a32a571
Merge "Exempt adb socket for hostside VpnTest" into nougat-cts-dev
...
am: 873f2d8aa3
Change-Id: Ib9749b290a9cc943f441457b22f660cbe2b85b3b
2019-08-26 11:37:49 -07:00
Treehugger Robot
af4499cf45
Merge "Attempt "fix" the broken QUIC packet to be slightly less broken" into nougat-cts-dev
2019-08-23 18:10:09 +00:00
Chalard Jean
2bf54f7c79
Attempt "fix" the broken QUIC packet to be slightly less broken
...
Bug: 139403355
Signed-off-by: Erik Kline <ek@google.com >
Merged-In: I9c938998b5e30f7d3994b410878b2af6a75f9b5a
Test: in I9c938998b5e30f7d3994b410878b2af6a75f9b5a
(cherry picked from commit 8ce68f1310
2019-08-23 09:49:42 +00:00
markchien
52b82e3312
Exempt adb socket for hostside VpnTest
...
Vpn test would destroy socket. If adb run over network, adb
socket would be killed during Vpn test. Then, test stop due to
adb disconnect.
Bug: 119382723
Bug: 117194347
Test: - I solemnly swear I tested this conflict resolution
Change-Id: I91b4ab018a9e7fc73dcb7969e4a6520d6b27d629
Merged-In: I91b4ab018a9e7fc73dcb7969e4a6520d6b27d629
(cherry picked from commit de0f268f78
2019-08-09 12:45:45 +00:00
markchien
dd32bb52f7
Exempt adb socket for hostside VpnTest
...
Vpn test would destroy socket. If adb run over network, adb
socket would be killed during Vpn test. Then, test stop due to
adb disconnect.
Bug: 119382723
Bug: 135225500
Bug: 126645908
Test: Just cherry-pick with conflict fix
Change-Id: I91b4ab018a9e7fc73dcb7969e4a6520d6b27d629
Merged-In: I91b4ab018a9e7fc73dcb7969e4a6520d6b27d629
Merged-In: Id6f986aacc3cadf713ebbc8305ca535b861390fc
(cherry picked from commit de0f268f78
2019-07-18 12:43:04 +00:00
Android Merger
956b28af13
Merge "[automerger skipped] Merge "Exempt adb socket for hostside VpnTest" into oreo-cts-dev am: 0ff953bf1b -s ours am skip reason: change_id Id6f986aacc3cadf713ebbc8305ca535b861390fc with SHA1 b84038696c is in history" into oreo-mr1-cts-dev
2019-06-27 15:51:06 +00:00
markchien
1547ce9dfa
[automerger skipped] Merge "Exempt adb socket for hostside VpnTest" into oreo-cts-dev
...
am: 0ff953bf1b -s ours
am skip reason: change_id Id6f986aacc3cadf713ebbc8305ca535b861390fc with SHA1 b84038696c
2019-06-27 08:50:57 -07:00
markchien
d51ae5760d
Exempt adb socket for hostside VpnTest
...
Vpn test would destroy socket. If adb run over network, adb
socket would be killed during Vpn test. Then, test stop due to
adb disconnect.
Bug: 119382723
Bug: 135225500
Test: - build pass
Change-Id: I91b4ab018a9e7fc73dcb7969e4a6520d6b27d629
Merged-In: I91b4ab018a9e7fc73dcb7969e4a6520d6b27d629
Merged-In: Id6f986aacc3cadf713ebbc8305ca535b861390fc
(cherry picked from commit de0f268f78
2019-06-19 08:21:00 +00:00
Sudheer Shanka
8371c77499
Skip battery saver related tests on unsupported devices.
...
Bug: 133761301
Test: atest com.android.cts.net.HostsideRestrictBackgroundNetworkTests
Change-Id: Ifec84425febf38d732367fae6b43fa80c427c79f
Merged-In: Ifec84425febf38d732367fae6b43fa80c427c79f
2019-06-07 10:16:07 -07:00
jovanak
db6336c0b8
Fixing NetworkWatchlistTest#testGetWatchlistConfigHash for secondary users.
...
Avoids relying on external storage and using the hardcoded /sdcard/ path.
Unrooted adb does not have access to non-user 0 sdcard paths, and so the "cp"
command fails when the test runs in user 10.
Fixes: 121400865
Test: cts-tradefed run cts-dev -m CtsNetTestCases -t android.net.cts.NetworkWatchlistTest#testGetWatchlistConfigHash in user 10.
Change-Id: Idc667072bcfbbe159416fa7c7b6b19045b52041d
2019-05-24 12:21:50 -07:00
Android Merger
f9b246a320
Merge "Merge "Merge "Merge "Merge "Fix expected reverse lookup of Google DNS IP addresses" into nougat-cts-dev am: 3b416dd354" into nougat-mr1-cts-dev am: 50491fb1cc" into oreo-cts-dev am: b6d3940f89" into oreo-mr1-cts-dev am: d93f6d545c" into pie-cts-dev
2019-04-09 02:38:32 +00:00
Lorenzo Colitti
aaac541459
Merge "Merge "Merge "Merge "Fix expected reverse lookup of Google DNS IP addresses" into nougat-cts-dev am: 3b416dd354" into nougat-mr1-cts-dev am: 50491fb1cc" into oreo-cts-dev am: b6d3940f89" into oreo-mr1-cts-dev
...
am: d93f6d545c
2019-04-08 19:38:21 -07:00
Android Merger
d93f6d545c
Merge "Merge "Merge "Merge "Fix expected reverse lookup of Google DNS IP addresses" into nougat-cts-dev am: 3b416dd354" into nougat-mr1-cts-dev am: 50491fb1cc" into oreo-cts-dev am: b6d3940f89" into oreo-mr1-cts-dev
2019-04-09 00:52:27 +00:00
