Chih-hung Hsieh
c4e5ef0549
Merge "Use -Werror in cts/.../Anroid.mk"
...
am: 3012fb2ba0
Change-Id: I9745c0cbef7ad12f950a5a68a45bf691776fb5ed
2017-10-20 22:42:31 +00:00
Chih-Hung Hsieh
78061072b6
Use -Werror in cts/.../Anroid.mk
...
* Suppress existing warnings.
Bug: 66996870
Test: build with WITH_TIDY=1
Change-Id: Ic599c9e11ea4f991b7e60930c891a6d736623b39
2017-10-18 16:55:15 -07:00
Lorenzo Colitti
ace309a7ad
Merge "Ensure that Ethernet is supported if the service is running."
...
am: 266fad4970
2017-09-27 08:31:15 +00:00
Treehugger Robot
266fad4970
Merge "Ensure that Ethernet is supported if the service is running."
2017-09-27 08:23:34 +00:00
Lorenzo Colitti
c4f38c2e5b
Ensure that Ethernet is supported if the service is running.
...
Currently, it's possible for isNetworkSupported() to return false
for TYPE_ETHERNET even if the device could otherwise support
Ethernet (e.g., via a USB host adapter). This can lead to APIs
APIs such as getActiveNetworkInfo and CONNECTIVITY_ACTION
behaving as if Ethernet was not present, even if it's connected.
Reduce the chance of this sort of misconfiguration by ensuring
that if the Ethernet service is running, isNetworkSupported
will return true for TYPE_ETHERNET. OEMs that would like the
function to return false should avoid starting the Ethernet
service.
Bug: 37359230
Test: ConnectivityManagerTest passes on aosp_bullhead
Change-Id: I395c689e47074910fb56bbd8fc5b2d698d3893ab
2017-09-27 14:01:48 +09:00
nharold
8a707e0272
Merge "Re-Add the IpSecService Tests"
...
am: 7432695b11
2017-09-26 22:10:08 +00:00
nharold
7432695b11
Merge "Re-Add the IpSecService Tests"
2017-09-26 21:46:38 +00:00
Bill Yi
7f71a70fd9
Merge remote-tracking branch 'aosp/oreo-cts-dev' into HEAD - DO NOT MERGE
...
am: cbc75fa643
2017-09-15 21:11:07 +00:00
Bill Yi
cbc75fa643
Merge remote-tracking branch 'aosp/oreo-cts-dev' into HEAD - DO NOT MERGE
...
Change-Id: I5a20ec8986f2bfc810cec42ca7b33310aba337a4
2017-09-15 13:55:36 -07:00
Etan Cohen
507654d6ae
Merge "Merge "[AWARE][CTS] Check for location setting for test needing to disable Wi-Fi" into oc-dev am: ba16d61c91"
...
am: 98792d616b
Change-Id: I1882f7e73325c4b938f22b2f7e29d203117819b9
2017-09-15 02:43:55 +00:00
Etan Cohen
04038eb317
Merge "[AWARE][CTS] Check for location setting for test needing to disable Wi-Fi" into oc-dev
...
am: ba16d61c91
Change-Id: If02188d1840095be927a18b66296910c4ec7e387
2017-09-14 22:59:05 +00:00
Chenbo Feng
6fe814f14b
Merge "Resolve merge conflicts of 2ce31b513f to nyc-dev am: 3d166665b1 am: 0545b99cab am: 120ebca195 am: 907ef28ed9 am: 579e5eb386 am: 3f96549bd1"
...
am: c3d81857a5
Change-Id: Ifff65ca6a4ca26dd0bb5defac2a965952dee08fe
2017-09-14 22:23:19 +00:00
Chenbo Feng
89e5b633c7
Merge "Merge "Resolve merge conflicts of 8482d8c85c to nougat-cts-dev" into nougat-cts-dev am: e37efbd57e am: 280d269f01 am: 05f5afd834 am: 4b7b9dd4ab am: 6bff534f60 am: 18449e5999 am: f68fa658b6"
...
am: 46acd158a2
Change-Id: Id99b60b98e06a43c2e9ad645ee0e50b5395a8bff
2017-09-14 22:11:24 +00:00
Chenbo Feng
85de5d94bc
Resolve merge conflicts of 2ce31b513f to nyc-dev am: 3d166665b1 am: 0545b99cab am: 120ebca195 am: 907ef28ed9 am: 579e5eb386
...
am: 3f96549bd1
2017-09-14 21:58:00 +00:00
Chenbo Feng
880ad913b8
Merge "Resolve merge conflicts of 8482d8c85c to nougat-cts-dev" into nougat-cts-dev am: e37efbd57e am: 280d269f01 am: 05f5afd834 am: 4b7b9dd4ab am: 6bff534f60 am: 18449e5999
...
am: f68fa658b6
2017-09-14 21:55:29 +00:00
Chenbo Feng
4ee9600280
Merge "Merge "resolve merge conflicts of 921e4b7e1c to oc-dev" into oc-dev am: f33518ff9d"
...
am: 0fb575dc69
Change-Id: I1c5312b51f851d7a70b985a980c128622e1b68e6
2017-09-14 17:27:47 +00:00
Chenbo Feng
72ea1b2420
Merge "resolve merge conflicts of 921e4b7e1c to oc-dev" into oc-dev
...
am: f33518ff9d
Change-Id: I705950d7d620ac21cc74c2584c0e3256f17af15e
2017-09-14 03:55:19 +00:00
Nathan Harold
f304fce1fe
Re-Add the IpSecService Tests
...
This reverts commit 18b7c24177
2017-09-12 18:47:38 -07:00
Sudheer Shanka
d832f09d2b
Merge "Merge "Merge "Increase timeout for ordered broadcast response." into nougat-cts-dev am: 203361a0c3" into nougat-mr1-cts-dev am: b5abc8f89b -s ours"
...
am: 6a0cb56e57
2017-09-07 18:21:17 +00:00
Sudheer Shanka
b411a9d3c1
Merge "Merge "Increase timeout for ordered broadcast response." into nougat-cts-dev am: 203361a0c3" into nougat-mr1-cts-dev
...
am: b5abc8f89b
2017-09-07 18:19:13 +00:00
Android Merger
6a0cb56e57
Merge "Merge "Merge "Increase timeout for ordered broadcast response." into nougat-cts-dev am: 203361a0c3" into nougat-mr1-cts-dev am: b5abc8f89b -s ours"
2017-09-07 18:10:38 +00:00
Sudheer Shanka
516c8c9872
Merge "Merge "Increase timeout for ordered broadcast response." into nougat-cts-dev am: 203361a0c3" into nougat-mr1-cts-dev
...
am: b5abc8f89b
2017-09-07 18:10:25 +00:00
Android Merger
b5abc8f89b
Merge "Merge "Increase timeout for ordered broadcast response." into nougat-cts-dev am: 203361a0c3" into nougat-mr1-cts-dev
2017-09-07 18:08:35 +00:00
Sudheer Shanka
9418ecdc40
Merge "Increase timeout for ordered broadcast response." into nougat-cts-dev
...
am: 203361a0c3
Change-Id: Ifbd3594524de6fc45cb199345715794f9869c9d6
2017-09-07 18:08:27 +00:00
Sudheer Shanka
07e00f7523
Increase timeout for ordered broadcast response.
...
Bug: 65269531
Test: cts-tradefed run singleCommand cts-dev -m CtsHostsideNetworkTests -t \
com.android.cts.net.HostsideRestrictBackgroundNetworkTests
Merged-In: Ibdb84048b04405f234aa5ad9124eb70e9e592498
Merged-In: I99668396abcf7421cd7ffb9118e309aaecb80f07
Change-Id: I6f1de7ccc8d4164dc6f770b54863c04bb7d9e62e
2017-09-05 14:56:04 -07:00
Android Build Merger (Role)
f7d8c8a448
Merge "Skip WifiManager tests if WiFi is not supported am: d4c2d2aca3 am: 632418c11c" into oc-dr1-dev-plus-aosp
2017-08-23 18:20:55 +00:00
Bjoern Johansson
21fc213b66
Skip WifiManager tests if WiFi is not supported am: d4c2d2aca3
...
am: 632418c11c
2017-08-23 18:18:55 +00:00
Bjoern Johansson
f4cc24488c
Skip WifiManager tests if WiFi is not supported am: d4c2d2aca3
...
am: 68842e0e90
2017-08-23 18:18:52 +00:00
Bjoern Johansson
68842e0e90
Skip WifiManager tests if WiFi is not supported
...
am: d4c2d2aca3
2017-08-23 18:12:26 +00:00
Bjoern Johansson
632418c11c
Skip WifiManager tests if WiFi is not supported
...
am: d4c2d2aca3
2017-08-23 18:12:22 +00:00
Bjoern Johansson
d4c2d2aca3
Skip WifiManager tests if WiFi is not supported
...
Some of the WifiManager tests assumed that WiFi is always supported.
This is not true for all devices, for example the Android emulator, and
is not a requirement in the CDD.
BUG: 37633976
Test: Successfully ran 'run cts -m CtsNetTestCases'
Change-Id: Ia6d62e8d2b6e0b0c2ef2fafd50529e722e4419e4
(cherry picked from commit 9703adffd5e3bf85e482cdac45a1147caff4ac3d)
2017-08-23 15:52:48 +00:00
shreerag
94206d5cad
Merge "No longer using specific watch device idle settings" into oc-dev am: 8bde47ae82
...
am: eb2c021f93
2017-08-10 00:05:26 +00:00
shreerag
be05af9c47
Merge "No longer using specific watch device idle settings" into oc-dev am: 8bde47ae82
...
am: 940696d63a
2017-08-10 00:03:01 +00:00
shreerag
eb2c021f93
Merge "No longer using specific watch device idle settings" into oc-dev
...
am: 8bde47ae82
2017-08-09 23:58:26 +00:00
shreerag
940696d63a
Merge "No longer using specific watch device idle settings" into oc-dev
...
am: 8bde47ae82
2017-08-09 23:58:26 +00:00
TreeHugger Robot
8bde47ae82
Merge "No longer using specific watch device idle settings" into oc-dev
2017-08-09 23:44:19 +00:00
Android Build Merger (Role)
172b195839
Merge "Merge "Dup fds to stop finalizers from invalidating them." into nougat-mr1-cts-dev am: bfabfe75f9 am: 80c62eb79b am: d4df358e42 am: 929efe5914 am: c324d8efcc am: 1a81908450" into oc-dr1-dev-plus-aosp
2017-08-09 17:05:50 +00:00
Lorenzo Colitti
9448a9e068
Merge "Dup fds to stop finalizers from invalidating them." into nougat-mr1-cts-dev am: bfabfe75f9 am: 80c62eb79b am: d4df358e42 am: 929efe5914 am: c324d8efcc
...
am: 8331ccda31
2017-08-09 17:04:55 +00:00
Lorenzo Colitti
8ac9ae64a7
Merge "Dup fds to stop finalizers from invalidating them." into nougat-mr1-cts-dev am: bfabfe75f9 am: 80c62eb79b am: d4df358e42 am: 929efe5914 am: c324d8efcc
...
am: 1a81908450
2017-08-09 17:04:55 +00:00
Lorenzo Colitti
1a81908450
Merge "Dup fds to stop finalizers from invalidating them." into nougat-mr1-cts-dev am: bfabfe75f9 am: 80c62eb79b am: d4df358e42 am: 929efe5914
...
am: c324d8efcc
2017-08-09 16:53:48 +00:00
Lorenzo Colitti
8331ccda31
Merge "Dup fds to stop finalizers from invalidating them." into nougat-mr1-cts-dev am: bfabfe75f9 am: 80c62eb79b am: d4df358e42 am: 929efe5914
...
am: c324d8efcc
2017-08-09 16:53:47 +00:00
Lorenzo Colitti
dd9617a6a7
Merge "Merge "Dup fds to stop finalizers from invalidating them." into nougat-mr1-cts-dev am: bfabfe75f9" am: 1e524c5db2 am: ad86c0342e
...
am: 62cc540c27
2017-08-09 16:53:25 +00:00
Lorenzo Colitti
c324d8efcc
Merge "Dup fds to stop finalizers from invalidating them." into nougat-mr1-cts-dev am: bfabfe75f9 am: 80c62eb79b am: d4df358e42
...
am: 929efe5914
Change-Id: Id08eca6a250dee0c809267b7e3c79b9bb7170f3b
2017-08-09 16:47:20 +00:00
Lorenzo Colitti
62cc540c27
Merge "Merge "Dup fds to stop finalizers from invalidating them." into nougat-mr1-cts-dev am: bfabfe75f9" am: 1e524c5db2
...
am: ad86c0342e
2017-08-09 16:47:16 +00:00
Lorenzo Colitti
ad86c0342e
Merge "Merge "Dup fds to stop finalizers from invalidating them." into nougat-mr1-cts-dev am: bfabfe75f9"
...
am: 1e524c5db2
2017-08-09 16:36:01 +00:00
Lorenzo Colitti
d4df358e42
Merge "Dup fds to stop finalizers from invalidating them." into nougat-mr1-cts-dev am: bfabfe75f9
...
am: 80c62eb79b
2017-08-09 16:35:45 +00:00
Lorenzo Colitti
80c62eb79b
Merge "Dup fds to stop finalizers from invalidating them." into nougat-mr1-cts-dev
...
am: bfabfe75f9
2017-08-09 16:29:49 +00:00
Android Merger
1e524c5db2
Merge "Merge "Dup fds to stop finalizers from invalidating them." into nougat-mr1-cts-dev am: bfabfe75f9"
2017-08-09 16:24:14 +00:00
Lorenzo Colitti
9196e62bb2
Merge "Dup fds to stop finalizers from invalidating them." into nougat-mr1-cts-dev
...
am: bfabfe75f9
2017-08-09 16:24:03 +00:00
Treehugger Robot
bfabfe75f9
Merge "Dup fds to stop finalizers from invalidating them." into nougat-mr1-cts-dev
2017-08-09 16:17:22 +00:00
