Commit Graph

3368 Commits

Author SHA1 Message Date
Junyu Lai
aeef4e5efa Merge "Add CTS for creating keepalive offloads on cellular" am: 16174b2cff am: e849a96874
am: eb76123add

Change-Id: Ie7d49cbaa2c233ae075e31734c70e24bed9a2633
2019-06-19 07:36:36 -07:00
Junyu Lai
eb76123add Merge "Add CTS for creating keepalive offloads on cellular" am: 16174b2cff
am: e849a96874

Change-Id: Ib6b01356d785c5b7684520eef9f9d1fe48187582
2019-06-19 07:29:02 -07:00
Junyu Lai
16174b2cff Merge "Add CTS for creating keepalive offloads on cellular" 2019-06-19 14:08:31 +00:00
junyulai
487b0401c0 Add CTS for creating keepalive offloads on cellular
Bug: 134352656
Test: atest android.net.cts.ConnectivityManagerTest (--instant)
Change-Id: Ia7b1111abe687efad032a8c9205990c97a769fcd
2019-06-19 10:10:21 +08:00
Sudheer Shanka
d718d35ee1 Merge "Skip battery saver related tests on unsupported devices." into qt-dev am: f8eb2722ff
am: b357138cb6

Change-Id: I21dff5accd2dfaf34ba5c68382e4bb10a3818ed9
2019-06-14 10:48:38 -07:00
Sudheer Shanka
9677c19c12 Merge "Skip battery saver related tests on unsupported devices." into qt-dev am: f8eb2722ff
am: bec485ec90

Change-Id: I4423117a8636ce63431873f4f5edf0fe2832f97e
2019-06-14 10:46:35 -07:00
Sudheer Shanka
b357138cb6 Merge "Skip battery saver related tests on unsupported devices." into qt-dev
am: f8eb2722ff

Change-Id: Ibc940cd7806bada010838ea09989fa1a1c05233b
2019-06-14 10:35:32 -07:00
Sudheer Shanka
f8eb2722ff Merge "Skip battery saver related tests on unsupported devices." into qt-dev 2019-06-14 17:07:39 +00:00
Android Build Merger (Role)
655a9ba232 Merge changes from topic "am-a206f967153f49f0b7bd956a1d464b13" into qt-r1-dev-plus-aosp
* changes:
  Add test with inline executor for DnsResolverTest am: 5e43421294 am: a3a80dd035
  Fix DnsResolverTest for instant mode am: d3b7dec473 am: c80f4f2637
2019-06-13 07:27:27 +00:00
Luke Huang
fb64afc666 Add test with inline executor for DnsResolverTest am: 5e43421294
am: 14e0c7f182

Change-Id: Icd70b72c370cbca6c743e161739089f3dd82f1f6
2019-06-13 00:26:47 -07:00
Luke Huang
0caf75f2bc Add test with inline executor for DnsResolverTest am: 5e43421294
am: a3a80dd035

Change-Id: I754d08a1890f7ced6b85de40f43d071891a41d20
2019-06-13 00:26:44 -07:00
Luke Huang
1ec3b22e48 Fix DnsResolverTest for instant mode am: d3b7dec473
am: d6ff2603c3

Change-Id: I2fda2fe7d085d36379b339ceecee3b0d7aee8d13
2019-06-13 00:26:44 -07:00
Luke Huang
1be9f6dd1a Fix DnsResolverTest for instant mode am: d3b7dec473
am: c80f4f2637

Change-Id: I929f917862b9027dcedf82ea95b516e49f992373
2019-06-13 00:26:41 -07:00
Luke Huang
a3a80dd035 Add test with inline executor for DnsResolverTest
am: 5e43421294

Change-Id: I3f1c81acb525e1e4afc71f420ff3940015e0f271
2019-06-13 00:21:44 -07:00
Luke Huang
c80f4f2637 Fix DnsResolverTest for instant mode
am: d3b7dec473

Change-Id: I2117d9830a4a285c78ad3732d3f327a5285ad98f
2019-06-13 00:21:41 -07:00
Luke Huang
5e43421294 Add test with inline executor for DnsResolverTest
Makes general query test cases also take inline executor.
The new added test case testSequentialQuery with inline executor
will only pass after aosp/980686.

Bug: 134310704
Test: atest DnsResolverTest
      atest DnsResolverTest --instant
