commit 12bb70bdbe1535849bf6d0591c8112038e219835
author Aurimas Liutikas <aurimas@google.com> Fri Nov 13 03:10:55 2020 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Fri Nov 13 03:10:55 2020 +0000
tree 64d417b32b5c69bc942353225922f1ddafd71668
parent 8589ac235db25deeef0907e19f0c122725a22949
parent 5a25d87b0d1e76dfcc8a4e168c3685433fb6889a

Merge "Suppress hidden abstract methods of constructable classes" am: 5a25d87b0d

Original change: https://android-review.googlesource.com/c/platform/external/icu/+/1495416

Change-Id: I9ca32b4e4f98ddbabd8181fc6d2ada0e0041c93c

android_icu4j/src/main/java/android/icu/text/Collator.java

diff --git a/android_icu4j/src/main/java/android/icu/text/Collator.java b/android_icu4j/src/main/java/android/icu/text/Collator.java
index d50f8f2..2759abb 100644
--- a/android_icu4j/src/main/java/android/icu/text/Collator.java
+++ b/android_icu4j/src/main/java/android/icu/text/Collator.java
@@ -1249,6 +1249,7 @@
      * @see RawCollationKey
      * @hide unsupported on Android
      */
+    @SuppressWarnings("HiddenAbstractMethod")
     public abstract RawCollationKey getRawCollationKey(String source,
                                                        RawCollationKey key);
 
@@ -1306,6 +1307,7 @@
      * @deprecated ICU 53 Call {@link #setMaxVariable(int)} instead.
      * @hide original deprecated declaration
      */
+    @SuppressWarnings("HiddenAbstractMethod")
     @Deprecated
     public abstract int setVariableTop(String varTop);
 
@@ -1331,6 +1333,7 @@
      * @deprecated ICU 53 Call setMaxVariable() instead.
      * @hide original deprecated declaration
      */
+    @SuppressWarnings("HiddenAbstractMethod")
     @Deprecated
     public abstract void setVariableTop(int varTop);