Marcus Nascimento
4699aa522a
Merge "Merge "Add assertion message to assertions for testExecute_withMobile." into lollipop-mr1-cts-dev am: ce158e65ae -s ours" into marshmallow-cts-dev
...
am: 90419fc992
* commit '90419fc99220c249b29a09805c06f9a1fc25f0d1':
Add assertion message to assertions for testExecute_withMobile.
Change-Id: Ifc327d9165a543b163c954d964c982fdd14ab1af
2016-04-29 11:05:01 +00:00
Android Merger
90419fc992
Merge "Merge "Add assertion message to assertions for testExecute_withMobile." into lollipop-mr1-cts-dev am: ce158e65ae -s ours" into marshmallow-cts-dev
2016-04-29 10:59:36 +00:00
Marcus Nascimento
5d6e8323f6
Merge "Add assertion message to assertions for testExecute_withMobile." into lollipop-mr1-cts-dev
...
am: ce158e65ae -s ours
* commit 'ce158e65aec1b2c9687852872c9fd9ed74585144':
Add assertion message to assertions for testExecute_withMobile.
Change-Id: I12a3b5e90ce51ebbc233d69126eb78e3a85d6ba3
2016-04-29 10:59:28 +00:00
Daniel Xie
ce158e65ae
Merge "Add assertion message to assertions for testExecute_withMobile." into lollipop-mr1-cts-dev
2016-04-28 16:44:37 +00:00
Marcus Nascimento
51eb8c19a0
Add assertion message to assertions for testExecute_withMobile.
...
Some partner test devices without a SIM Card or with no signal, thus
without mobile network data connection.
Added a message to check signal and SIM card and rerun the test.
Also added a verification that the network type is supported in the
event of a Connectivity Action's timeout. Unsuported network type could
be caused by a network stack crash.
Bug: 28207677
Change-Id: Ibca50359df7d5fb8371f4f4037fc81f029f48b30
2016-04-28 16:40:31 +00:00
Owain Davies
275a0e6237
Merge "Merge "Add assertion message if testDns ipv6 lookup reutrns ipv4." into lollipop-mr1-cts-dev am: b996de8" into marshmallow-cts-dev
...
am: 48216c2
* commit '48216c2807c0fd5561a592b2be09dad3cc0a0bd7':
Add assertion message if testDns ipv6 lookup reutrns ipv4.
Change-Id: I361b96fa073ffe1d7719be745e32241322b1eeed
2016-04-23 06:13:45 +00:00
Owain Davies
2bfd0e1192
Merge "Merge "Added assertion message to testDns failures" into lollipop-mr1-cts-dev am: 350b2aa" into marshmallow-cts-dev
...
am: 936375b
* commit '936375b6f25a328a06d5b783f6fde63afb13d681':
Added assertion message to testDns failures
Change-Id: I9a56dfe2d0960898b61f26ccee3607c7558034de
2016-04-23 06:13:44 +00:00
Android Merger
48216c2807
Merge "Merge "Add assertion message if testDns ipv6 lookup reutrns ipv4." into lollipop-mr1-cts-dev am: b996de8" into marshmallow-cts-dev
2016-04-23 06:07:51 +00:00
Android Merger
936375b6f2
Merge "Merge "Added assertion message to testDns failures" into lollipop-mr1-cts-dev am: 350b2aa" into marshmallow-cts-dev
2016-04-23 06:07:42 +00:00
Owain Davies
4455109378
Merge "Add assertion message if testDns ipv6 lookup reutrns ipv4." into lollipop-mr1-cts-dev
...
am: b996de8
* commit 'b996de81cde4d1596dc15346591ed0ccb41608ca':
Add assertion message if testDns ipv6 lookup reutrns ipv4.
Change-Id: I4b791741f7c69f23097ccd9d56d33984a0862b5a
2016-04-23 06:07:33 +00:00
Owain Davies
7db24c68cf
Merge "Added assertion message to testDns failures" into lollipop-mr1-cts-dev
...
am: 350b2aa
* commit '350b2aae5bc303d094a540c12bcb650a8bf5e139':
Added assertion message to testDns failures
Change-Id: I347197b0db859e3875b14701424d2d55d9059d32
2016-04-23 06:07:31 +00:00
Daniel Xie
b996de81cd
Merge "Add assertion message if testDns ipv6 lookup reutrns ipv4." into lollipop-mr1-cts-dev
2016-04-23 06:02:23 +00:00
Owain Davies
c408601c24
Add assertion message if testDns ipv6 lookup reutrns ipv4.
...
Some partner test networks connect by VPN and if the connection
fails during the testing this test will fail as the local internet
provider intercepts the DNS request and returns an ipv4 address.
Added a message to check the network configuration and rerun the test.
Bug: 26560000
Change-Id: I54e4976b2cef549bfe9fd55ff9609ba2e6513239
2016-04-14 16:12:38 +01:00
Owain Davies
8884aac68d
Added assertion message to testDns failures
...
Identify tests that fail testDns because of no network connection.
Bug:26560000
Change-Id: I7683d54d2932ec46c5850bf360c602f6548b179e
2016-04-14 15:54:44 +01:00
Wally Yau
8bdae23147
Merge "Fixed test for lingering traffic data." into marshmallow-cts-dev
...
am: 0f7a74c
* commit '0f7a74c9f99bac16d6c599afc38d5f82cebb0ef3':
Fixed test for lingering traffic data.
2016-03-28 18:04:32 +00:00
Wally Yau
d7f1dbef66
Fixed test for lingering traffic data.
...
Change-Id: I7d68a518e25e17dbbaa57b12e2af4dc57b8df8d3
2016-03-07 16:16:09 -08:00
The Android Automerger
de0ad86920
merge in lmp-mr1-cts-release history after reset to lmp-mr1-dev am: 78df332ef1
...
am: ee23541449
* commit 'ee235414493f963dcbbf7d4f87f725055315d442':
2015-12-10 10:40:16 -08:00
The Android Automerger
ee23541449
merge in lmp-mr1-cts-release history after reset to lmp-mr1-dev
...
am: 78df332ef1
* commit '78df332ef1a6be3cda40b776a6321425fa829ddb': (32 commits)
cts: get video size from CamcorderProfile -- DO NOT MERGE
BUG: 23792027 adding android.hardware.cts.helpers.sensorverification.EventOrderingVerificationTest#testSameTimestamp to knownfailure
cts: get video size from CamcorderProfile -- DO NOT MERGE
cts: get video size from CamcorderProfile -- DO NOT MERGE
BUG: 23954202 fixed minimum memory to be 1099
DO NOT MERGE ANYWHERE: fix breakage
DO NOT MERGE: fix breakage
rename android_security_cts_AudioflingerBinderTest.cpp to android_security_cts_AudioFlingerBinderTest.cpp
Test if libstagefright dies in onInputBufferFilled on currupted file
Should return true if the specified file doesn't exist
DO NOT MERGE - Revert "Revert "Fix AudioTrackTest.testGetTimestamp""
DO NOT MERGE ANYWHERE:revert and resubmit on lmp-dev
DO NOT MERGE ANYWHERE:revert and resubmit to lmp-* branches
Fix build error in ExtractDecodeEditEncodeMuxTest.
Fixed android.uirendering package in CTS-5.0_R3
TV: add multiple tracks tests to CtsVerifier
TV: Add parental control tests to CtsVerifier
TV: add a test for overlay view from TV input to CtsVerifier
Add TV app tests to CtsVerifier
DO NOT MERGE - Add security test for IEffect binder command
...
2015-12-10 10:37:14 -08:00
Daniel Xie
3f0866e144
Merge "Don\'t run Wifi scan timestamp tests when location is turned off." into marshmallow-cts-dev
...
am: 57031aa47e
* commit '57031aa47e16e4d493c03df886c35c5081fcaeed':
Don't run Wifi scan timestamp tests when location is turned off.
2015-11-17 01:12:55 +00:00
Wei Wang
abe587984a
Don't run Wifi scan timestamp tests when location is turned off.
...
Bug:24957400
Change-Id: I891040ffc0808d62a8f5f1bb20fd633b9f7f482c
2015-11-10 14:23:55 -08: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
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
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
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
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
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