Change-Id: I135358fe45652277ed795a2f359f44f4db787c08
(cherry picked from commit 04596294eea3e5db4fd487cf6f8ef598daac606a)
2019-06-13 11:24:48 +08:00
Luke Huang
d3b7dec473 Fix DnsResolverTest for instant mode
add AppModeFull@ to DnsResolverTest since WRITE_SECURE_SETTINGS
could not be ganted in instant mode.

Bug: 134897744
Test: atest DnsResolverTest
      atest DnsResolverTest --instant

Change-Id: I267c19af1a1c5544ca752a364335ec728a478bb2
(cherry picked from commit 2af244f4127883ed967089f550f2cfe07936416d)
2019-06-13 11:24:25 +08:00
Luke Huang
92e1bf6be7 Merge changes I135358fe,I267c19af am: 1d98d5933f am: e16be254bc
am: 0d52a1f229

Change-Id: I92c93b98db1bcd42e04398f1a603607372092a83
2019-06-12 14:41:52 -07:00
Luke Huang
0d52a1f229 Merge changes I135358fe,I267c19af am: 1d98d5933f
am: e16be254bc

Change-Id: I8761fd94e51395140a51d8c8a7f541cdfd2de165
2019-06-12 14:21:59 -07:00
Luke Huang
1053db1f82 Add test with inline executor for DnsResolverTest
Makes general query test cases also take inline executor.
The new added test case testSequentialQuery with inline executor
will only pass after aosp/980686.

Bug: 134310704
Test: atest DnsResolverTest
      atest DnsResolverTest --instant
Change-Id: I135358fe45652277ed795a2f359f44f4db787c08
2019-06-13 01:18:37 +08:00
Luke Huang
c80f04858e Fix DnsResolverTest for instant mode
add AppModeFull@ to DnsResolverTest since WRITE_SECURE_SETTINGS
could not be ganted in instant mode.

Bug: 134897744
Test: atest DnsResolverTest
      atest DnsResolverTest --instant

Change-Id: I267c19af1a1c5544ca752a364335ec728a478bb2
2019-06-13 00:46:18 +08:00
Android Build Merger (Role)
6b6bf24878 Merge "Merge "Update test host used for TLS host verification." into qt-dev am: 0db9c1e7f3 am: 13964c8ae9" into qt-r1-dev-plus-aosp 2019-06-10 08:51:54 +00:00
Pete Bentley
23ff89b36b Merge "Update test host used for TLS host verification." into qt-dev am: 0db9c1e7f3
am: 13964c8ae9

Change-Id: I09d549cb7eb0b86056168be657b622da32bbbdab
2019-06-10 01:51:29 -07:00
Pete Bentley
8a42d78350 Merge "Update test host used for TLS host verification." into qt-dev am: 0db9c1e7f3
am: 7f799aae8e

Change-Id: Ie308b5dc678dba1c84b779f5a729947dc35cc894
2019-06-10 01:51:27 -07:00
Pete Bentley
7f799aae8e Merge "Update test host used for TLS host verification." into qt-dev
am: 0db9c1e7f3

Change-Id: I71c976d7287cea99d64ff8bace7a7ce0efef955c
2019-06-10 01:46:29 -07:00
Pete Bentley
50795d03cd Update test host used for TLS host verification.
Temporary fix, this is still brittle to certificate changes
on the test host.

Bug: 134532880
Test: atest android.net.cts.SSLCertificateSocketFactoryTest
Change-Id: I6e8c8757963ef46009767925bfa512127d9daba7
Merged-In: I6e8c8757963ef46009767925bfa512127d9daba7
(cherry picked from commit 166e7121b173f2a4e3d6a9ded213e4c8679a9cfb)
2019-06-07 19:01:51 +01:00
Sudheer Shanka
802549c8de Skip battery saver related tests on unsupported devices.
Bug: 133761301
Test: atest com.android.cts.net.HostsideRestrictBackgroundNetworkTests
Change-Id: Ifec84425febf38d732367fae6b43fa80c427c79f
2019-06-07 10:14:08 -07:00
Tomasz Wasilczyk
279b0c6726 Merge "Fix testNetworkSettingsPermission for headless User 0" into qt-dev am: e49034996e
am: 34d56ee82c

