Commit Graph

1115 Commits

Author SHA1 Message Date
Paul Duffin
09801ea6e5 Merge "Prepare for removal of legacy-test from default targets" am: 777c5a3ea1 am: 2d7a0786b5 am: 42f777bbb6 -s ours
am: 3a504e398d  -s ours

Change-Id: Ifc6b84aa908ee3475713a46cdb3d0dc9ea85e52b
2017-01-20 14:27:04 +00:00
Paul Duffin
3a504e398d Merge "Prepare for removal of legacy-test from default targets" am: 777c5a3ea1 am: 2d7a0786b5
am: 42f777bbb6  -s ours

Change-Id: I4af92835d0d5dd7b86d38406636caa723a69f277
2017-01-20 14:25:02 +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
Paul Duffin
038b6a4374 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
Change-Id: I0f34fe97154240e8f8eef6816df1c794da60351e
2017-01-20 11:22:59 +00:00
Glen Kuhne
23c37e3517 Merge "CTS: WifiManager.addNetwork with HttpProxy" am: b99788eb24 am: 155a81349f am: 968719035d
am: bf085108dc  -s ours

Change-Id: I62b74e0d2b5d7eedd90016a8d766f3c34153f8a4
2017-01-18 22:08:17 +00:00
Glen Kuhne
bf085108dc Merge "CTS: WifiManager.addNetwork with HttpProxy" am: b99788eb24 am: 155a81349f
am: 968719035d

Change-Id: Id70c0b0c95edf0615400cfe59f089d9411d48d12
2017-01-18 18:51:48 +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
Glen Kuhne
6f819908c3 Merge "CTS: WifiManager.addNetwork with HttpProxy" 2017-01-17 21:38:31 +00:00
Glen Kuhne
55e97317e9 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
2017-01-17 10:53:25 -08:00
Neil Fuller
4b41bfc741 Merge "Add test for LocalSockets created from a FileDescriptor" am: fc8bbf5ceb am: abc0e7765d am: 6a89797685
am: 29ac7bce15

Change-Id: Iacbd3bfff156a3e18b3ce91c7c7ad99d2f891d4d
2017-01-11 15:37:34 +00:00
Neil Fuller
29ac7bce15 Merge "Add test for LocalSockets created from a FileDescriptor" am: fc8bbf5ceb am: abc0e7765d
am: 6a89797685

Change-Id: I5920cae112e2083e1f58408cda6a257ad95fb0bc
2017-01-11 13:53:17 +00: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
94fdf3394c Merge "Add more assertions related to LocalServerSocket.accept()" am: 863ff4a2cb am: a0c574dcc7 am: 0c14426eac
am: ca6100ad5f

Change-Id: I3249af4991f14694ebd0d5ae1f9888d100ff717a
2017-01-04 12:50:42 +00:00
Neil Fuller
ca6100ad5f Merge "Add more assertions related to LocalServerSocket.accept()" am: 863ff4a2cb am: a0c574dcc7
am: 0c14426eac

Change-Id: I828deb004fe018e6bdfb5801b067ee067a2883eb
2017-01-04 12:44:06 +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
0c19cd9924 Merge "merge in nyc-mr1-cts-release history after reset to nyc-mr1-dev am: e58548f27f -s ours am: b7086e2c4f am: c3a819d061 am: eef36c9a9d" into nyc-mr2-dev-plus-aosp
am: 11491e3568

Change-Id: I7df09d37a67866439229317b8a82b8bda557c533
2016-12-17 01:08:48 +00:00
Tina Zhou
4f282008e4 merge in nyc-mr1-cts-release history after reset to nyc-mr1-dev am: e58548f27f -s ours am: b7086e2c4f am: c3a819d061 am: eef36c9a9d
am: 3c7cc1ba8e

Change-Id: Ia6e103d25aa099249fdf8587fa342115c6d35dd1
2016-12-17 01:08:45 +00:00
Tina Zhou
c3771a1606 merge in nyc-mr1-cts-release history after reset to nyc-mr1-dev am: e58548f27f -s ours am: b7086e2c4f am: c3a819d061 am: 87bba74f63
am: 406b12a3a0

Change-Id: I46dac95eaf2bc05d1607ccfa3d89011976d2f507
2016-12-17 01:08:18 +00:00
Android Build Merger (Role)
11491e3568 Merge "merge in nyc-mr1-cts-release history after reset to nyc-mr1-dev am: e58548f27f -s ours am: b7086e2c4f am: c3a819d061 am: eef36c9a9d" into nyc-mr2-dev-plus-aosp 2016-12-17 00:59:38 +00:00
Tina Zhou
3c7cc1ba8e merge in nyc-mr1-cts-release history after reset to nyc-mr1-dev am: e58548f27f -s ours am: b7086e2c4f am: c3a819d061
am: eef36c9a9d

