diff options
| -rw-r--r-- | mmodules/core_platform_api/api/platform/current-api.txt | 4 | ||||
| -rw-r--r-- | ojluni/annotations/mmodule/java/lang/Byte.annotated.java | 93 | ||||
| -rw-r--r-- | ojluni/src/main/java/java/lang/Byte.java | 22 |
3 files changed, 4 insertions, 115 deletions
diff --git a/mmodules/core_platform_api/api/platform/current-api.txt b/mmodules/core_platform_api/api/platform/current-api.txt index 225a28a386..da717bdd9b 100644 --- a/mmodules/core_platform_api/api/platform/current-api.txt +++ b/mmodules/core_platform_api/api/platform/current-api.txt @@ -800,10 +800,6 @@ package java.io { package java.lang { - public final class Byte extends java.lang.Number implements java.lang.Comparable<java.lang.Byte> { - method public static String toHexString(byte, boolean); - } - public final class Class<T> implements java.lang.reflect.AnnotatedElement java.lang.reflect.GenericDeclaration java.io.Serializable java.lang.reflect.Type { method @dalvik.annotation.optimization.FastNative public java.lang.reflect.Field[] getDeclaredFieldsUnchecked(boolean); method @dalvik.annotation.optimization.FastNative public java.lang.reflect.Method[] getDeclaredMethodsUnchecked(boolean); diff --git a/ojluni/annotations/mmodule/java/lang/Byte.annotated.java b/ojluni/annotations/mmodule/java/lang/Byte.annotated.java deleted file mode 100644 index 2d61598e20..0000000000 --- a/ojluni/annotations/mmodule/java/lang/Byte.annotated.java +++ /dev/null @@ -1,93 +0,0 @@ -/* - * Copyright (c) 1996, 2013, Oracle and/or its affiliates. All rights reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * This code is free software; you can redistribute it and/or modify it - * under the terms of the GNU General Public License version 2 only, as - * published by the Free Software Foundation. Oracle designates this - * particular file as subject to the "Classpath" exception as provided - * by Oracle in the LICENSE file that accompanied this code. - * - * This code is distributed in the hope that it will be useful, but WITHOUT - * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or - * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License - * version 2 for more details (a copy is included in the LICENSE file that - * accompanied this code). - * - * You should have received a copy of the GNU General Public License version - * 2 along with this work; if not, write to the Free Software Foundation, - * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * - * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA - * or visit www.oracle.com if you need additional information or have any - * questions. - */ - - -package java.lang; - - -@SuppressWarnings({"unchecked", "deprecation", "all"}) -public final class Byte extends java.lang.Number implements java.lang.Comparable<java.lang.Byte> { - -public Byte(byte value) { throw new RuntimeException("Stub!"); } - -public Byte(java.lang.String s) throws java.lang.NumberFormatException { throw new RuntimeException("Stub!"); } - -public static java.lang.String toString(byte b) { throw new RuntimeException("Stub!"); } - -public static java.lang.Byte valueOf(byte b) { throw new RuntimeException("Stub!"); } - -public static byte parseByte(java.lang.String s, int radix) throws java.lang.NumberFormatException { throw new RuntimeException("Stub!"); } - -public static byte parseByte(java.lang.String s) throws java.lang.NumberFormatException { throw new RuntimeException("Stub!"); } - -public static java.lang.Byte valueOf(java.lang.String s, int radix) throws java.lang.NumberFormatException { throw new RuntimeException("Stub!"); } - -public static java.lang.Byte valueOf(java.lang.String s) throws java.lang.NumberFormatException { throw new RuntimeException("Stub!"); } - -public static java.lang.Byte decode(java.lang.String nm) throws java.lang.NumberFormatException { throw new RuntimeException("Stub!"); } - -public byte byteValue() { throw new RuntimeException("Stub!"); } - -public short shortValue() { throw new RuntimeException("Stub!"); } - -public int intValue() { throw new RuntimeException("Stub!"); } - -public long longValue() { throw new RuntimeException("Stub!"); } - -public float floatValue() { throw new RuntimeException("Stub!"); } - -public double doubleValue() { throw new RuntimeException("Stub!"); } - -public java.lang.String toString() { throw new RuntimeException("Stub!"); } - -public int hashCode() { throw new RuntimeException("Stub!"); } - -public static int hashCode(byte value) { throw new RuntimeException("Stub!"); } - -public boolean equals(java.lang.Object obj) { throw new RuntimeException("Stub!"); } - -public int compareTo(java.lang.Byte anotherByte) { throw new RuntimeException("Stub!"); } - -public static int compare(byte x, byte y) { throw new RuntimeException("Stub!"); } - -public static int toUnsignedInt(byte x) { throw new RuntimeException("Stub!"); } - -public static long toUnsignedLong(byte x) { throw new RuntimeException("Stub!"); } - -@libcore.api.CorePlatformApi -public static java.lang.String toHexString(byte b, boolean upperCase) { throw new RuntimeException("Stub!"); } - -public static final int BYTES = 1; // 0x1 - -public static final byte MAX_VALUE = 127; // 0x7f - -public static final byte MIN_VALUE = -128; // 0xffffff80 - -public static final int SIZE = 8; // 0x8 - -public static final java.lang.Class<java.lang.Byte> TYPE; -static { TYPE = null; } -} - diff --git a/ojluni/src/main/java/java/lang/Byte.java b/ojluni/src/main/java/java/lang/Byte.java index e53899cdec..deb4ecb403 100644 --- a/ojluni/src/main/java/java/lang/Byte.java +++ b/ojluni/src/main/java/java/lang/Byte.java @@ -25,6 +25,8 @@ package java.lang; +import libcore.util.HexEncoding; + /** * * The {@code Byte} class wraps a value of primitive type {@code byte} @@ -523,24 +525,8 @@ public final class Byte extends Number implements Comparable<Byte> { * @hide */ public static String toHexString(byte b, boolean upperCase) { - char[] digits = upperCase ? UPPER_CASE_DIGITS : DIGITS; - char[] buf = new char[2]; // We always want two digits. - buf[0] = digits[(b >> 4) & 0xf]; - buf[1] = digits[b & 0xf]; - return new String(0, 2, buf); + // This method currently retained because it is marked @UnsupportedAppUsage. + return HexEncoding.encodeToString(b, upperCase); } - private static final char[] DIGITS = { - '0', '1', '2', '3', '4', '5', '6', '7', '8', '9', - 'a', 'b', 'c', 'd', 'e', 'f', 'g', 'h', 'i', 'j', - 'k', 'l', 'm', 'n', 'o', 'p', 'q', 'r', 's', 't', - 'u', 'v', 'w', 'x', 'y', 'z' - }; - - private static final char[] UPPER_CASE_DIGITS = { - '0', '1', '2', '3', '4', '5', '6', '7', '8', '9', - 'A', 'B', 'C', 'D', 'E', 'F', 'G', 'H', 'I', 'J', - 'K', 'L', 'M', 'N', 'O', 'P', 'Q', 'R', 'S', 'T', - 'U', 'V', 'W', 'X', 'Y', 'Z' - }; // END Android-added: toHexString() for internal use. } |