Merge "Revert^3 "Remove hidden System.arraycopy(byte[]...."" am: 48874272ee
am: b425901a8c
Change-Id: I768aaad3f0c053be9654de4d4611ca4c9f403515
diff --git a/ojluni/src/main/java/java/lang/System.java b/ojluni/src/main/java/java/lang/System.java
index d698446..8235bf7 100644
--- a/ojluni/src/main/java/java/lang/System.java
+++ b/ojluni/src/main/java/java/lang/System.java
@@ -509,9 +509,13 @@
* The byte[] specialized version of arraycopy().
* Note: This method is required for runtime ART compiler optimizations.
* Do not remove or change the signature.
+ * Note: Unlike the others, this variant is public due to a dependency we
+ * are working on removing. b/74103559
+ *
+ * @hide
*/
@SuppressWarnings("unused")
- private static void arraycopy(byte[] src, int srcPos, byte[] dst, int dstPos, int length) {
+ public static void arraycopy(byte[] src, int srcPos, byte[] dst, int dstPos, int length) {
if (src == null) {
throw new NullPointerException("src == null");
}