GitLab

am: 3bae679e

Change-Id: Ia28b953640407f29b18aea7d8b3792505910746c

Merge "DO NOT MERGE Assert that DESede/CBC/PKCS5Padding Cipher works as expected" into marshmallow-cts-dev

We were incorrectly using sizeof() to calculate the size of the
output array. Note that this change also changes the output size
to 512 to minimize behavioural differences (especially wrt. ICU
checks on sizes).

bug: 30765246
Change-Id: I5d28ddc45d2d6d2bed3e479ca195ed2779b906ed

We were incorrectly using sizeof() to calculate the size of the
output array. Note that this change also changes the output size
to 512 to minimize behavioural differences (especially wrt. ICU
checks on sizes).

bug: 30765246
Change-Id: I5d28ddc45d2d6d2bed3e479ca195ed2779b906ed

(cherry picked from commit c3f66fe5)

Bug: 31081987
Change-Id: I1a31903e884835b86fccbecfcbd33af683312d0d

test_mkdirs pretends to test creating many directories but it is in fact
testing for a very long file name.

Example directory name it was creating looks like:
/data/data/android.core.tests.runner/cache/harmony-test-FileTest/1/0...
(with lots of 0s).

TEST=cts-tradefed
  run cts -p android.core.tests.libcore.package.harmony_java_io
BUG=27370759

Change-Id: I7ee631de83425bbe91d28c7bd06d7f799ec5dc6d

CipherTest: add test for multiple updateAAD calls

Make sure that multiple updateAAD calls are equivalent to other calls to
updateAAD with the same data.

(cherry picked from commit 67ee3c5c)

Bug: 27371173
Change-Id: Ie69df0906438ad26c566daed3f55b07ba60fe468

CipherTest: test instance reuse with updateAAD

AAD was not being reset on each Cipher init or doFinal call, so add
regression tests to make sure that is now the case.

(cherry picked from commit d90a44bf)

Bug: 27324690
Change-Id: I5f7606efb6dfcd412166eed2bd5f417097a97f1f

Merge "Merge "Merge "DO NOT MERGE: "Pacific/Apia" is now "Apia Standard Time"." into lollipop-cts-dev am: fe20752d  -s ours" into lollipop-mr1-cts-dev am: a76a5016  -s ours" into marshmallow-cts-dev

Merge "Merge "DO NOT MERGE: "Pacific/Apia" is now "Apia Standard Time"." into lollipop-cts-dev am: fe20752d  -s ours" into lollipop-mr1-cts-dev
am: a76a5016  -s ours

* commit 'a76a5016':
  DO NOT MERGE: "Pacific/Apia" is now "Apia Standard Time".

Change-Id: Ic8d4909ac23b5cda9d940a2e346fdcee6f11ad1c

Merge "Merge "DO NOT MERGE: "Pacific/Apia" is now "Apia Standard Time"." into lollipop-cts-dev am: fe20752d  -s ours" into lollipop-mr1-cts-dev

am: fe20752d  -s ours

* commit 'fe20752d':
  DO NOT MERGE: "Pacific/Apia" is now "Apia Standard Time".

Change-Id: I4f13693aa4f7f34fef848ee3e83b445196f05ecb

Merge "Revert "Temporarily disable com.android.cts.cpptools.RunAsHostTest#testRunAs"" into marshmallow-cts-dev

This reverts commit b0153676.

Change-Id: I9777bd90be7b92e4e06c12acc80b40a8612362fb

Merge "Temporarily disable com.android.cts.cpptools.RunAsHostTest#testRunAs" into marshmallow-cts-dev

Change-Id: I66cfea3286bd7123c41c7e69e406a1940a16dd57

.. or "Apia Daylight time" as the case might be.

bug: 18479007
Change-Id: Ie637c33b38f55bea5273d1256264348e51d27f28
(cherry picked from commit 4e5e7de6)

Merge "Fixes and improvements for SerializationTest" into kitkat-cts-dev am: 6f2da389 am: 2873b21e
am: 8e420077

* commit '8e420077':
  Fixes and improvements for SerializationTest

am: 2873b21e

* commit '2873b21e':
  Fixes and improvements for SerializationTest

am: 6f2da389

* commit '6f2da389':
  Fixes and improvements for SerializationTest

The name of the Http2 test changed with commit
a2cab72aa5ff730ba2ae987b45398faafffeb505 but the
expectation was not updated.

Bug: 20055487
Change-Id: Ieceae07d2ae355fdc2357a993263c3ae5118fc1e

Merge "DO NOT MERGE : Work around the snappily-titled ICANN "Name Collision Occurrence Management Framework"." into kitkat-cts-dev am: c87ce529  -s ours am: e557db3a  -s ours
am: 15a3fb32  -s ours

* commit '15a3fb32':
  DO NOT MERGE : Work around the snappily-titled ICANN "Name Collision Occurrence Management Framework".

Merge "DO NOT MERGE : Work around the snappily-titled ICANN "Name Collision Occurrence Management Framework"." into kitkat-cts-dev am: c87ce529  -s ours
am: e557db3a  -s ours

* commit 'e557db3a':
  DO NOT MERGE : Work around the snappily-titled ICANN "Name Collision Occurrence Management Framework".

Merge "DO NOT MERGE : Work around the snappily-titled ICANN "Name Collision Occurrence Management Framework"." into kitkat-cts-dev
am: c87ce529  -s ours

* commit 'c87ce529':
  DO NOT MERGE : Work around the snappily-titled ICANN "Name Collision Occurrence Management Framework".

Merge "DO NOT MERGE : Work around the snappily-titled ICANN "Name Collision Occurrence Management Framework"." into kitkat-cts-dev

DO NOT MERGE : Work around the snappily-titled ICANN "Name Collision Occurrence Management Framework".

Using a non-existent TLD is now a Bad Idea.

(cherry-pick of a7d651e9.)

Bug: 17146413
Change-Id: I6a68b4609d59a6d56ba780d03ffcf24a2759db48
(cherry picked from commit fbc8a609)

Kernels can round the value in use depending on the HZ setting.
This change allows up to 10ms of slop between the SO_TIMEOUT
value set and the one returned.

Bug: 26583607
Change-Id: I527987de20a6e10172656e1f0beeaf63419ffd77

RFC 5746 allows you to either include a signaling cipher suite or a TLS
extension. However, since TLS API has no way to indicate or check that
a certain TLS extension is used, we insert it into the cipher suites
we see to check against the enabled cipher suites.

(cherry picked from commit 81885494)

Bug: 24602368
Change-Id: I06422b9a90f47bb5ffa10ef614233d856773d336

Merge "Fixes associated with the tzdata 2015a update" into kitkat-cts-dev am: 779c726a am: a289f967
am: 9c763fb4  -s ours

* commit '9c763fb4':

Merge "Fix TimeZoneTest#testPreHistoricOffsets CTS failures." into kitkat-cts-dev am: 1d1abc5b am: 0b8078f8
am: 960a6e93

* commit '960a6e93':