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
diff --git a/ojluni/src/main/java/java/text/CollationElementIterator.java b/ojluni/src/main/java/java/text/CollationElementIterator.java
index fede747..17ce8c7 100644
--- a/ojluni/src/main/java/java/text/CollationElementIterator.java
+++ b/ojluni/src/main/java/java/text/CollationElementIterator.java
@@ -107,8 +107,7 @@
* Null order which indicates the end of string is reached by the
* cursor.
*/
- // Android-changed: use ICU CollationElementIterator constant.
- public final static int NULLORDER = android.icu.text.CollationElementIterator.NULLORDER;
+ public final static int NULLORDER = 0xffffffff;
// Android-removed: internal constructors.