Commit Graph

1031 Commits

Author SHA1 Message Date
Roshan Pius
d434b47f1e Merge "WifiManagerTest: |disableOthers| flag change" am: aaaca1cfc8
am: 76b4b52522

Change-Id: I8afe4aab7b34565ec5eac7ea274065d38aeb0696
2017-01-27 23:32:26 +00:00
Treehugger Robot
aaaca1cfc8 Merge "WifiManagerTest: |disableOthers| flag change" 2017-01-27 23:24:24 +00: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
George Burgess IV
f7ce609edb Merge "Replace strlen("foo") with sizeof("foo") - 1." am: a17d71f60a
am: 386431a28c

Change-Id: I84aafb1fa79b7d16261d96a583348c0ad6bd044b
2017-01-26 21:59:05 +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
Paul Duffin
42f777bbb6 Merge "Prepare for removal of legacy-test from default targets" am: 777c5a3ea1
am: 2d7a0786b5

Change-Id: I3d450f4890825f5ad261b01ae9bd1a1b01a640c7
2017-01-20 14:05:29 +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
Glen Kuhne
968719035d Merge "CTS: WifiManager.addNetwork with HttpProxy" am: b99788eb24
am: 155a81349f

Change-Id: I0b4f12d41263db0fd69cce933af915f46fa3ff31
2017-01-18 18:24:45 +00: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
6a89797685 Merge "Add test for LocalSockets created from a FileDescriptor" am: fc8bbf5ceb
am: abc0e7765d

Change-Id: Ia1ef9e648c7afa55406793803f579db90844e864
2017-01-11 13:47:20 +00: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
0c14426eac Merge "Add more assertions related to LocalServerSocket.accept()" am: 863ff4a2cb
am: a0c574dcc7

Change-Id: I90164b0ee1b7301fd4f99c530fd6f7159aba780c
2017-01-04 12:37:43 +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
Tina Zhou
eef36c9a9d merge in nyc-mr1-cts-release history after reset to nyc-mr1-dev am: e58548f27f -s ours am: b7086e2c4f
am: c3a819d061

Change-Id: I5239b0cf6a68af29133f68073ad83bab4253573a
2016-12-17 00:50:16 +00:00
Tina Zhou
c3a819d061 merge in nyc-mr1-cts-release history after reset to nyc-mr1-dev am: e58548f27f -s ours
am: b7086e2c4f

Change-Id: I6f0595dbed91c37b9efc53bdeed326d14169f32e
2016-12-17 00:41:16 +00:00
Tina Zhou
b7086e2c4f merge in nyc-mr1-cts-release history after reset to nyc-mr1-dev
am: e58548f27f  -s ours

Change-Id: Ife44c57e390811d075f4624c151ebf08e90fc079
2016-12-17 00:32:46 +00:00
Yu Liu
0170919a9b merge in nyc-mr1-release history after reset to nyc-mr1-dev am: 73eee30ffe am: 7cd9930f4b
am: d7f8755fd5

Change-Id: Ie62acf8eff6ee5213d7a6319e98f2df4fb4b4030
2016-12-16 22:34:37 +00:00
Yu Liu
d7f8755fd5 merge in nyc-mr1-release history after reset to nyc-mr1-dev am: 73eee30ffe
am: 7cd9930f4b

Change-Id: Ie0e82a9f99c172cf85803ca9885bc265aa79486c
2016-12-16 22:25:38 +00:00
Yu Liu
7cd9930f4b merge in nyc-mr1-release history after reset to nyc-mr1-dev
am: 73eee30ffe

Change-Id: I32635801fa4338f313feef7655c7636253d708d3
2016-12-16 22:17:04 +00:00
gitbuildkicker
e58548f27f merge in nyc-mr1-cts-release history after reset to nyc-mr1-dev 2016-11-30 16:55:24 -08:00
Baligh Uddin
3c9b149b01 Merge remote-tracking branch 'goog/cw-f-dev' into fix_merger
Bug: 32849428
* goog/cw-f-dev: (122 commits)
  Fixed CTS unit tests
  Fixing layout of several test suites for round screens.
  Fix test case context which is not fully visible on wear.
  Fix build for nyc-dr1-dev
  Check that H.264 is available before checking max frame rate
  DO NOT MERGE: Bump CTS and CTS Verifier to 5.1_r14
  DO NOT MERGE: Bump CTS and CTS Verifier to 6.0_r13
  Run DynamicConfig setup twice
  DO NOT MERGE: Bump CTS and CTS Verifier to 7.0_r4
  Fix UserRestrictionsTest.testUserRestrictions_secondaryProfileOwnerOnly
  Generate and include checksum data with CTS report submissions Test: Used exploratory tests and unit tests in ChecksumReporterTest.java to verify the behavior. * All TestResults are added from an InvocationResult * Able to verify TestResult against previously calculated checksum * CRCs are created for all files in a directory including subdirectories * Checksum integrity is maintained while serializing to/from disk * When possible checksum data is compressed before report submission
  Add retry logic for adoptable storage tests
  Catch case where browser is protected by a permission
  Fix failure due to accessibility node not updated after scrolling.
  Fix DO/PO Wifi CTS
  Test: Fix testFindAll result listener not set issue
  Updating CTS Security patch to 2017-01
  DO NOT MERGE ANYWHERE: bump cts for 201701 security public bulletin
  DO NOT MERGE ANYWHERE: bump cts for 201701 security public bulletin
  CTS Test for security vulnerability fix: Effect command might allow negative indexes
  ...

