Commit Graph

3421 Commits

Author SHA1 Message Date
Tomasz Wasilczyk
7becb78abc Merge "Fix testNetworkSettingsPermission for headless User 0" into qt-dev am: e49034996e am: 34d56ee82c
am: 279b0c6726

Change-Id: I4a1d75046204a3f0ead654eaec6ce530e568f8da
2019-06-05 12:35:45 -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
Benedict Wong
cab662e370 Merge "[automerger skipped] Merge changes from topic "ipsec-tunnel-tests" into qt-dev am: 5c6f115514 am: 589790e7a2 -s ours
am: af6bebe59d -s ours
am skip reason: change_id If6fa359825aa9d1f7d4c8d49aba7a34925c073ed with SHA1 d8a36dd745 is in history

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

Change-Id: I0c7ecbe3c7e90e8062ce26f48b4e30e186d72a52
2019-06-02 20:48:47 -07: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
203b1acf81 Merge "Merge changes If6fa3598,Ia969f78f am: 5715ce685d am: a5030c2f21 am: dfcb691f2e" into qt-r1-dev-plus-aosp
am: 9e2760362a

Change-Id: Iaf9f3aaaf8461d719c30b4184b6af6442e43bf21
2019-05-31 11:40:08 -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
8a86f8eb5d Merge "Cleanup IPsec CTS tests" am: 1d6880153b am: 8493a945b8 am: 02bfd4d1fb
am: 50c4dd0b24

Change-Id: I66477ffae2c0a21aa41f2aa24507cf12a06912af
2019-05-31 06:23:01 -07: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
163cb7ab1a Merge "Merge "Fixing NetworkWatchlistTest#testGetWatchlistConfigHash for secondary users." into pie-cts-dev am: 4e9043b8cf" am: a700ed10de am: 01de7ff50f am: 7f445bb85e
am: 1a1f5e1ff7

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

Change-Id: Ided8c501db9a793b4ebf61cbbbdd99edcf0ad562
2019-05-30 14:36:12 -07: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
Android Merger
a700ed10de Merge "Merge "Fixing NetworkWatchlistTest#testGetWatchlistConfigHash for secondary users." into pie-cts-dev am: 4e9043b8cf" 2019-05-30 20:45:04 +00:00
jovanak
2045aa4777 Merge "Fixing NetworkWatchlistTest#testGetWatchlistConfigHash for secondary users." into pie-cts-dev
am: 4e9043b8cf

Change-Id: I5417f214cd337c3d0b517b160d753d808e9e3f59
2019-05-30 13:44:48 -07:00
jovanak
e4c4e3e55a Merge "Fixing NetworkWatchlistTest#testGetWatchlistConfigHash for secondary users." into pie-cts-dev
am: 4e9043b8cf

Change-Id: I0696ee72052294a96d50425284d074dda8ea809a
2019-05-30 13:37:48 -07:00
Luke Huang
182cfefb39 [automerger skipped] Merge "Add bypass private DNS test case and null network test for DnsResolver cts am: 0b35214faa am: 4f74c9ad43" into qt-r1-dev-plus-aosp
am: 9bca7fc6ce -s ours
am skip reason: change_id I8dd48f11baf92d953ded237204a3c2cd3b58581d with SHA1 06fb6f83eb is in history

Change-Id: I6edc9eaaa3d7b2347a53966e414e96d54efb2df9
2019-05-30 10:29:30 -07:00
Luke Huang
e3254f8df7 [automerger skipped] Add bypass private DNS test case and null network test for DnsResolver cts am: 0b35214faa am: 4f74c9ad43
am: 6c5e745a97 -s ours
am skip reason: change_id I8dd48f11baf92d953ded237204a3c2cd3b58581d with SHA1 06fb6f83eb is in history

Change-Id: Ic5909baeaa3f2402a05c41d1d431c8c4959e87b7
2019-05-30 10:04:53 -07:00
Luke Huang
e26f267e65 [automerger skipped] Add bypass private DNS test case and null network test for DnsResolver cts am: 0b35214faa am: 5e40a89885
am: 76cd261ded -s ours
am skip reason: change_id I8dd48f11baf92d953ded237204a3c2cd3b58581d with SHA1 06fb6f83eb is in history

Change-Id: Iada872666709f6b4ca04ddb453d8af93aa6a65b0
2019-05-30 10:00:25 -07:00
Android Build Merger (Role)
9bca7fc6ce Merge "Add bypass private DNS test case and null network test for DnsResolver cts am: 0b35214faa am: 4f74c9ad43" into qt-r1-dev-plus-aosp 2019-05-30 16:41:12 +00:00
Luke Huang
6c5e745a97 Add bypass private DNS test case and null network test for DnsResolver cts am: 0b35214faa
am: 4f74c9ad43

