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
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
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
78df332ef1
merge in lmp-mr1-cts-release history after reset to lmp-mr1-dev
2015-09-24 07:26:50 -07: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
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
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
Daniel Xie
9c37f4a070
am da12f30f: am b4a9fcb1: am a011f009: Merge "Lookup private resources in run-time" into kitkat-cts-dev automerge: ac8f57e
...
* commit 'da12f30fa5c7cb6e2cde866dcf586079c7f638fe':
2015-09-21 18:25:33 +00:00
Amith Dsouza
51139585f6
am 1dff0185: am 2d22fa9b: am 2e4ce593: Merge "LocalSocketTest.testAccessors: fix the *SendBufferSize* test" into lollipop-cts-dev
...
* commit '1dff01853ff06cc8ad9f198dfbba201dc6ce39db':
2015-09-18 02:19:59 +00:00
Daniel Xie
faa25e50f2
am 662de492: am 62495146: am 1840edcd: Merge "Accept more than one SD in NsdManagerTest" into lollipop-cts-dev
...
* commit '662de4922d9f7436a806e1ee7eaee75b4096aa48':
2015-09-18 02:19:53 +00:00
Unsuk Jung
c06d309115
am b640b49e: am 9feaaaf4: Merge "resolve merge conflicts of a97c792 to kitkat-cts-dev" into kitkat-cts-dev automerge: 7e84d75
...
* commit 'b640b49e4451dacb5ce181df86b7c662ee50e693':
2015-09-16 16:03:18 +00:00
Daniel Xie
da12f30fa5
am b4a9fcb1: am a011f009: Merge "Lookup private resources in run-time" into kitkat-cts-dev automerge: ac8f57e
...
* commit 'b4a9fcb132727d49fdfd96c31f71f731ceea7faa':
2015-09-16 16:02:58 +00:00
Unsuk Jung
b640b49e44
am 9feaaaf4: Merge "resolve merge conflicts of a97c792 to kitkat-cts-dev" into kitkat-cts-dev automerge: 7e84d75
...
* commit '9feaaaf44682c72dc5c771c93ef01ec793b6a7e3':
2015-09-16 15:56:34 +00:00
Daniel Xie
b4a9fcb132
am a011f009: Merge "Lookup private resources in run-time" into kitkat-cts-dev automerge: ac8f57e
...
* commit 'a011f009de12362f1a2b6fc92d2726be646a10f5':
2015-09-16 15:55:18 +00:00
Amith Dsouza
1dff01853f
am 2d22fa9b: am 2e4ce593: Merge "LocalSocketTest.testAccessors: fix the *SendBufferSize* test" into lollipop-cts-dev
...
* commit '2d22fa9b07f2db449162c0de894faee288f6d85b':
LocalSocketTest.testAccessors: fix the *SendBufferSize* test
2015-09-15 21:33:57 +00:00
Daniel Xie
662de4922d
am 62495146: am 1840edcd: Merge "Accept more than one SD in NsdManagerTest" into lollipop-cts-dev
...
* commit '624951463c7fa9e548ab51a0344bbd485cafc80f':
Accept more than one SD in NsdManagerTest
2015-09-15 21:33:53 +00:00
Daniel Xie
a8dfc9acfe
am aa87b6d1: am f4efe327: am e260657a: am 45643db7: am 03786bc4: am 545427fc: Merge "Support WiFi only device at runtime." into kitkat-cts-dev
...
* commit 'aa87b6d1ce1ae0cc0db88b6a5bee8e857c0803af':
2015-09-15 21:31:04 +00:00
Amith Dsouza
2d22fa9b07
am 2e4ce593: Merge "LocalSocketTest.testAccessors: fix the *SendBufferSize* test" into lollipop-cts-dev
...
* commit '2e4ce593e3b6c611783bc660f95e2e783e004cd3':
LocalSocketTest.testAccessors: fix the *SendBufferSize* test
2015-09-15 17:00:13 +00:00
Daniel Xie
624951463c
am 1840edcd: Merge "Accept more than one SD in NsdManagerTest" into lollipop-cts-dev
...
* commit '1840edcd80a4bc62bae117848ef64a5c4bf83ef2':
Accept more than one SD in NsdManagerTest
2015-09-15 17:00:07 +00:00
Takayuki Hoshi
4544716d2d
am 7f9f8b1d: am f8e24166: am 2212f189: Merge "Normalize ipv6.cts.PingTest#testLoopbackPing\'s packet size" into lmp-sprout-dev
...
* commit '7f9f8b1dc549df5210dadd9f0805f257e733a331':
2015-09-15 00:52:55 +00:00
Unsuk Jung
7bc2c81736
am f742ea6d: am bfd0aaba: am b8ad8a1a: am 17607b8a: am 4106602e: am 7e84d75c: Merge "resolve merge conflicts of a97c792 to kitkat-cts-dev" into kitkat-cts-dev
...
* commit 'f742ea6d30fde381f6b93776fe247b232edebd74':
2015-09-15 00:50:55 +00:00
Daniel Xie
91a9bc2ac2
am 67651de7: am 32540663: am 4ed5d94e: am ee05618c: am ca4ee5db: am ac8f57e8: Merge "Lookup private resources in run-time" into kitkat-cts-dev
...
* commit '67651de7590224c2483d0e574217a0939b5c78bd':
2015-09-15 00:50:33 +00:00
Daniel Xie
aa87b6d1ce
am f4efe327: am e260657a: am 45643db7: am 03786bc4: am 545427fc: Merge "Support WiFi only device at runtime." into kitkat-cts-dev
...
* commit 'f4efe32775207f1f47e2ee21686b9a0aed777894':
Support WiFi only device at runtime.
2015-09-12 06:30:42 +00:00
Takayuki Hoshi
7f9f8b1dc5
am f8e24166: am 2212f189: Merge "Normalize ipv6.cts.PingTest#testLoopbackPing\'s packet size" into lmp-sprout-dev
...
* commit 'f8e2416639adea724e0699240cf85d51672db1ee':
2015-09-12 06:26:52 +00:00
Unsuk Jung
f742ea6d30
am bfd0aaba: am b8ad8a1a: am 17607b8a: am 4106602e: am 7e84d75c: Merge "resolve merge conflicts of a97c792 to kitkat-cts-dev" into kitkat-cts-dev
...
* commit 'bfd0aabaa5222173f74915b68a560d098deebc80':
Fix CTS android.net package testTrafficStatsForLocalhost seldom fail issue
2015-09-12 04:08:15 +00:00
Daniel Xie
67651de759
am 32540663: am 4ed5d94e: am ee05618c: am ca4ee5db: am ac8f57e8: Merge "Lookup private resources in run-time" into kitkat-cts-dev
...
* commit '32540663fe6b9982c4542a7371bc5280fdf6ba29':
Lookup private resources in run-time
2015-09-12 04:07:55 +00:00
Daniel Xie
f4efe32775
am e260657a: am 45643db7: am 03786bc4: am 545427fc: Merge "Support WiFi only device at runtime." into kitkat-cts-dev
...
* commit 'e260657a086ed507a80e8809315d22495faa15e4':
Support WiFi only device at runtime.
2015-09-12 00:31:35 +00:00
Daniel Xie
e260657a08
am 45643db7: am 03786bc4: am 545427fc: Merge "Support WiFi only device at runtime." into kitkat-cts-dev
...
* commit '45643db78515be3603ad2a17244d21badfd89a25':
Support WiFi only device at runtime.
2015-09-10 18:25:59 +00:00
Takayuki Hoshi
f8e2416639
am 2212f189: Merge "Normalize ipv6.cts.PingTest#testLoopbackPing\'s packet size" into lmp-sprout-dev
...
* commit '2212f189a42be9b52e37a10e8b94d3d07c51e109':
Normalize ipv6.cts.PingTest#testLoopbackPing's packet size
2015-09-10 04:41:04 +00:00
Unsuk Jung
bfd0aabaa5
am b8ad8a1a: am 17607b8a: am 4106602e: am 7e84d75c: Merge "resolve merge conflicts of a97c792 to kitkat-cts-dev" into kitkat-cts-dev
...
* commit 'b8ad8a1a990597951faaf9e82722e628ff74c0e3':
Fix CTS android.net package testTrafficStatsForLocalhost seldom fail issue
2015-09-10 03:47:23 +00:00
Daniel Xie
32540663fe
am 4ed5d94e: am ee05618c: am ca4ee5db: am ac8f57e8: Merge "Lookup private resources in run-time" into kitkat-cts-dev
...
* commit '4ed5d94e1d5d3d4eb12bf7e2318cb6396315f2c1':
Lookup private resources in run-time
2015-09-10 03:04:49 +00:00
Unsuk Jung
b8ad8a1a99
am 17607b8a: am 4106602e: am 7e84d75c: Merge "resolve merge conflicts of a97c792 to kitkat-cts-dev" into kitkat-cts-dev
...
* commit '17607b8a36287108099db71b9a15f20d64434203':
Fix CTS android.net package testTrafficStatsForLocalhost seldom fail issue
2015-09-09 22:19:06 +00:00
Daniel Xie
4ed5d94e1d
am ee05618c: am ca4ee5db: am ac8f57e8: Merge "Lookup private resources in run-time" into kitkat-cts-dev
...
* commit 'ee05618ceb115b884afca1f88dfd1beca311fb29':
Lookup private resources in run-time
2015-09-09 21:48:24 +00:00
Erik Kline
f19c63e5b1
Add trivial retransmission of QUIC packets
...
Also:
- correct use of strlcpy()
- add some more logging
Bug: 21833352
Bug: 22181260
Change-Id: Id153e17b8d4d32a35d38846599aa51147739e163
2015-08-20 04:45:08 +09:00
Lorenzo Colitti
cfc277c7f1
Update CTS for unsupported legacy ConnectivityManager APIs
...
http://ag/736511 made the deprecated ConnectivityManager routing
APIs {start,stop}UsingNetworkFeature and requestRouteToHost throw
exceptions for apps whose target SDK version is 23 or above. Move
the tests for these APIs to a new APK that targets SDK version 22
and update the current test APK to ensure that they throw an
exception.
Bug: 22977863
Bug: 23003441
Bug: 23003635
Change-Id: Icf58e928fdc0018d977ce8aa315866659d32debb
2015-08-07 10:45:33 +09:00
Daniel Xie
b9453ff934
am 9417d728: am ea9003d9: am 2b44bd54: am 42445696: Merge "Support WiFi only device at runtime." into kitkat-cts-dev automerge: 545427f automerge: f6915b6
...
* commit '9417d7288ddd37b5d2e347a724afb76cf987f70f':
Support WiFi only device at runtime.
2015-08-06 05:11:27 +00:00
Daniel Xie
9417d7288d
am ea9003d9: am 2b44bd54: am 42445696: Merge "Support WiFi only device at runtime." into kitkat-cts-dev automerge: 545427f automerge: f6915b6
...
* commit 'ea9003d9692e1fc1384a02686c3d36f195d9d55e':
Support WiFi only device at runtime.
2015-08-05 18:28:01 +00:00
Jim Guggemos
b50470fcea
Merge "New tests for (un)registerNetworkCallback with PendingIntent." into mnc-dev
2015-07-29 23:27:19 +00:00
Fyodor Kupolov
e57e9bcb96
Fix for ScanResultTest and WifiManagerTest
...
Added ACCESS_COARSE_LOCATION permission - it is now required to receive Wi-Fi
scan results(b/21852542).
Bug: 22790182
Change-Id: Idb72c200b08f7e4e95571504ab42c9e706f5c921
2015-07-29 11:24:34 -07:00
Daniel Xie
ea9003d969
am 2b44bd54: am 42445696: Merge "Support WiFi only device at runtime." into kitkat-cts-dev automerge: 545427f automerge: f6915b6
...
* commit '2b44bd54f88a4374ea631994650d464df4d6fe4e':
Support WiFi only device at runtime.
2015-07-28 18:15:16 +00:00
Jim Guggemos
9030d1aceb
New tests for (un)registerNetworkCallback with PendingIntent.
...
Fixed up flakiness if WiFi was disabled before executing
the test.
Bug: 21833352
Change-Id: Ief7e12c4a7151722ec926ac38ced9f8903cdb607
2015-07-28 00:13:02 -06:00
Erik Kline
e2815d360a
QUIC port 80 support is going away
...
Change-Id: I29a81e67d121b2e7e832e9e0d5e798d70b4c594a
2015-07-27 13:45:15 +09:00
Daniel Xie
424456969a
Merge "Support WiFi only device at runtime." into kitkat-cts-dev automerge: 545427f
...
automerge: f6915b6
* commit 'f6915b6f02ea3ff39bab6bd993072c323f470f27':
Support WiFi only device at runtime.
2015-07-25 04:58:57 +00:00
Daniel Xie
f6915b6f02
Merge "Support WiFi only device at runtime." into kitkat-cts-dev
...
automerge: 545427f
* commit '545427fc9ecf0d1ed3e4d34697e11e09c5775b63':
Support WiFi only device at runtime.
2015-07-24 22:32:23 +00:00
Daniel Xie
545427fc9e
Merge "Support WiFi only device at runtime." into kitkat-cts-dev
2015-07-23 17:41:42 +00:00
Liangcai Li
adbcf22426
Support WiFi only device at runtime.
...
As what is done in ConnectivityService to fix
bug: 8562845. Otherwise some related tests like 'testGetAllNetworkInfo'
would fail with runtime detection on WiFi only device.
Change-Id: I94922729c11826b3711abf42f594dcdd994324b6
Signed-off-by: Liangcai Li <liangcail@nvidia.com >
2015-07-23 15:42:27 +08:00