bohu
65617d384d
Merge "Merge "CTS: skip wifi related net test if no such feature am: 2fa6e7ce43" into nougat-mr1-cts-dev am: 266d07f3cb"
...
am: 1b9c5a00a4
2017-02-03 17:38:27 +00:00
bohu
96187b032a
Merge "CTS: skip wifi related net test if no such feature am: 2fa6e7ce43" into nougat-mr1-cts-dev am: 266d07f3cb
...
am: cf06f6bca3
2017-02-03 17:38:25 +00:00
bohu
1ec884189f
Merge "CTS: skip wifi related net test if no such feature am: 2fa6e7ce43 am: 40f71feca4"
...
am: f9329b58df
2017-02-03 17:37:45 +00:00
Android Merger
1b9c5a00a4
Merge "Merge "CTS: skip wifi related net test if no such feature am: 2fa6e7ce43" into nougat-mr1-cts-dev am: 266d07f3cb"
2017-02-03 17:32:08 +00:00
Android Merger
f9329b58df
Merge "CTS: skip wifi related net test if no such feature am: 2fa6e7ce43 am: 40f71feca4"
2017-02-03 17:32:02 +00:00
bohu
cf06f6bca3
Merge "CTS: skip wifi related net test if no such feature am: 2fa6e7ce43" into nougat-mr1-cts-dev
...
am: 266d07f3cb
2017-02-03 17:31:54 +00:00
bohu
5e6a02e4a3
CTS: skip wifi related net test if no such feature am: 2fa6e7ce43
...
am: 40f71feca4
2017-02-03 17:31:52 +00:00
Android Merger
266d07f3cb
Merge "CTS: skip wifi related net test if no such feature am: 2fa6e7ce43" into nougat-mr1-cts-dev
2017-02-03 17:29:18 +00:00
bohu
40f71feca4
CTS: skip wifi related net test if no such feature
...
am: 2fa6e7ce43
2017-02-03 17:29:09 +00:00
Chris Manton
f60a65f816
Merge "Include Wear device idle settings am: 1ac3a1f3fc"
...
am: afae7a6e23
Change-Id: Ief16fa1d0029f9e60c59b3d551f6fe7b27528a17
2017-02-03 00:12:32 +00:00
Chris Manton
81d5870154
Include Wear device idle settings
...
am: 1ac3a1f3fc
2017-02-03 00:00:35 +00:00
Marco Nelissen
84cde9eb08
Merge "Merge remote-tracking branch 'aosp/nougat-mr1-cts-dev' into master"
...
am: d26b43b4d5
2017-02-02 03:22:29 +00:00
Marco Nelissen
bce78b316b
Merge remote-tracking branch 'aosp/nougat-mr1-cts-dev' into master
...
am: 8653b32a48
2017-02-02 03:22:24 +00:00
Marco Nelissen
d26b43b4d5
Merge "Merge remote-tracking branch 'aosp/nougat-mr1-cts-dev' into master"
2017-02-02 03:18:14 +00:00
Chris Manton
1ac3a1f3fc
Include Wear device idle settings
...
Certain tests interacting with device idle
must set correctly both the normal and wear
device idle setting space.
Bug: 32183373
Test: Run on wear device and Nexus6P
run cts --skip-device-info -m CtsHostsideNetworkTests -t com.android.cts.net.HostsideRestrictBackgroundNetworkTests#testDozeModeMetered_enabledButWhitelistedOnNotificationAction
run cts --skip-device-info -m CtsHostsideNetworkTests -t com.android.cts.net.HostsideRestrictBackgroundNetworkTests#testDozeModeNonMetered_enabledButWhitelistedOnNotificationAction
Change-Id: I6a53d29021a7d4a257b102a4d3bd5d2cc845c16f
2017-01-30 12:26:09 -08:00
Treehugger Robot
1663359290
Merge "Add CTS test for client certificate chains"
2017-01-30 18:08:27 +00:00
Treehugger Robot
aaaca1cfc8
Merge "WifiManagerTest: |disableOthers| flag change"
2017-01-27 23:24:24 +00:00
Marco Nelissen
8653b32a48
Merge remote-tracking branch 'aosp/nougat-mr1-cts-dev' into master
...
Test: built
Merged-In: I0e9438d5fdb01c94077aa22cdf402dee8bf5ec97
Change-Id: Idbd20b12eec0440369b37316f9ab2c84978f7725
2017-01-27 23:14:25 +00:00
Paul Stewart
9f295aaa43
Add CTS test for client certificate chains
...
Add tests to excercise new WifiEnterpriseConfig methods, including
setClientKeyEntryWithCertificateChain, and the new getters related
to it.
Bug: 34688653
Test: This is a test
Change-Id: I183166f5864c5ec77eb8590e2e0f521bbc7a39e7
2017-01-27 11:48:29 -08:00
Roshan Pius
446ca6fd2a
WifiManagerTest: |disableOthers| flag change
...
Change the CTS test to reflect the change in behaviour of the
|disableOthers| flag in WifiManager.enableNetwork(). This will now just
be used as an indication to trigger connection to the specified network
instead of disabling all other configured networks.
Bug: 34765254
Test: Compiles
Change-Id: I97a5a84bb861e289d966552cea7f36d7dd4fd090
2017-01-27 18:54:55 +00:00
Treehugger Robot
a17d71f60a
Merge "Replace strlen("foo") with sizeof("foo") - 1."
2017-01-26 21:49:09 +00:00
George Burgess IV
32599fd50c
Replace strlen("foo") with sizeof("foo") - 1.
...
We have an upcoming change to Bionic that no longer allows us to treat
strlen("foo") as a constant expression, which causes this bit of code to
no longer compile. So, we need to either use __builtin_strlen("foo") or
sizeof("foo") - 1 instead. (Note that the *optimizer* can still turn it
into a constant, but optimization happens after we figure out if
something is actually a constant expression or not.)
sizeof("foo") is used elsewhere in this file, so I just went with that.
Bug: 32073964
Test: Now builds.
Change-Id: I2797ee75fd114e237de8e97c50549763c88f73f4
2017-01-25 19:20:09 +00:00
Treehugger Robot
777c5a3ea1
Merge "Prepare for removal of legacy-test from default targets"
2017-01-20 13:59:18 +00:00
Paul Duffin
d872302cdb
Prepare for removal of legacy-test from default targets
...
In preparation for removing junit classes from the Android API
the legacy-test target will be removed from the
TARGET_DEFAULT_JAVA_LIBRARIES. This change adds explicit
dependencies on junit and/or legacy-android-test to ensure that
modules will compile properly once it is removed.
Bug: 30188076
Test: make checkbuild
Merged-In: I0f34fe97154240e8f8eef6816df1c794da60351e
Change-Id: I7e3b028321c42b7427d79365eb3f51ddf896f930
2017-01-20 11:38:45 +00:00
bohu
2fa6e7ce43
CTS: skip wifi related net test if no such feature
...
When a device does not have wifi feature,
we should skip wifi related net tests.
BUG: 31806034
Change-Id: I9867342c47499efc855a50a67a04177fa94e83e5
2017-01-19 14:07:58 -08:00
Glen Kuhne
1b93dea624
CTS: WifiManager.addNetwork with HttpProxy
...
Added CTS tests verifying, that adding a WifiConfiguration containing an
httpProxy will:
-Succeed if caller is DeviceOwner
-Fail if caller is not DeviceOwner
Test: Added two CTS tests
Bug: 14669153
Change-Id: I2c81492dba5052117a03a2aa7b3cc8ffb5d52d5f
Merged-In: I2c81492dba5052117a03a2aa7b3cc8ffb5d52d5f
2017-01-17 15:33:48 -08:00
Neil Fuller
a3577f20f2
Add test for LocalSockets created from a FileDescriptor
...
Adding a test to catch future regressions with this code
path.
Bug: 34095140
Test: vogar --mode app_process tests/tests/net/src/android/net/cts/LocalSocketTest.java
Change-Id: I648ed87d4b9e7fa25787c150f08351c6faf55496
2017-01-06 14:16:22 +00:00
Neil Fuller
d9e98a6688
Add more assertions related to LocalServerSocket.accept()
...
The isConnected() / isBound() behavior is new, the behavior
when bind() / connect() is called is not. See related
frameworks/base changes.
Test: Tests run under vogar.
Bug: https://code.google.com/p/android/issues/detail?id=35942
Change-Id: I8577212270f3b3e76ea015914eebddc0fe4a6afa
2017-01-04 10:40:36 +00:00
Paul Stewart
26fc3c1dd7
Merge "CtsNetTests: Add a test for b/25624963"
...
am: 9ec7e2127c
2016-10-19 21:49:30 +00:00
Treehugger Robot
9ec7e2127c
Merge "CtsNetTests: Add a test for b/25624963"
2016-10-19 21:40:37 +00:00
Nicolas Boichat
1cdcb253df
PacketReflector: Ignore IPv6 flow labels in ICMPv6 test am: 36c0f02d94 am: 5696846426 am: ffe4cefe73 am: c4df82d292 am: 3342023de9 am: d8bd696559
...
am: 5ee79a1d24
2016-10-19 19:39:58 +00:00
Nicolas Boichat
5ee79a1d24
PacketReflector: Ignore IPv6 flow labels in ICMPv6 test am: 36c0f02d94 am: 5696846426 am: ffe4cefe73 am: c4df82d292 am: 3342023de9
...
am: d8bd696559
2016-10-19 18:04:32 +00:00
Paul Stewart
22b355560e
CtsNetTests: Add a test for b/25624963
...
Ensure that password is not output in toString() for an enterprise
credential.
Bug: 25624963
Test: Run this CTS test: run cts --module CtsNetTestCases --test android.net.wifi.cts.WifiEnterpriseConfigTest#testEnterpriseConfigDoesNotPrintPassword
Change-Id: I84a62ae5d37aa7d397203f41362dadb8ceba1e62
2016-10-19 10:46:09 -07:00
Nicolas Boichat
d8bd696559
PacketReflector: Ignore IPv6 flow labels in ICMPv6 test am: 36c0f02d94 am: 5696846426 am: ffe4cefe73 am: c4df82d292
...
am: 3342023de9
Change-Id: I6c3da43716d4072e6f0beb3e3a2b5b0bffa0aba3
2016-10-18 00:17:23 +00:00
Nicolas Boichat
c4df82d292
PacketReflector: Ignore IPv6 flow labels in ICMPv6 test am: 36c0f02d94 am: 5696846426
...
am: ffe4cefe73
Change-Id: Ib17900cfd7e3371c6afb703c956dd9d4aa7e26f1
2016-10-17 22:04:33 +00:00
Nicolas Boichat
5696846426
PacketReflector: Ignore IPv6 flow labels in ICMPv6 test
...
am: 36c0f02d94
2016-10-17 21:50:57 +00:00
Nicolas Boichat
983fbfccec
PacketReflector: Ignore IPv6 flow labels in ICMPv6 test am: 36c0f02d94 am: 516b0616e9 am: fac99e31ce
...
am: 171491fa35
2016-10-17 17:23:12 +00:00
Nicolas Boichat
171491fa35
PacketReflector: Ignore IPv6 flow labels in ICMPv6 test am: 36c0f02d94 am: 516b0616e9
...
am: fac99e31ce
2016-10-17 17:10:49 +00:00
Nicolas Boichat
fac99e31ce
PacketReflector: Ignore IPv6 flow labels in ICMPv6 test am: 36c0f02d94
...
am: 516b0616e9
2016-10-17 05:23:18 +00:00
Nicolas Boichat
516b0616e9
PacketReflector: Ignore IPv6 flow labels in ICMPv6 test
...
am: 36c0f02d94
2016-10-17 05:15:47 +00:00
Tina Zhou
6854180825
Merge "[CTS]It should be more reasonable to control battery saver function from setting DB instead of plugging/unplugging charger for CtsHostsideNetworkTests test case." into nougat-cts-dev am: e7c890f1e5 am: 4c76844837 am: 908de2e143 am: e7fd69c032
...
am: 6a52d04b89
2016-10-13 16:19:52 +00:00
peter_li
058a74f477
[CTS]It should be more reasonable to control battery saver function from setting DB instead of plugging/unplugging charger for CtsHostsideNetworkTests test case. am: 2ecad8d87d am: ca83ca8472 am: 254dfe5017 am: dc396795cc
...
am: efa1aec0f5
2016-10-13 16:19:20 +00:00
Tina Zhou
6a52d04b89
Merge "[CTS]It should be more reasonable to control battery saver function from setting DB instead of plugging/unplugging charger for CtsHostsideNetworkTests test case." into nougat-cts-dev am: e7c890f1e5 am: 4c76844837 am: 908de2e143
...
am: e7fd69c032
2016-10-13 16:12:40 +00:00
peter_li
efa1aec0f5
[CTS]It should be more reasonable to control battery saver function from setting DB instead of plugging/unplugging charger for CtsHostsideNetworkTests test case. am: 2ecad8d87d am: ca83ca8472 am: 254dfe5017
...
am: dc396795cc
2016-10-13 16:12:17 +00:00
Tina Zhou
1e57f971a4
Merge "[CTS]It should be more reasonable to control battery saver function from setting DB instead of plugging/unplugging charger for CtsHostsideNetworkTests test case." into nougat-cts-dev am: e7c890f1e5 am: 4c76844837
...
am: 1ef49dfc5d
2016-10-13 16:04:17 +00:00
Tina Zhou
e7fd69c032
Merge "[CTS]It should be more reasonable to control battery saver function from setting DB instead of plugging/unplugging charger for CtsHostsideNetworkTests test case." into nougat-cts-dev am: e7c890f1e5 am: 4c76844837
...
am: 908de2e143
2016-10-13 16:04:11 +00:00
peter_li
24c9b794f6
[CTS]It should be more reasonable to control battery saver function from setting DB instead of plugging/unplugging charger for CtsHostsideNetworkTests test case. am: 2ecad8d87d am: ca83ca8472
...
am: 9e20cad5eb
2016-10-13 16:03:54 +00:00
peter_li
dc396795cc
[CTS]It should be more reasonable to control battery saver function from setting DB instead of plugging/unplugging charger for CtsHostsideNetworkTests test case. am: 2ecad8d87d am: ca83ca8472
...
am: 254dfe5017
2016-10-13 16:03:47 +00:00
Tina Zhou
1ef49dfc5d
Merge "[CTS]It should be more reasonable to control battery saver function from setting DB instead of plugging/unplugging charger for CtsHostsideNetworkTests test case." into nougat-cts-dev am: e7c890f1e5
...
am: 4c76844837
2016-10-13 15:57:25 +00:00
Tina Zhou
908de2e143
Merge "[CTS]It should be more reasonable to control battery saver function from setting DB instead of plugging/unplugging charger for CtsHostsideNetworkTests test case." into nougat-cts-dev am: e7c890f1e5
...
am: 4c76844837
2016-10-13 15:57:12 +00:00
