Fix Package.isCompatibleWith.

Note that this doesn't help us because to Dalvik, all packages have
version "0.0".

Bug: 2099697

diff --git a/libcore/luni-kernel/src/main/java/java/lang/Package.java b/libcore/luni-kernel/src/main/java/java/lang/Package.java
index 2817404..4d98959 100644 (file)
--- a/libcore/luni-kernel/src/main/java/java/lang/Package.java
+++ b/libcore/luni-kernel/src/main/java/java/lang/Package.java
@@ -268,8 +268,8 @@ public class Package implements AnnotatedElement {
      */
     public boolean isCompatibleWith(String version)
             throws NumberFormatException {
-        String[] requested = version.split("."); 
-        String[] provided = specVersion.split("."); 
+        String[] requested = version.split("\\."); 
+        String[] provided = specVersion.split("\\."); 
         
         for (int i = 0; i < Math.min(requested.length, provided.length); i++) {
             int reqNum = Integer.parseInt(requested[i]);
@@ -318,4 +318,3 @@ public class Package implements AnnotatedElement {
         return "package " + name;
     }
 }
-

diff --git a/libcore/luni/src/test/java/org/apache/harmony/luni/tests/java/lang/PackageTest.java b/libcore/luni/src/test/java/org/apache/harmony/luni/tests/java/lang/PackageTest.java
index cb35324..283c1db 100644 (file)
--- a/libcore/luni/src/test/java/org/apache/harmony/luni/tests/java/lang/PackageTest.java
+++ b/libcore/luni/src/test/java/org/apache/harmony/luni/tests/java/lang/PackageTest.java
@@ -312,7 +312,7 @@ public class PackageTest extends junit.framework.TestCase {
         method = "isCompatibleWith",
         args = {java.lang.String.class}
     )
-    @KnownFailure("isCompatibleWith returns incorrect value.")
+    @KnownFailure("Dalvik packages are always version '0.0'.")
     public void test_isCompatibleWithLjava_lang_String() throws Exception {
         Package p = getTestPackage("hyts_c.jar", "p.C");