Merge "Tweak SwitchTargetSdkVersionRule."
diff --git a/NativeCode.bp b/NativeCode.bp
index 25c128b..bdf1507 100644
--- a/NativeCode.bp
+++ b/NativeCode.bp
@@ -97,6 +97,10 @@
apex_available: [
"com.android.art.release",
"com.android.art.debug",
+ // TODO(b/147813447) remove this. This is currently due to the 'runtime_libs'
+ // dependency from libjavacrypto in the conscrypt APEX.
+ "com.android.conscrypt",
+ "test_com.android.conscrypt",
],
defaults: [
"core_native_default_flags",
diff --git a/dalvik/src/main/java/dalvik/system/BaseDexClassLoader.java b/dalvik/src/main/java/dalvik/system/BaseDexClassLoader.java
index 1993fd5..f5136a4 100644
--- a/dalvik/src/main/java/dalvik/system/BaseDexClassLoader.java
+++ b/dalvik/src/main/java/dalvik/system/BaseDexClassLoader.java
@@ -330,14 +330,7 @@
}
@Override public String toString() {
- String sharedLibs = "";
- if (sharedLibraryLoaders != null) {
- for (Object obj : sharedLibraryLoaders) {
- sharedLibs += obj + ",";
- }
- }
- return getClass().getName() + "[" + pathList + "; parent=(" + getParent()
- + "), shared-libs=(" + sharedLibs + ")]";
+ return getClass().getName() + "[" + pathList + "]";
}
/**
diff --git a/harmony-tests/src/test/java/org/apache/harmony/tests/java/lang/CharacterTest.java b/harmony-tests/src/test/java/org/apache/harmony/tests/java/lang/CharacterTest.java
index a5007f0..2465071 100644
--- a/harmony-tests/src/test/java/org/apache/harmony/tests/java/lang/CharacterTest.java
+++ b/harmony-tests/src/test/java/org/apache/harmony/tests/java/lang/CharacterTest.java
@@ -747,8 +747,13 @@
assertTrue(Character.getType((int) '$') == Character.CURRENCY_SYMBOL);
assertTrue(Character.getType((int) '\u2029') == Character.PARAGRAPH_SEPARATOR);
+ // Unicode 13 defines a new range 0x30000–0x3134A
+ assertTrue(Character.getType(0x30000) == Character.DIRECTIONALITY_EUROPEAN_NUMBER_TERMINATOR);
+ assertTrue(Character.getType(0x3134A) == Character.DIRECTIONALITY_EUROPEAN_NUMBER_TERMINATOR);
+ assertTrue(Character.getType(0x2FFFF) == Character.UNASSIGNED);
+ assertTrue(Character.getType(0x3134B) == Character.UNASSIGNED);
+
assertTrue(Character.getType(0x9FFF) == Character.UNASSIGNED);
- assertTrue(Character.getType(0x30000) == Character.UNASSIGNED);
assertTrue(Character.getType(0x110000) == Character.UNASSIGNED);
assertTrue(Character.getType(0x0041) == Character.UPPERCASE_LETTER);
@@ -860,9 +865,14 @@
assertTrue(Character.isDefined((int) '\u6039'));
assertTrue(Character.isDefined(0x10300));
- assertFalse(Character.isDefined(0x30000));
assertFalse(Character.isDefined(0x3FFFF));
assertFalse(Character.isDefined(0x110000));
+
+ // Unicode 13 adds a new range 0x30000–0x3134A
+ assertTrue(Character.isDefined(0x30000));
+ assertTrue(Character.isDefined(0x3134A));
+ assertFalse(Character.isDefined(0x2FFFF));
+ assertFalse(Character.isDefined(0x3134B));
}
/**
@@ -1557,10 +1567,15 @@
*/
public void test_isDirectionaliy_I() {
assertEquals(Character.DIRECTIONALITY_UNDEFINED, Character.getDirectionality(0xFFFE));
- assertEquals(Character.DIRECTIONALITY_UNDEFINED, Character.getDirectionality(0x30000));
assertEquals(Character.DIRECTIONALITY_UNDEFINED, Character.getDirectionality(0x110000));
assertEquals(Character.DIRECTIONALITY_UNDEFINED, Character.getDirectionality(-1));
+ // Unicode 13 adds a new range 0x30000–0x3134A
+ assertEquals(Character.DIRECTIONALITY_LEFT_TO_RIGHT, Character.getDirectionality(0x30000));
+ assertEquals(Character.DIRECTIONALITY_LEFT_TO_RIGHT, Character.getDirectionality(0x3134A));
+ assertEquals(Character.DIRECTIONALITY_UNDEFINED, Character.getDirectionality(0x2FFFF));
+ assertEquals(Character.DIRECTIONALITY_UNDEFINED, Character.getDirectionality(0x3134B));
+
assertEquals(Character.DIRECTIONALITY_LEFT_TO_RIGHT, Character.getDirectionality(0x0041));
assertEquals(Character.DIRECTIONALITY_LEFT_TO_RIGHT, Character.getDirectionality(0x10000));
assertEquals(Character.DIRECTIONALITY_LEFT_TO_RIGHT, Character.getDirectionality(0x104A9));
diff --git a/ojluni/src/main/java/java/net/NetworkInterface.java b/ojluni/src/main/java/java/net/NetworkInterface.java
index e5b5632..eab09ab 100644
--- a/ojluni/src/main/java/java/net/NetworkInterface.java
+++ b/ojluni/src/main/java/java/net/NetworkInterface.java
@@ -63,7 +63,7 @@
public final class NetworkInterface {
// BEGIN Android-added: Return anonymized device address to non-system processes.
/**
- * Gates whether calls to {@link getHardwareAddress()} made by non-system processes
+ * Gates whether calls to {@link #getHardwareAddress()} made by non-system processes
* to return the actual MAC address (pre-change behavior) or an anonymized MAC address
* (post-change behavior). Future versions of Android will enforce the post-change
* behavior through SELinux.