Daniel Xie
53ecd9a0f6
Manually merge commit '9be9d5865ba2584a251642359710c074061dee5e' into nyc-dev am: 253fdc667a
...
am: aa76e8b6fc
2016-09-14 21:56:51 +00:00
Daniel Xie
aa76e8b6fc
Manually merge commit '9be9d5865ba2584a251642359710c074061dee5e' into nyc-dev
...
am: 253fdc667a
2016-09-14 21:53:52 +00:00
The Android Automerger
253fdc667a
Manually merge commit '9be9d5865ba2584a251642359710c074061dee5e' into nyc-dev
...
* commit '9be9d5865ba2584a251642359710c074061dee5e': (75 commits)
CameraITS scene5 should be skipped if read_3a is not supported
Added Bluetooth LE tests
Add CTS tests for LocalSocket read/write timeouts
Replace libziparchive-host with libziparchive
Fix clang-tidy warnings in libjnitest.
Fix clang-tidy warnings in librscpptest.
Fix clang-tidy warnings in openglperf2.
Fix clang-tidy warnings in audio_quality.
Replaces pcre with pcre2
Add Mockito to deps for Conscrypt tests and remove core-tests
simpleperf_cts_test: link libevent.
Add the new android kernel path to includes.
FileSystemPermisionTest: Drop unused method
Use mockito-target-minus-junit4.
android.core.tests.libcore.package.tests: add mockito to the dependencies
Fix misc-macro-parentheses warnings in cts.
[RenderScript] Fix refocus test to accommodate different rounding behavior for half_sqrt().
Remove data race from refocus test
Remove one test from MediaCodecTest#testCreateInputSurfaceErrors.
Return all errors, not only the first one.
...
2016-09-14 21:21:50 +00:00
Bill Yi
c4d9bed560
Merge commit \'4158fbc54acdcb2c7cc52704a45e0e9f3e93ffe1\' into HEAD am: 02fa7b88cc am: ba68fcfa5a am: bf2d4c864a am: 849aac5aab am: 158bfbece5
...
am: ca4419f433
2016-09-14 02:17:33 +00:00
Bill Yi
ca4419f433
Merge commit \'4158fbc54acdcb2c7cc52704a45e0e9f3e93ffe1\' into HEAD am: 02fa7b88cc am: ba68fcfa5a am: bf2d4c864a am: 849aac5aab
...
am: 158bfbece5
2016-09-14 02:02:26 +00:00
Bill Yi
4648ade426
Merge commit \'4158fbc54acdcb2c7cc52704a45e0e9f3e93ffe1\' into HEAD am: 02fa7b88cc am: ba68fcfa5a am: bf2d4c864a
...
am: 0324f0f402
2016-09-14 01:51:31 +00:00
Bill Yi
158bfbece5
Merge commit \'4158fbc54acdcb2c7cc52704a45e0e9f3e93ffe1\' into HEAD am: 02fa7b88cc am: ba68fcfa5a am: bf2d4c864a
...
am: 849aac5aab
2016-09-14 01:48:26 +00:00
Bill Yi
0324f0f402
Merge commit \'4158fbc54acdcb2c7cc52704a45e0e9f3e93ffe1\' into HEAD am: 02fa7b88cc am: ba68fcfa5a
...
am: bf2d4c864a
2016-09-14 01:33:55 +00:00
Bill Yi
849aac5aab
Merge commit \'4158fbc54acdcb2c7cc52704a45e0e9f3e93ffe1\' into HEAD am: 02fa7b88cc am: ba68fcfa5a
...
am: bf2d4c864a
2016-09-14 01:33:25 +00:00
Bill Yi
bf2d4c864a
Merge commit \'4158fbc54acdcb2c7cc52704a45e0e9f3e93ffe1\' into HEAD am: 02fa7b88cc
...
am: ba68fcfa5a
2016-09-14 01:22:14 +00:00
Nicolas Boichat
36c0f02d94
PacketReflector: Ignore IPv6 flow labels in ICMPv6 test
...
Since Linux kernel 4.2, net.ipv6.auto_flowlabels is set by default, and
therefore the request and reply may have different IPv6 flow label.
Bug: 31444338
Test: On a kernel 4.4 board, run com.android.cts.net.HostsideNetworkTests#testVpn
Test: On a kernel 3.18 board, run echo 1 > /proc/sys/net/ipv6/auto_flowlabels, then
com.android.cts.net.HostsideNetworkTests#testVpn
Change-Id: I913bbf91574239a24cb32ae908834eb951ea2010
2016-09-13 17:32:40 +08:00
Daniel Xie
9be9d5865b
Merge "CameraITS scene5 should be skipped if read_3a is not supported" into nougat-cts-dev
2016-09-09 03:33:03 +00:00
Paul Duffin
f2e2158377
Merge changes I150aefde,Ic6fc1807,Id82a83fd am: 474407820b am: b9de8e7df1
...
am: 157de1218f
2016-09-08 12:03:43 +00:00
Ian Rogers
774ce009c2
Fix to CtsHostsideNetworkTestsAidl Java library kind. am: 03ee9869ac am: 2984490109
...
am: 71ae4905ac
2016-09-08 12:03:23 +00:00
Paul Duffin
157de1218f
Merge changes I150aefde,Ic6fc1807,Id82a83fd am: 474407820b
...
am: b9de8e7df1
Change-Id: I54ea4153d1e128bf9eec0609f65a89df7f350ba2
2016-09-08 11:17:17 +00:00
Ian Rogers
71ae4905ac
Fix to CtsHostsideNetworkTestsAidl Java library kind. am: 03ee9869ac
...
am: 2984490109
Change-Id: I2892485750d0fb055b20af40a54ea601e9ff5a0e
2016-09-08 11:17:05 +00:00
Paul Duffin
474407820b
Merge changes I150aefde,Ic6fc1807,Id82a83fd
...
* changes:
Fix to CtsHostsideNetworkTestsAidl Java library kind.
Add missing CTS keystore build dependency.
Fix Java library dependencies
2016-09-08 11:03:34 +00:00
Ian Rogers
03ee9869ac
Fix to CtsHostsideNetworkTestsAidl Java library kind.
...
Fixes Error Prone build.
Bug: 27723540
(cherry picked from commit ad015ac64d0e510cc040a83b1d545e3a1405b1f7)
Change-Id: I150aefde61615023e86e19645a46e432a0183705
2016-09-08 10:51:30 +01:00
sj.cha
560981b972
Merge "Add some failure comments in VpnTest" am: cf8d6e3253 am: 060aa462cb
...
am: ee2b139f7a
2016-09-08 09:37:10 +00:00
sj.cha
ee2b139f7a
Merge "Add some failure comments in VpnTest" am: cf8d6e3253
...
am: 060aa462cb
Change-Id: Ifb3c10aa186d99add321102d503007b857eba78e
2016-09-08 09:34:36 +00:00
Treehugger Robot
cf8d6e3253
Merge "Add some failure comments in VpnTest"
2016-09-08 09:24:11 +00:00
Roshan Pius
bb422cf538
Merge "CtsNetTests: Fix WifiInfoTest" am: 133d0c3dad am: b75c380c17
...
am: e1794e1518
2016-09-07 17:57:57 +00:00
Roshan Pius
e1794e1518
Merge "CtsNetTests: Fix WifiInfoTest" am: 133d0c3dad
...
am: b75c380c17
Change-Id: I62e56e6c6862eb15e2e86c88b1c3ba6f804291b6
2016-09-07 17:52:09 +00:00
Roshan Pius
f1bb48635d
CtsNetTests: Fix WifiInfoTest
...
According to the public documentation of WifiInfo.getSSID(), the
returned value can be one of the following:
1. Hex digits if the SSID cannot be decoded as UTF-8.
2. String surrounded by double quotes if the SSID can be decoded as
UTF-8.
3. <unknown ssid>, if not connected.
Fix the test to check for all these 3 string values.
BUG: 31272462
TEST: The failing CTS test passes now.
Change-Id: I26e12d28994e3cdb4cd1bd9e999633b327ad5830
2016-09-07 08:56:45 -07:00
Neil Fuller
b5265d650d
Merge "Add CTS tests for LocalSocket read/write timeouts" into nyc-mr1-dev am: cd198fbef3
...
am: 5cc207a964
2016-09-06 21:58:53 +00:00
Neil Fuller
5cc207a964
Merge "Add CTS tests for LocalSocket read/write timeouts" into nyc-mr1-dev
...
am: cd198fbef3
2016-09-06 21:44:10 +00:00
Neil Fuller
7fda661ac6
Add CTS tests for LocalSocket read/write timeouts am: a8574413ed
...
am: 25ee9e4f16
2016-09-06 21:44:06 +00:00
Neil Fuller
25ee9e4f16
Add CTS tests for LocalSocket read/write timeouts
...
am: a8574413ed
2016-09-06 21:32:40 +00:00
TreeHugger Robot
cd198fbef3
Merge "Add CTS tests for LocalSocket read/write timeouts" into nyc-mr1-dev
2016-09-06 21:20:20 +00:00
sj.cha
0118f0329c
Add some failure comments in VpnTest
...
Symptom : Sockets are not instantly destroyed during VpnTest.
Root Cause : If CONFIG_INET_DIAG_DESTROY kernel config is not set in Android N, when network interface going to down, sockets are not instantly destroyed.
Solution : Enable CONFIG_INET_DIAG_DESTROY kernel feature. But developer cannot check all of configurations on kernel, so adding some comments in VpnTest.
Signed-off-by: SangJin Cha <sj.cha@lge.com >
Change-Id: Ib97b93dfbfb62fe61bd3688ea7545708ec3ea2a2
2016-09-01 07:01:36 +09:00
Neil Fuller
a8574413ed
Add CTS tests for LocalSocket read/write timeouts
...
The behavior was not previous covered and broke in N
due to commit c80af6d8. There is an associated fix
in frameworks/base.
Some refactoring of existing tests to reduce
duplication and tidy up sockets after tests.
Test: Ran the new CTS test (before and after related fix)
Bug: 31205169
(cherry picked from commit 52376fc1c8
2016-08-31 18:18:02 +01:00
Neil Fuller
ac8e98758f
Merge "Add CTS tests for LocalSocket read/write timeouts" am: 83bddfd9ec am: 50ac25a1a7
...
am: 40a4a76824
2016-08-31 16:47:41 +00:00
Neil Fuller
40a4a76824
Merge "Add CTS tests for LocalSocket read/write timeouts" am: 83bddfd9ec
...
am: 50ac25a1a7
Change-Id: Ic2199b23d256d9b56963b0ac91cc758fa07c0846
2016-08-31 16:42:00 +00:00
Neil Fuller
83bddfd9ec
Merge "Add CTS tests for LocalSocket read/write timeouts"
2016-08-31 16:28:17 +00:00
Neil Fuller
52376fc1c8
Add CTS tests for LocalSocket read/write timeouts
...
The behavior was not previous covered and broke in N
due to commit c80af6d8. There is an associated fix
in frameworks/base.
Some refactoring of existing tests to reduce
duplication and tidy up sockets after tests.
Test: Ran the new CTS test (before and after related fix)
Bug: 31205169
Change-Id: Ie94335bc535beefcc5301d5469de6b8211af0bab
2016-08-31 13:12:54 +01:00
Felipe Leme
120d9fdb6c
DO NOT MERGE:Improve check for activity on top after launch. am: 9d8c5ba97e -s ours am: 6f82325df0 am: 3b8a14323c am: b0fc0ec688
...
am: 82ee1ae3a5
Change-Id: I3a64f6f5f2c41315be36e684e9e7964302bae8c2
2016-08-25 21:48:28 +00:00
Felipe Leme
b0fc0ec688
DO NOT MERGE:Improve check for activity on top after launch. am: 9d8c5ba97e -s ours am: 6f82325df0
...
am: 3b8a14323c
2016-08-25 21:15:41 +00:00
Felipe Leme
7ed2d701b1
DO NOT MERGE:Improve check for activity on top after launch. am: 9d8c5ba97e -s ours am: 6f82325df0
...
am: 4e638de3f1
2016-08-25 21:11:57 +00:00
Felipe Leme
4e638de3f1
DO NOT MERGE:Improve check for activity on top after launch. am: 9d8c5ba97e -s ours
...
am: 6f82325df0
2016-08-25 21:03:22 +00:00
Felipe Leme
3b8a14323c
DO NOT MERGE:Improve check for activity on top after launch. am: 9d8c5ba97e -s ours
...
am: 6f82325df0
2016-08-25 21:00:48 +00:00
Felipe Leme
6f82325df0
DO NOT MERGE:Improve check for activity on top after launch.
...
am: 9d8c5ba97e
2016-08-25 20:51:22 +00:00
Felipe Leme
f5ba7ef760
Added tests for network restrictions while the screen is off. am: 2882cd2a7a
...
am: f602c8fd12
Change-Id: Ie4ac91c0b23ceb0c3ed56cfba16ea2651f5bfb7c
2016-08-20 05:38:08 +00:00
Felipe Leme
2882cd2a7a
Added tests for network restrictions while the screen is off.
...
BUG: 30785671
Change-Id: I1b211e545ff234272ff6acadfda9ce97765695a9
(cherry picked from commit b80a93061aa7d0a19b47a7dbb82f0dc06e3afb7e)
2016-08-20 03:58:09 +00:00
Felipe Leme
fdceed85ed
Improve check for activity on top after launch. am: a871a99ebc am: b7ff856a2a
...
am: b27e249370
Change-Id: I4c34f3356545d6d9a5a2f76838770c591347fb55
2016-08-16 00:49:14 +00:00
Felipe Leme
a6461a105d
Improve check for activity on top after launch. am: a871a99ebc
...
am: 226e261696
2016-08-16 00:37:56 +00:00
Felipe Leme
b7ff856a2a
Improve check for activity on top after launch.
...
am: a871a99ebc
2016-08-16 00:34:18 +00:00
Felipe Leme
226e261696
Improve check for activity on top after launch.
...
am: a871a99ebc
2016-08-16 00:33:53 +00:00
Felipe Leme
9d8c5ba97e
DO NOT MERGE:Improve check for activity on top after launch.
...
BUG: 30875754
Fixes: 30868243
Change-Id: Iad3d6ce80fcf24281e98251799c23abc9b83b52d
Change-Id: I8b7624e35caef107743d6 1f312e220f8bc21b9b8
2016-08-15 23:31:58 +00:00
Felipe Leme
a871a99ebc
Improve check for activity on top after launch.
...
BUG: 30875754
Fixes: 30868243
Change-Id: I8b7624e35caef107743d61f312e220f8bc21b9b8
2016-08-15 15:50:38 -07:00
Neil Fuller
0c9ef52771
Merge "Initialize MockWebServer in setUp() not construction time" am: f1026cb99e am: 6406334d84
...
am: 626bc4b4ae
Change-Id: Id488d2d8e9bc7feecf54ecb88cee65f84b61337c
2016-08-09 16:17:13 +00:00