Change-Id: I4804c913b304d04e286f53adaa359819abae60db
2019-06-05 11:58:09 -07:00
Tomasz Wasilczyk
34d56ee82c Merge "Fix testNetworkSettingsPermission for headless User 0" into qt-dev
am: e49034996e

Change-Id: I6a89c5d7dacb80558ee0d635b7845c791b939ace
2019-06-05 11:52:09 -07:00
TreeHugger Robot
e49034996e Merge "Fix testNetworkSettingsPermission for headless User 0" into qt-dev 2019-06-05 18:40:35 +00:00
Android Build Merger (Role)
af6bebe59d Merge "[automerger skipped] Merge changes from topic "ipsec-tunnel-tests" into qt-dev am: 5c6f115514 am: 589790e7a2 -s ours am skip reason: change_id If6fa359825aa9d1f7d4c8d49aba7a34925c073ed with SHA1 ee4eb2f35b is in history" into qt-r1-dev-plus-aosp 2019-06-03 03:43:09 +00:00
Benedict Wong
af87d22cb5 [automerger skipped] Merge changes from topic "ipsec-tunnel-tests" into qt-dev am: 5c6f115514
am: 589790e7a2 -s ours
am skip reason: change_id If6fa359825aa9d1f7d4c8d49aba7a34925c073ed with SHA1 ee4eb2f35b is in history

Change-Id: Idafcf565acde01fcafe65a1dcf4ed2f1c5e8104a
2019-06-02 20:42:44 -07:00
Benedict Wong
25c811a9e1 [automerger skipped] Merge changes from topic "ipsec-tunnel-tests" into qt-dev am: 5c6f115514 -s ours
am: abf6347714 -s ours
am skip reason: change_id If6fa359825aa9d1f7d4c8d49aba7a34925c073ed with SHA1 ee4eb2f35b is in history

Change-Id: Iccea2b24c45ee015891d5bc11221f82701fee766
2019-06-02 20:42:42 -07:00
Benedict Wong
abf6347714 [automerger skipped] Merge changes from topic "ipsec-tunnel-tests" into qt-dev
am: 5c6f115514 -s ours
am skip reason: change_id If6fa359825aa9d1f7d4c8d49aba7a34925c073ed with SHA1 ee4eb2f35b is in history

Change-Id: Ia9261fefe426c1ea1c73f4341b85dac13ecf6f1a
2019-06-02 20:36:42 -07:00
TreeHugger Robot
5c6f115514 Merge changes from topic "ipsec-tunnel-tests" into qt-dev
* changes:
  Remove mContext from IpSecBaseTest
  Add reflected-packet based data tests
  Cleanup IPsec CTS tests
2019-06-03 03:20:42 +00:00
Tomasz Wasilczyk
66fe5244ad Fix testNetworkSettingsPermission for headless User 0
This test fails on devices with headless user 0 when it tries to
verify apps with android:sharedUserId="android.uid.system" (and without
explicit ask for NETWORK_SETTINGS). Such apps get this permission
by default, but when running on user 1 they get UID 1001000, what doesn't
match SYSTEM_UID=1000.

By the chance of modifying this code, let's also add more verbose error
message (with UID), simplify it and reduce indentation count.

Bug: 120143468
Test: atest android.net.wifi.cts.WifiManagerTest#testNetworkSettingsPermission
Change-Id: Ifc09320cf738a518003126fad1ce31f5e38a3aff
2019-05-31 15:21:17 -07:00
Benedict Wong
d8a36dd745 Remove mContext from IpSecBaseTest
This commit removes the mContext from IpSecBaseTest, and replaces it
with InstrumentationRegistry.getContext().

Bug: 72950854
Test: Ran on devices, passing.
Merged-In: If6fa359825aa9d1f7d4c8d49aba7a34925c073ed
Change-Id: If6fa359825aa9d1f7d4c8d49aba7a34925c073ed
(cherry picked from commit 69760fb5b62ae0e36c2a88bb20502dead3d7589b)
2019-05-31 13:00:51 -07:00
Benedict Wong
2cb7034baf Add reflected-packet based data tests
This commit adds tests that reflect outgoing packets, flipping the outer
src/dst headers to avoid the need to tear down and rebuild the outer
TUN.

This allows us to at least test that our implementation can interoperate
with itself.