Change-Id: I07b3bb0249eebcae5760d08c98cdde1ac5b01601
2016-11-22 17:13:49 -08:00
Chris Manton
cafa4c9bcc Include Wear device idle settings
am: c6ce1d051e

Change-Id: Ibcc470c1de9cd214ab9f26caad77095f8e3bdc68
2016-11-10 23:18:13 +00:00
Chris Manton
c6ce1d051e 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
(cherry picked from commit a84bb771d1)
2016-11-09 19:06:25 +00:00
Chris Manton
a84bb771d1 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
2016-11-07 13:45:48 -08:00
gitbuildkicker
0cda2916e4 merge in nyc-mr1-release history after reset to nyc-mr1-dev 2016-10-20 00:05:49 -07:00
Paul Stewart
1db013fafc Merge "CtsNetTests: Add a test for b/25624963" am: 9ec7e2127c
am: 26fc3c1dd7

Change-Id: I718a3b9891c4323ce0c8a3858bb0162ac9878aa7
2016-10-19 21:57:34 +00:00
Paul Stewart
26fc3c1dd7 Merge "CtsNetTests: Add a test for b/25624963"
am: 9ec7e2127c

Change-Id: I8d9b6e56051b31e9c410b8b7009398df9b4fcaf1
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
3935f21d25 PacketReflector: Ignore IPv6 flow labels in ICMPv6 test am: 36c0f02d94 am: 5696846426 am: ffe4cefe73 am: c4df82d292 am: 3342023de9 am: d8bd696559 am: 5ee79a1d24 am: 1cdcb253df
am: ad7fdb5e34

Change-Id: Icd55d8c4c6358ed06d0b22158573ccaa2f3108b9
2016-10-19 20:16:31 +00:00
Nicolas Boichat
ad7fdb5e34 PacketReflector: Ignore IPv6 flow labels in ICMPv6 test am: 36c0f02d94 am: 5696846426 am: ffe4cefe73 am: c4df82d292 am: 3342023de9 am: d8bd696559 am: 5ee79a1d24
am: 1cdcb253df

Change-Id: I6d861a4f8f03850c3466030c848beb62945d251b
2016-10-19 19:57:44 +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

Change-Id: I16a1aff1ea228f93e3abd8a50cb453f073d7f85d
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

Change-Id: I0d634d5a57b4a93963e4f93e5572b9bef715af58
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
gitbuildkicker
112760739a merge in nyc-mr1-release history after reset to nyc-mr1-dev 2016-10-18 00:05:47 -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

Change-Id: Ic7b755d02b3d1b85fbbff7d22554128079fc5a37
2016-10-17 21:50:57 +00:00
Nicolas Boichat
4074750e69 PacketReflector: Ignore IPv6 flow labels in ICMPv6 test am: 36c0f02d94 am: 516b0616e9 am: fac99e31ce am: 171491fa35 am: 983fbfccec
am: d9559a2b24

Change-Id: I1363706a3bd646cb07043f5dc906ddc315667a0e
2016-10-17 17:43:13 +00:00
Nicolas Boichat
d9559a2b24 PacketReflector: Ignore IPv6 flow labels in ICMPv6 test am: 36c0f02d94 am: 516b0616e9 am: fac99e31ce am: 171491fa35
am: 983fbfccec

Change-Id: Iac196b898d4c5231dd5229514b2e9bea7186aa19
2016-10-17 17:32:35 +00:00
Nicolas Boichat
983fbfccec PacketReflector: Ignore IPv6 flow labels in ICMPv6 test am: 36c0f02d94 am: 516b0616e9 am: fac99e31ce
am: 171491fa35

Change-Id: I66ef990f1d3e84590409a546f0b5eff307c32bba
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

Change-Id: Ib46e30a62620b942afc54d92b1da62412308095a
2016-10-17 17:10:49 +00:00
Nicolas Boichat
fac99e31ce PacketReflector: Ignore IPv6 flow labels in ICMPv6 test am: 36c0f02d94
am: 516b0616e9

Change-Id: Ib0bdd7ba610c8206356233620c8941695eeaf9a6
2016-10-17 05:23:18 +00:00
Nicolas Boichat
516b0616e9 PacketReflector: Ignore IPv6 flow labels in ICMPv6 test
am: 36c0f02d94

Change-Id: Icc98803ea5d4f52cefb43b40d2dcfbd76de1b464
2016-10-17 05:15:47 +00:00
gitbuildkicker
9209abaacf merge in nyc-mr1-release history after reset to nyc-mr1-dev 2016-10-16 00:05:53 -07: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

Change-Id: I9456cd8e987fcdbbb16a5854b39b985e9de2a513
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

Change-Id: Id0e7fa322adc40ee64545801b27f1c81a2964f39
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

Change-Id: I21f7f431cf0c8e74ba77e62232c4628c6272d8af
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

Change-Id: I97f5aa84b291e02e98fd6392d10c3879eceff19d
2016-10-13 16:12:17 +00:00