diff options
| author | Victor Chang <vichang@google.com> | 2021-11-22 16:29:47 +0000 |
|---|---|---|
| committer | Victor Chang <vichang@google.com> | 2024-03-19 17:17:07 +0000 |
| commit | 49c6b8f9a377788e4ada614ac1501afb6508fbdb (patch) | |
| tree | c56f2dde7099bf8b7d4bc9224f201e2d520bbe1c /icu4j | |
| parent | 1de5552a871108114b540d8c1185331021c3bac3 (diff) | |
| download | icu-49c6b8f9a377788e4ada614ac1501afb6508fbdb.tar.gz | |
Android patch: Keep UnicodeSetIterator non-final
Upstream commit: https://github.com/unicode-org/icu/commit/ae3f2ae7ca12ca316827b6973f7360bf3044f1e2
ICU 70 made UnicodeSetIterator final. However, it breaks the ABI
stability on Android. Thus, we revert the change on Android.
Bug: 202948901
Test: m droid
Change-Id: I249361445d4d9fb079ef18cb183e4ed1191615c5
Diffstat (limited to 'icu4j')
| -rw-r--r-- | icu4j/main/core/src/main/java/com/ibm/icu/text/UnicodeSetIterator.java | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/icu4j/main/core/src/main/java/com/ibm/icu/text/UnicodeSetIterator.java b/icu4j/main/core/src/main/java/com/ibm/icu/text/UnicodeSetIterator.java index 7fc7a1bab..6fbd43c41 100644 --- a/icu4j/main/core/src/main/java/com/ibm/icu/text/UnicodeSetIterator.java +++ b/icu4j/main/core/src/main/java/com/ibm/icu/text/UnicodeSetIterator.java @@ -10,6 +10,7 @@ package com.ibm.icu.text; import java.util.Iterator; +// Android patch: Make UnicodeSetIterator non-final. /** * UnicodeSetIterator iterates over the contents of a UnicodeSet. It * iterates over either code points or code point ranges. After all @@ -47,15 +48,16 @@ import java.util.Iterator; * @see UnicodeSet#strings() * @see UnicodeSet#iterator() */ -public final class UnicodeSetIterator { +public class UnicodeSetIterator { + // Android patch: Make UnicodeSetIterator.IS_STRING non-final. /** * Value of <tt>codepoint</tt> if the iterator points to a string. * If <tt>codepoint == IS_STRING</tt>, then examine * <tt>string</tt> for the current iteration result. * @stable ICU 2.0 */ - public static final int IS_STRING = -1; + public static int IS_STRING = -1; /** * Current code point, or the special value <tt>IS_STRING</tt>, if |