Bug: 72950854
Test: this, passing
Merged-In: Ia969f78f4c1a0c0a017f5aad425a68852ff4433a
Change-Id: Ia969f78f4c1a0c0a017f5aad425a68852ff4433a
(cherry picked from commit 144937f3df37ee0b1d5484f10e8c86a8a70a9cb5)
2019-05-31 13:00:30 -07:00
Benedict Wong
a0279520f0 Cleanup IPsec CTS tests
This commit addresses comments from aosp/963067 and aosp/959617.

No behavioral/functional changes were made, only renames and minor style
nits addressed.

Bug: 72950854
Test: Ran on devices, working
Merged-In: I1702b91e245412f0142e9e47b7fb373b9b4e8126
Change-Id: I1702b91e245412f0142e9e47b7fb373b9b4e8126
(cherry picked from commit 68237a11f9532ca6c59d579adb374fe40b0b3bee)
2019-05-31 13:00:15 -07:00
Benedict Wong
f1e9c7e92f Merge changes If6fa3598,Ia969f78f am: 5715ce685d am: a5030c2f21
am: dfcb691f2e

Change-Id: Ie231de0445b6f59b8af8886772fc7f8ab81c1e87
2019-05-31 11:13:13 -07:00
Benedict Wong
dfcb691f2e Merge changes If6fa3598,Ia969f78f am: 5715ce685d
am: a5030c2f21

Change-Id: I62cdef952de3919f1efcf50817c762e3a1b65768
2019-05-31 10:58:13 -07:00
Benedict Wong
5715ce685d Merge changes If6fa3598,Ia969f78f
* changes:
  Remove mContext from IpSecBaseTest
  Add reflected-packet based data tests
2019-05-31 17:29:23 +00:00
Benedict Wong
50c4dd0b24 Merge "Cleanup IPsec CTS tests" am: 1d6880153b am: 8493a945b8
am: 02bfd4d1fb

Change-Id: Ia316904e952167b1890cda1654f95126048885f0
2019-05-31 06:17:56 -07:00
Benedict Wong
02bfd4d1fb Merge "Cleanup IPsec CTS tests" am: 1d6880153b
am: 8493a945b8

Change-Id: I1e2f9bffb11b8a4a5dedd24045b8c36d79a1d5f4
2019-05-31 06:13:05 -07:00
Treehugger Robot
1d6880153b Merge "Cleanup IPsec CTS tests" 2019-05-31 12:54:49 +00:00
jovanak
1a1f5e1ff7 Merge "Merge "Fixing NetworkWatchlistTest#testGetWatchlistConfigHash for secondary users." into pie-cts-dev am: 4e9043b8cf" am: a700ed10de am: 01de7ff50f
am: 7f445bb85e

Change-Id: I8b32857131c1f01efd3de10ad912b1672d4f2bb2
2019-05-30 14:28:52 -07:00
jovanak
7f445bb85e Merge "Merge "Fixing NetworkWatchlistTest#testGetWatchlistConfigHash for secondary users." into pie-cts-dev am: 4e9043b8cf" am: a700ed10de
am: 01de7ff50f

Change-Id: I62bf92b08c1bfe955bacab4c1edf565f993b7871
2019-05-30 14:17:41 -07:00
jovanak
a105e2a2dc Merge "Fixing NetworkWatchlistTest#testGetWatchlistConfigHash for secondary users." into pie-cts-dev am: 4e9043b8cf am: e4c4e3e55a am: 0ac46bc583
am: aaf19bf9ce

Change-Id: I9b971fd3612e054f1349302d8b190f0b74f3cd00
2019-05-30 14:07:00 -07:00
jovanak
aaf19bf9ce Merge "Fixing NetworkWatchlistTest#testGetWatchlistConfigHash for secondary users." into pie-cts-dev am: 4e9043b8cf am: e4c4e3e55a
am: 0ac46bc583

Change-Id: Ie5f5fd37e41024399c972ecbc644664b204baa66
2019-05-30 13:58:31 -07:00
jovanak
0ac46bc583 Merge "Fixing NetworkWatchlistTest#testGetWatchlistConfigHash for secondary users." into pie-cts-dev am: 4e9043b8cf
am: e4c4e3e55a

Change-Id: I67e8569e9976f99888e4aba0fde16d784d691477
2019-05-30 13:48:57 -07:00