tree b0722bca879a1f33f854c8df6c8c99a13eeb67c1
parent bbd3532c8498ffbba750b4e596bac23f5a499352
author Victor Chang <vichang@google.com> 1625088227 +0100
committer Orion Hodson <oth@google.com> 1625146146 +0100

Revert an unnecessary patch in java.text.CollationElementIterator

The patch is unnecessary because NULLORDER is constant and inlineable.
from the public Android SDK, as shown in api/current.txt,
we can't change the value anyway. So assigning the value from ICU4J
CollationElementIterator seems unnecessary.

The goal here is actually to remove the static initialization block
in legacy.art.module.platform.api.stubs, and thus the stub will be
identical to art.module.public.api.stubs.module_lib

(cherry picked from commit d785f16fd2adcb4f6ad5c6cb782f8b71b2a90136)

Bug: 192446466
Test: Verified that the class file size are identical.
      diff <(unzip -l out/soong/.intermediates/libcore/mmodules/core_platform_api/legacy.art.module.platform.api.stubs/android_common/turbine-combined/legacy.art.module.platform.api.stubs.jar) <( unzip -l out/soong/.intermediates/libcore/art.module.public.api.stubs.module_lib/android_common/turbine-combined/art.module.public.api.stubs.module_lib.jar)
Merged-In: I2902963704ddcb6d8c1583dc5165f2e4da1a9e3c
Change-Id: Ie94e00233b4e99b34a5975f8ff662e21bb4667e6