Bill Yi
329783175a
Merge remote-tracking branch \'goog/mnc-cts-release\' into HEAD am: 79a816d6c0 am: 83590ee982 am: 560faf0787 am: d89ddd6e5e am: db3b729304
...
am: dba2d69ba1
2015-10-21 18:21:22 +00:00
Bill Yi
dba2d69ba1
Merge remote-tracking branch \'goog/mnc-cts-release\' into HEAD am: 79a816d6c0 am: 83590ee982 am: 560faf0787 am: d89ddd6e5e
...
am: db3b729304
* commit 'db3b7293044663f7fe316c708467b3110197e1c4':
Squashed mnc-dev changes:
2015-10-21 17:31:23 +00:00
Bill Yi
83590ee982
Merge remote-tracking branch \'goog/mnc-cts-release\' into HEAD
...
am: 79a816d6c0
* commit '79a816d6c08e18870e52c67f6ddbd7b89d3c973a':
Squashed mnc-dev changes:
2015-10-21 16:46:31 +00:00
Daniel Xie
935fba1ab2
Squashed mnc-dev changes:
...
This contains all of the changes from b54aa51 to
791e51a on mnc-dev, except the changes
to tests/tests/security.
Bug: 24846656
Change-Id: I01f53a1a238ac49f86928e0e22796dc73e0e34af
2015-10-19 16:01:03 -07:00
Aaron Holden
58bb58ab7b
Move WiFi Precondition from device to host side
...
This enables the option to synchronously connect to a Wifi network if
not already connected.
bug:23939594
Change-Id: I2c808fc95acba324ee72564d08983a2b6e00db95
2015-10-09 12:33:25 -07:00
Stuart Scott
48d6d1ed5f
Remove common-config and switch to AndroidJUnitTest.
...
bug:21762834
Change-Id: I17e1b44e4429a3fbeb9f110a74038e4ec306af38
2015-10-06 10:55:25 -07:00
Aaron Holden
2a651e0f79
Merge "Cleanup of CTS Preconditions work"
2015-10-06 17:22:00 +00:00
Aaron Holden
c75c7e30f6
Cleanup of CTS Preconditions work
...
- removed unused constant from ScreenLockHelper class
- used getProperty method of ITestDevice, instead of executeShellCommand
- modified BuildCheckTest to reflect use of 'getProperty' method above
- placed target preparer for Wifi check above apk installer, so apk
isn't installed until precondition check has passed
- removed unused imports in net module's PreconditionsTest
- added Wifi precondition check to content, text, webkit & widget modules
bug:23939594
Change-Id: I125b9937b974d142c0d2343f584516bfc713787a
2015-10-06 09:50:57 -07:00
The Android Automerger
c4d6c8144b
am 880855fe: am 63268d7b: am cffa6c60: am a5d534f2: am 405ea20f: am 8f97b6c6: am 8a8372c7: am 3dfca9d8: am 78df332e: (-s ours) merge in lmp-mr1-cts-release history after reset to lmp-mr1-dev
...
* commit '880855fee232808e1bbe6f473ebc2d1de18c8c79':
2015-10-06 01:24:04 +00:00
The Android Automerger
880855fee2
am 63268d7b: am cffa6c60: am a5d534f2: am 405ea20f: am 8f97b6c6: am 8a8372c7: am 3dfca9d8: am 78df332e: (-s ours) merge in lmp-mr1-cts-release history after reset to lmp-mr1-dev
...
* commit '63268d7bb5705ecdfeff8aa09285259a9037e2f4':
2015-10-06 01:16:05 +00:00
The Android Automerger
405ea20fb8
am 8f97b6c6: am 8a8372c7: am 3dfca9d8: am 78df332e: (-s ours) merge in lmp-mr1-cts-release history after reset to lmp-mr1-dev
...
* commit '8f97b6c65c11b8757d3d77ab861317e2b077504d':
2015-10-06 00:23:20 +00:00
The Android Automerger
8f97b6c65c
am 8a8372c7: am 3dfca9d8: am 78df332e: (-s ours) merge in lmp-mr1-cts-release history after reset to lmp-mr1-dev
...
* commit '8a8372c7c93b84078db52093043f6962ac7ccd64':
2015-10-06 00:17:55 +00:00
The Android Automerger
8a8372c7c9
am 3dfca9d8: am 78df332e: (-s ours) merge in lmp-mr1-cts-release history after reset to lmp-mr1-dev
...
* commit '3dfca9d879b75e7be77dc7f19e79200f787dc975':
2015-10-06 00:11:15 +00:00
The Android Automerger
3dfca9d879
am 78df332e: (-s ours) merge in lmp-mr1-cts-release history after reset to lmp-mr1-dev
...
* commit '78df332ef1a6be3cda40b776a6321425fa829ddb':
2015-10-06 00:01:46 +00:00
Stuart Scott
f9a13a9b49
Migrate Admin to CTSv2.
...
bug:21762834
Change-Id: Ibec9df07e2f635218bdae70ddf36fda6e60de0e0
2015-10-05 13:36:17 -07:00
Aaron Holden
d62c5997f6
Add WiFi precondition check to 'net' CTS module
...
bug:23939594
Change-Id: I9e625e635fc6942c9eaa95915888f0fe7284a9ea
2015-09-28 13:17:30 -07:00
Paul Jensen
69ab5795b1
am c9ab5af9: am 8fafeb28: am df4f2629: am a1b4d2de: am 22e42b48: resolved conflicts for 3e4042eb to mnc-dev
...
* commit 'c9ab5af9f2a811e2b6459b077092c29ca13b6f6d':
CTS: verify ConnectivityManager.requestNetwork throws for restricted networks
2015-09-25 18:16:04 +00:00
Paul Jensen
c9ab5af9f2
am 8fafeb28: am df4f2629: am a1b4d2de: am 22e42b48: resolved conflicts for 3e4042eb to mnc-dev
...
* commit '8fafeb28797eb5ff96ebde62b1e7178ab56f29fe':
CTS: verify ConnectivityManager.requestNetwork throws for restricted networks
2015-09-25 18:09:20 +00:00
Paul Jensen
22e42b48f5
resolved conflicts for 3e4042eb to mnc-dev
...
Change-Id: I3476d55641288b21a1609a8e72f37012d86bad03
2015-09-25 07:28:26 -04:00
Paul Jensen
3e4042eb78
am 063f9718: am 358b4b14: am 8c04baef: am e287a5c6: Merge "CTS: verify ConnectivityManager.requestNetwork throws for restricted networks" into lmp-dev
...
* commit '063f971859d0ef5ac96b69de345cd94fd4788b7e':
CTS: verify ConnectivityManager.requestNetwork throws for restricted networks
2015-09-25 11:09:06 +00:00
Paul Jensen
063f971859
am 358b4b14: am 8c04baef: am e287a5c6: Merge "CTS: verify ConnectivityManager.requestNetwork throws for restricted networks" into lmp-dev
...
* commit '358b4b140f9811667471596293fc1f5cfa2d536c':
CTS: verify ConnectivityManager.requestNetwork throws for restricted networks
2015-09-25 11:02:47 +00:00
Paul Jensen
358b4b140f
am 8c04baef: am e287a5c6: Merge "CTS: verify ConnectivityManager.requestNetwork throws for restricted networks" into lmp-dev
...
* commit '8c04baef4cb8066712c6b1af345781b41a17aa8a':
CTS: verify ConnectivityManager.requestNetwork throws for restricted networks
2015-09-25 10:57:05 +00:00
Paul Jensen
8c04baef4c
am e287a5c6: Merge "CTS: verify ConnectivityManager.requestNetwork throws for restricted networks" into lmp-dev
...
* commit 'e287a5c6d87bfc86ca83fc886cd00b8b8e221022':
CTS: verify ConnectivityManager.requestNetwork throws for restricted networks
2015-09-25 10:51:01 +00:00
Paul Jensen
e287a5c6d8
Merge "CTS: verify ConnectivityManager.requestNetwork throws for restricted networks" into lmp-dev
2015-09-25 10:45:39 +00:00
The Android Automerger
78df332ef1
merge in lmp-mr1-cts-release history after reset to lmp-mr1-dev
2015-09-24 07:26:50 -07:00
Daniel Xie
ca8100a285
am 845b9dd8: am 1688da2a: am f7c56078: am 54fa0bd3: am 981e1071: am 4755b246: am 30ee954e: am f056ab50: am f5c48b8e: am 760b6d86: am f6915b6f: Merge "Support WiFi only device at runtime." into kitkat-cts-dev automerge: 545427f
...
* commit '845b9dd8b54ead28f15032639acb834bdbc8baa5':
2015-09-22 21:16:15 +00:00
JP Abgrall
97e39a4abc
am 3bff461f: am 3e6904bf: am e4597e95: am d00cf61d: am 2b43f491: am c8a7ea26: am 9cc068f7: am 7e32f6e8: am 4c38e93e: am 740064e9: am ab0f0fe8: Merge "Fix CTS build" into lollipop-cts-dev
...
* commit '3bff461f6fc3efef24b747059f2cc84f85c8ba39':
2015-09-22 21:14:11 +00:00
Daniel Xie
845b9dd8b5
am 1688da2a: am f7c56078: am 54fa0bd3: am 981e1071: am 4755b246: am 30ee954e: am f056ab50: am f5c48b8e: am 760b6d86: am f6915b6f: Merge "Support WiFi only device at runtime." into kitkat-cts-dev automerge: 545427f
...
* commit '1688da2a913dbb90ecfee379c4f67942c7fa1c12':
2015-09-22 21:05:07 +00:00
JP Abgrall
3bff461f6f
am 3e6904bf: am e4597e95: am d00cf61d: am 2b43f491: am c8a7ea26: am 9cc068f7: am 7e32f6e8: am 4c38e93e: am 740064e9: am ab0f0fe8: Merge "Fix CTS build" into lollipop-cts-dev
...
* commit '3e6904bf6fc4738eb167601f083243fcd857ff96':
2015-09-22 21:03:20 +00:00
Daniel Xie
981e10712e
am 4755b246: am 30ee954e: am f056ab50: am f5c48b8e: am 760b6d86: am f6915b6f: Merge "Support WiFi only device at runtime." into kitkat-cts-dev automerge: 545427f
...
* commit '4755b246fe6ff0668a894dee2c060d757f473299':
2015-09-22 20:22:15 +00:00
JP Abgrall
2b43f49116
am c8a7ea26: am 9cc068f7: am 7e32f6e8: am 4c38e93e: am 740064e9: am ab0f0fe8: Merge "Fix CTS build" into lollipop-cts-dev
...
* commit 'c8a7ea262a8cff7d555df7a02db3143c426a331f':
2015-09-22 20:20:59 +00:00
Daniel Xie
4755b246fe
am 30ee954e: am f056ab50: am f5c48b8e: am 760b6d86: am f6915b6f: Merge "Support WiFi only device at runtime." into kitkat-cts-dev automerge: 545427f
...
* commit '30ee954ec2aa1293c9a465dabe234624f1140a5e':
2015-09-22 20:10:19 +00:00
JP Abgrall
c8a7ea262a
am 9cc068f7: am 7e32f6e8: am 4c38e93e: am 740064e9: am ab0f0fe8: Merge "Fix CTS build" into lollipop-cts-dev
...
* commit '9cc068f7e50dd6b39e80d5d69d7af895843f3afe':
2015-09-22 20:09:16 +00:00
Daniel Xie
30ee954ec2
am f056ab50: am f5c48b8e: am 760b6d86: am f6915b6f: Merge "Support WiFi only device at runtime." into kitkat-cts-dev automerge: 545427f
...
* commit 'f056ab504b47e56616689df10e8d89277f09e447':
2015-09-22 20:01:21 +00:00
JP Abgrall
9cc068f7e5
am 7e32f6e8: am 4c38e93e: am 740064e9: am ab0f0fe8: Merge "Fix CTS build" into lollipop-cts-dev
...
* commit '7e32f6e8c071cea40b4cae9a11d591c052602abe':
2015-09-22 19:59:11 +00:00
Daniel Xie
f056ab504b
am f5c48b8e: am 760b6d86: am f6915b6f: Merge "Support WiFi only device at runtime." into kitkat-cts-dev automerge: 545427f
...
* commit 'f5c48b8e6f92717d82b2478bcaf685c67953ad98':
2015-09-22 16:48:46 +00:00
JP Abgrall
7e32f6e8c0
am 4c38e93e: am 740064e9: am ab0f0fe8: Merge "Fix CTS build" into lollipop-cts-dev
...
* commit '4c38e93e2067c8a0219865c0d5a10f5a66809d8c':
2015-09-22 16:47:02 +00:00
Paul Jensen
45984684aa
CTS: verify ConnectivityManager.requestNetwork throws for restricted networks
...
Bug:21900139
Change-Id: Ib026bc4e66437f015729bdf7c923145ffa41fbde
2015-09-22 08:07:46 -04:00
Daniel Xie
f5c48b8e6f
am 760b6d86: am f6915b6f: Merge "Support WiFi only device at runtime." into kitkat-cts-dev automerge: 545427f
...
* commit '760b6d86ca79029a2a97ca81c97caee035e72cb1':
2015-09-22 03:52:55 +00:00
JP Abgrall
4c38e93e20
am 740064e9: am ab0f0fe8: Merge "Fix CTS build" into lollipop-cts-dev
...
* commit '740064e97f0e653427a7eb5f99052d9e5a8e27f3':
Fix CTS build
2015-09-22 03:51:49 +00:00
Daniel Xie
760b6d86ca
am f6915b6f: Merge "Support WiFi only device at runtime." into kitkat-cts-dev automerge: 545427f
...
* commit 'f6915b6f02ea3ff39bab6bd993072c323f470f27':
2015-09-22 03:46:53 +00:00
JP Abgrall
740064e97f
am ab0f0fe8: Merge "Fix CTS build" into lollipop-cts-dev
...
* commit 'ab0f0fe884c280adcde0259f4692cebfb3d0bf08':
Fix CTS build
2015-09-22 03:45:28 +00:00
Unsuk Jung
7e51c977f5
am f7556dfc: am 431e350e: am 7036d2e6: am a6429cf4: am 285f632c: am 55eece28: am 68e1d359: am 3bbdccc7: am c06d3091: am b640b49e: am 9feaaaf4: Merge "resolve merge conflicts of a97c792 to kitkat-cts-dev" into kitkat-cts-dev automerge: 7e84d75
...
* commit 'f7556dfc7af3e6b9cff64aba0d23e4205d576f2c':
2015-09-21 22:15:47 +00:00
Unsuk Jung
f7556dfc7a
am 431e350e: am 7036d2e6: am a6429cf4: am 285f632c: am 55eece28: am 68e1d359: am 3bbdccc7: am c06d3091: am b640b49e: am 9feaaaf4: Merge "resolve merge conflicts of a97c792 to kitkat-cts-dev" into kitkat-cts-dev automerge: 7e84d75
...
* commit '431e350e62ca293447ea5f52d38588bb47bbbde1':
2015-09-21 22:06:51 +00:00
Unsuk Jung
285f632cba
am 55eece28: am 68e1d359: am 3bbdccc7: am c06d3091: am b640b49e: am 9feaaaf4: Merge "resolve merge conflicts of a97c792 to kitkat-cts-dev" into kitkat-cts-dev automerge: 7e84d75
...
* commit '55eece280d28a87034eaf2d6b4b9d15cbf9f82e9':
2015-09-21 21:30:43 +00:00
Unsuk Jung
55eece280d
am 68e1d359: am 3bbdccc7: am c06d3091: am b640b49e: am 9feaaaf4: Merge "resolve merge conflicts of a97c792 to kitkat-cts-dev" into kitkat-cts-dev automerge: 7e84d75
...
* commit '68e1d359bd55785354656339db30dfd2d75ab7ce':
2015-09-21 21:06:28 +00:00
Daniel Xie
57660eb7fe
am e394de9e: am 5874b094: am dab4ebdc: am e2e0a71e: am f7142c13: am 5a1c9904: am 2a1514dc: am 9c37f4a0: am da12f30f: am b4a9fcb1: am a011f009: Merge "Lookup private resources in run-time" into kitkat-cts-dev automerge: ac8f57e
...
* commit 'e394de9e345647ef306a9b7b410d7f8e8de6497c':
2015-09-21 19:38:09 +00:00
Daniel Xie
e394de9e34
am 5874b094: am dab4ebdc: am e2e0a71e: am f7142c13: am 5a1c9904: am 2a1514dc: am 9c37f4a0: am da12f30f: am b4a9fcb1: am a011f009: Merge "Lookup private resources in run-time" into kitkat-cts-dev automerge: ac8f57e
...
* commit '5874b094dca800330c52dbf7dbc91dbd4e8eeb4e':
2015-09-21 19:27:48 +00:00
Unsuk Jung
68e1d359bd
am 3bbdccc7: am c06d3091: am b640b49e: am 9feaaaf4: Merge "resolve merge conflicts of a97c792 to kitkat-cts-dev" into kitkat-cts-dev automerge: 7e84d75
...
* commit '3bbdccc7743a3a7343ad3cc68d37508cab185d0d':
2015-09-21 19:05:53 +00:00
Unsuk Jung
3bbdccc774
am c06d3091: am b640b49e: am 9feaaaf4: Merge "resolve merge conflicts of a97c792 to kitkat-cts-dev" into kitkat-cts-dev automerge: 7e84d75
...
* commit 'c06d309115b6af2d4f9bd232acea2d285822290a':
2015-09-21 18:57:28 +00:00