Change-Id: I135358454d389d9247848d230d9843764030c34b
2016-12-17 00:59:17 +00:00
Tina Zhou
406b12a3a0 merge in nyc-mr1-cts-release history after reset to nyc-mr1-dev am: e58548f27f -s ours am: b7086e2c4f am: c3a819d061
am: 87bba74f63

Change-Id: Ib1cd2a6561b68e782e8c39bdf2a31ae0ca69f976
2016-12-17 00:59:17 +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
b5a364bf7d Merge "merge in nyc-mr1-release history after reset to nyc-mr1-dev am: 73eee30ffe am: 7cd9930f4b am: d7f8755fd5 am: 0170919a9b" into nyc-mr2-dev-plus-aosp
am: 0569ab366c

Change-Id: I2eaad6161956a647dc563315d4793e63bb7c4ece
2016-12-16 22:51:40 +00:00
Yu Liu
f140d2b7e4 merge in nyc-mr1-release history after reset to nyc-mr1-dev am: 73eee30ffe am: 7cd9930f4b am: d7f8755fd5 am: 0170919a9b
am: 1087edb3a9

Change-Id: Ie00b8ed07bbf61db608ff637a3edbd74991bfb12
2016-12-16 22:51:37 +00:00
Yu Liu
9b882fd0f9 merge in nyc-mr1-release history after reset to nyc-mr1-dev am: 73eee30ffe am: 7cd9930f4b am: d7f8755fd5 am: e19332fe41
am: 56ba301912

Change-Id: Iacc46601447b62906b7cf6493bba377ee6f411f6
2016-12-16 22:50:53 +00:00
Android Build Merger (Role)
0569ab366c Merge "merge in nyc-mr1-release history after reset to nyc-mr1-dev am: 73eee30ffe am: 7cd9930f4b am: d7f8755fd5 am: 0170919a9b" into nyc-mr2-dev-plus-aosp 2016-12-16 22:43:09 +00:00
Yu Liu
1087edb3a9 merge in nyc-mr1-release history after reset to nyc-mr1-dev am: 73eee30ffe am: 7cd9930f4b am: d7f8755fd5
am: 0170919a9b

Change-Id: Icd4d95fd9c74f18b18920ae5d3200abc6f5c471c
2016-12-16 22:42:52 +00:00
Yu Liu
56ba301912 merge in nyc-mr1-release history after reset to nyc-mr1-dev am: 73eee30ffe am: 7cd9930f4b am: d7f8755fd5
am: e19332fe41

Change-Id: I62c44da71daaf577893b67feb31ecf422ec42531
2016-12-16 22:42:39 +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
Aaron Holden
37698cb72b Move libs/deviceutil to device-side/util
Test: build cts, run unit tests
bug:21762834
Change-Id: Ifd164ced7f040e312e3553f27adf59a648f463ab
2016-12-12 12:27:20 -08:00
gitbuildkicker
e58548f27f merge in nyc-mr1-cts-release history after reset to nyc-mr1-dev 2016-11-30 16:55:24 -08:00
Aaron Holden
bc8e970935 Merge "Nuke CTS Migration Library, extend CompatibilityBuildHelper" 2016-11-28 18:04:03 +00:00
Baligh Uddin
daeb15c49e Merge remote-tracking branch 'goog/cw-f-dev' into fix_merger am: 3c9b149b01 -s ours
am: 79f8094b5f

Change-Id: I181304c04807874cd4021b0b1d919762da3c93a7
2016-11-23 18:32:57 +00:00
Baligh Uddin
79f8094b5f Merge remote-tracking branch 'goog/cw-f-dev' into fix_merger
am: 3c9b149b01  -s ours

Change-Id: Iaa441e8fe27b5ffe66fc8f6488b27a1e68daf7fb
2016-11-23 18:25:22 +00:00
Aaron Holden
2bc9c349db Nuke CTS Migration Library, extend CompatibilityBuildHelper
bug: 21762834
Test: cts-tradefed run cts -m CtsAppSecurityHostTestCases
Change-Id: I72296ca84c76e4af2de0249e4cdb57fed3065e07
2016-11-22 18:44:36 -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
Julien Desprez
f705bf695e Build CTS out of TF source
Test: make cts dist, run unit tests
Bug: 32819381
Change-Id: I202c2a35e3745a372df8bec4903162d933ae04fb
2016-11-11 12:11:33 +00:00
Chris Manton
149206c81c Include Wear device idle settings am: c6ce1d051e am: cafa4c9bcc am: a7b24cd740
am: 0d2a90581d

Change-Id: Idae7429b9fcbc2fc17bdd3bf690a668f69ba098b
2016-11-10 23:38:00 +00:00
Chris Manton
0d2a90581d Include Wear device idle settings am: c6ce1d051e am: cafa4c9bcc
am: a7b24cd740

Change-Id: I5fd8d5cb7743c3ff230e3bd082ed93c5d5ebcdfc
2016-11-10 23:31:37 +00: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