Change-Id: Id8f405e59d8fbeb5aeff43edcd83e95f402ae46a
2019-05-30 09:37:52 -07:00
Luke Huang
76cd261ded Add bypass private DNS test case and null network test for DnsResolver cts am: 0b35214faa
am: 5e40a89885

Change-Id: I292b11ab154c5230fdb4ea0042796221976f0251
2019-05-30 09:37:32 -07:00
Luke Huang
4f74c9ad43 Add bypass private DNS test case and null network test for DnsResolver cts
am: 0b35214faa

Change-Id: I1c145e504cb63f6144364823f653bad0fbede707
2019-05-30 09:15:12 -07:00
Luke Huang
0b35214faa Add bypass private DNS test case and null network test for DnsResolver cts
1. add test case for testing bypass Private DNS
2. add null network test
3. minor change for cleanup

Bug: 130594022
Test: atest DnsResolverTest

Merged-In: I8dd48f11baf92d953ded237204a3c2cd3b58581d
(cherry picked from commit da665a0a78a2919c3e2edabafec463de3de9ddb7)

Change-Id: Iabb100c51fd80eca5ab0284bc891f4fb98492e8b
2019-05-30 11:58:52 +00:00
Luke Huang
06fb6f83eb Merge "Add bypass private DNS test case and null network test for DnsResolver cts" am: 3df5aa1233 am: fbc990bf3b am: e848de43cd
am: 4ae7244448

Change-Id: I8dd48f11baf92d953ded237204a3c2cd3b58581d
2019-05-30 04:46:32 -07:00
Luke Huang
4ae7244448 Merge "Add bypass private DNS test case and null network test for DnsResolver cts" am: 3df5aa1233 am: fbc990bf3b
am: e848de43cd

Change-Id: I7561e5e0727af716875ed72fe3b5ae9a9ec0e975
2019-05-30 04:41:11 -07:00
Luke Huang
e848de43cd Merge "Add bypass private DNS test case and null network test for DnsResolver cts" am: 3df5aa1233
am: fbc990bf3b

Change-Id: I3cdfc9093915ceb27c5161c5b2f7dc9149b0dcb8
2019-05-30 04:36:33 -07:00
Luke Huang
3df5aa1233 Merge "Add bypass private DNS test case and null network test for DnsResolver cts" 2019-05-30 11:22:50 +00:00
Junyu Lai
e9c6271819 Merge "[automerger skipped] Merge "Fix keepalive CTS fail for devices with kernel older than 4.8" into qt-dev am: d2a0d577f0 am: 1d689279e0 -s ours
am: 5b7166636c -s ours
am skip reason: change_id I3f8456deea2b4ded762a413c8e27b58ce54ce0aa with SHA1 063b4e109e is in history

Change-Id: If1cc3125e345e9141d7e606d281d2e4c70498889
2019-05-30 00:48:00 -07:00
Junyu Lai
d30fef8d25 [automerger skipped] Merge "Fix keepalive CTS fail for devices with kernel older than 4.8" into qt-dev am: d2a0d577f0 -s ours am: f5e8bf5b79 -s ours
am: 3ea41d799d -s ours
am skip reason: change_id I3f8456deea2b4ded762a413c8e27b58ce54ce0aa with SHA1 063b4e109e is in history

Change-Id: I391234d41861219023d21000d2b316949cfec6ba
2019-05-30 00:47:11 -07:00
Android Build Merger (Role)
5b7166636c Merge "[automerger skipped] Merge "Fix keepalive CTS fail for devices with kernel older than 4.8" into qt-dev am: d2a0d577f0 am: 1d689279e0 -s ours am skip reason: change_id I3f8456deea2b4ded762a413c8e27b58ce54ce0aa with SHA1 063b4e109e is in history" into qt-r1-dev-plus-aosp 2019-05-30 07:42:30 +00:00
Junyu Lai
3ea41d799d [automerger skipped] Merge "Fix keepalive CTS fail for devices with kernel older than 4.8" into qt-dev am: d2a0d577f0 -s ours
am: f5e8bf5b79 -s ours
am skip reason: change_id I3f8456deea2b4ded762a413c8e27b58ce54ce0aa with SHA1 063b4e109e is in history

Change-Id: I2895f11abcbea5fe73ef91b359d8d634af77d810
2019-05-30 00:42:07 -07:00
Junyu Lai
ef42976d4b [automerger skipped] Merge "Fix keepalive CTS fail for devices with kernel older than 4.8" into qt-dev am: d2a0d577f0
am: 1d689279e0 -s ours
am skip reason: change_id I3f8456deea2b4ded762a413c8e27b58ce54ce0aa with SHA1 063b4e109e is in history

Change-Id: I7578ec0d99a036eec0d3ac1980fab8583d6588f6
2019-05-30 00:42:07 -07:00