Android patch: Work-around for ClassNotFoundException.
Android throws ClassNotFoundException when trying to deserialize objects
containing references to classes that don't exist. It has not yet been
determined whether this is working as intended or whether this is a bug,
so in the meantime this local patch for the Android copy of ICU4J makes
the code expect it (as this is how Android actually works today,
intentional or not).
Bug: 19109180
Change-Id: Ibd31b41e89de4286aa0b4fe431c441e84d98b0eb
diff --git a/icu4j/main/tests/core/src/com/ibm/icu/dev/test/serializable/CompatibilityTest.java b/icu4j/main/tests/core/src/com/ibm/icu/dev/test/serializable/CompatibilityTest.java
index caf2e8d..aa82854 100644
--- a/icu4j/main/tests/core/src/com/ibm/icu/dev/test/serializable/CompatibilityTest.java
+++ b/icu4j/main/tests/core/src/com/ibm/icu/dev/test/serializable/CompatibilityTest.java
@@ -117,6 +117,10 @@
}
} catch (MissingResourceException e) {
warnln("Could not load the data. " + e.getMessage());
+ // Android patch: Work-around for ClassNotFoundException.
+ } catch (ClassNotFoundException e) {
+ warnln("Could not load the data. " + e.getMessage());
+ // Android patch end.
} catch (Exception e) {
e.printStackTrace();
errln("Exception: " + e.toString());
