GitLab

Merge "DO NOT MERGE IDN: Fix handling of long domain names. am: bc48f871  -s ours" into lollipop-mr1-cts-dev

am: bc48f871  -s ours

Change-Id: Ia4c30293acb691108eaf5a97ddfd3a849f22d59b

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

The fixes are in external/expat.

(cherry picked from commit e168b494)

Bug: 28698301
Change-Id: Iafe4a3387be20a05c217abd65588871bb7b47160

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

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

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

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

am: 2873b21e

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

am: 6f2da389

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

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)

am: a289f967

* commit 'a289f967':
  Fixes associated with the tzdata 2015a update

am: 0b8078f8

* commit '0b8078f8':
  Fix TimeZoneTest#testPreHistoricOffsets CTS failures.

Merge "Fix the ENGINE_finish/ENGINE_free mixup The tests were calling finish when it meant free. This caused tests to segmentation fault next time the ENGINE was looked up in the dynamic engine list. (from cl/107214) b/23693318" into kitkat-cts-dev am: 70a463cb  -s ours
am: bcd9db70

* commit 'bcd9db70':
  Fix the ENGINE_finish/ENGINE_free mixup The tests were calling finish when it meant free. This caused tests to segmentation fault next time the ENGINE was looked up in the dynamic engine list. (from cl/107214) b/23693318

am: 779c726a

* commit '779c726a':
  Fixes associated with the tzdata 2015a update

am: 1d1abc5b

* commit '1d1abc5b':
  Fix TimeZoneTest#testPreHistoricOffsets CTS failures.

Merge "Fix the ENGINE_finish/ENGINE_free mixup The tests were calling finish when it meant free. This caused tests to segmentation fault next time the ENGINE was looked up in the dynamic engine list. (from cl/107214) b/23693318" into kitkat-cts-dev
am: 70a463cb  -s ours

* commit '70a463cb':
  Fix the ENGINE_finish/ENGINE_free mixup The tests were calling finish when it meant free. This caused tests to segmentation fault next time the ENGINE was looked up in the dynamic engine list. (from cl/107214) b/23693318

Chile has changed the rules for DST. The test duplicates
testApia below it, so it can be removed.

Bug: 19212588
(cherry-picked from commit ebfb8f8b)

Change-Id: Ibe7c0dc510813826dca13993b6600d368e03740a
(cherry picked from commit a8885648)
(cherry picked from commit 60da282d)

This test was more complicated than necessary, and now we have better
historical data for Asia/Saigon it's started to fail. I've removed that
part of the test (because there are now a lot more transitions) and rely
solely on Africa/Bissau. We really only need one transition so we can
test two times: one before the first transition and one after the last
transition.

Bug: 18285300
Change-Id: Ic820e88b319095b89779d271f45f5cb1c90173da
(cherry picked from commit d05995d8)

Merge "Fix the ENGINE_finish/ENGINE_free mixup The tests were calling finish when it meant free. This caused tests to segmentation fault next time the ENGINE was looked up in the dynamic engine list. (from cl/107214) b/23693318" into kitkat-cts-dev

The tests were order-dependent and flawed: test support classes
were used in multiple tests but each relied on it being possible
to detect static initialization of those classes. There was an
incorrect assertion.

This change splits out unique test support classes for those
that need them, adds more assertions and fixes the broken
assertion. Also tidies up some warnings.

Bug: 23031484
Change-Id: Ia3bb32dd1dbd02a74931604cae424d7e9312c76d
(cherry picked from commit 729d4eca)
(cherry picked from commit 5f3b815a)

am 3a8c0d1e: (-s ours) am cd8cc93f: (-s ours) am d59d0d7a: (-s ours) am aad953fa: (-s ours) am 92cec147: (-s ours) am 8a012b3a: (-s ours) Merge "DO NOT MERGE ANYWHERE: reverting 18432707 to kitkat-cts-dev due to missing CVE" into kitkat-cts-dev

* commit '3a8c0d1e':

am 9b98f31f: am 2ab5a489: am 45101b8e: am 9f275caa: am 977acac8: Merge "Skip TimaKeyStore in KeyStoreTest" into kitkat-cts-dev

* commit '9b98f31f':

am 05b8a1b9: am 5181c773: am 4fe837f0: am d5ae4a3c: am 19679b0f: Merge "Add testInterfaceProperties() .  Move Ethernet verification out of testLoopback()." into kitkat-cts-dev

* commit '05b8a1b9':

am 8970261f: am c09272ef: am 4f2c91b1: am bd08c8d8: am 6da6b0e4: Merge "Fix race condition in WeakHashMapTest." into jb-dev automerge: 62538d84  -s ours automerge: 8806a8e8 automerge: 81598a53

* commit '8970261f':

am cd8cc93f: (-s ours) am d59d0d7a: (-s ours) am aad953fa: (-s ours) am 92cec147: (-s ours) am 8a012b3a: (-s ours) Merge "DO NOT MERGE ANYWHERE: reverting 18432707 to kitkat-cts-dev due to missing CVE" into kitkat-cts-dev

* commit 'cd8cc93f':

am 2ab5a489: am 45101b8e: am 9f275caa: am 977acac8: Merge "Skip TimaKeyStore in KeyStoreTest" into kitkat-cts-dev

* commit '2ab5a489':

am 5181c773: am 4fe837f0: am d5ae4a3c: am 19679b0f: Merge "Add testInterfaceProperties() .  Move Ethernet verification out of testLoopback()." into kitkat-cts-dev

* commit '5181c773':

am c09272ef: am 4f2c91b1: am bd08c8d8: am 6da6b0e4: Merge "Fix race condition in WeakHashMapTest." into jb-dev automerge: 62538d84  -s ours automerge: 8806a8e8 automerge: 81598a53

* commit 'c09272ef':

The tests were calling finish when it meant free.
This caused tests to segmentation fault next time the ENGINE was looked up in the dynamic engine list. (from cl/107214)
b/23693318

Change-Id: I14b3bb9e6f7ce851a83792b5523d72510120dbbe
Signed-off-by: Takeshi Katae <takeshi.katae.xm@kyocera.jp>

am d59d0d7a: (-s ours) am aad953fa: (-s ours) am 92cec147: (-s ours) am 8a012b3a: (-s ours) Merge "DO NOT MERGE ANYWHERE: reverting 18432707 to kitkat-cts-dev due to missing CVE" into kitkat-cts-dev

* commit 'd59d0d7a':