- * The high-level design of the wire protocol is to directly serialize the event - * stream, while efficiently and compactly writing strongly-typed primitives - * delivered through the {@link TypedXmlSerializer} interface. - *
- * Each serialized event is a single byte where the lower half is a normal - * {@link XmlPullParser} token and the upper half is an optional data type - * signal, such as {@link #TYPE_INT}. - *
- * This parser has some specific limitations: - *
- * External tokens, such as {@link #START_TAG}, are expected by typical - * {@link XmlPullParser} clients. In contrast, internal tokens, such as - * {@link #ATTRIBUTE}, are not expected by typical clients. - *
- * This method consumes any internal events until it reaches the next - * external event. - */ - private int peekNextExternalToken() throws IOException, XmlPullParserException { - while (true) { - final int token = peekNextToken(); - switch (token) { - case ATTRIBUTE: - consumeToken(); - continue; - default: - return token; - } - } - } - - /** - * Peek at the next token in the underlying stream without consuming it. - */ - private int peekNextToken() throws IOException { - return mIn.peekByte() & 0x0f; - } - - /** - * Parse and consume the next token in the underlying stream. - */ - private void consumeToken() throws IOException, XmlPullParserException { - final int event = mIn.readByte(); - final int token = event & 0x0f; - final int type = event & 0xf0; - switch (token) { - case ATTRIBUTE: { - final Attribute attr = obtainAttribute(); - attr.name = mIn.readInternedUTF(); - attr.type = type; - switch (type) { - case TYPE_NULL: - case TYPE_BOOLEAN_TRUE: - case TYPE_BOOLEAN_FALSE: - // Nothing extra to fill in - break; - case TYPE_STRING: - attr.valueString = mIn.readUTF(); - break; - case TYPE_STRING_INTERNED: - attr.valueString = mIn.readInternedUTF(); - break; - case TYPE_BYTES_HEX: - case TYPE_BYTES_BASE64: - final int len = mIn.readUnsignedShort(); - final byte[] res = new byte[len]; - mIn.readFully(res); - attr.valueBytes = res; - break; - case TYPE_INT: - case TYPE_INT_HEX: - attr.valueInt = mIn.readInt(); - break; - case TYPE_LONG: - case TYPE_LONG_HEX: - attr.valueLong = mIn.readLong(); - break; - case TYPE_FLOAT: - attr.valueFloat = mIn.readFloat(); - break; - case TYPE_DOUBLE: - attr.valueDouble = mIn.readDouble(); - break; - default: - throw new IOException("Unexpected data type " + type); - } - break; - } - case XmlPullParser.START_DOCUMENT: { - mCurrentName = null; - mCurrentText = null; - if (mAttributeCount > 0) resetAttributes(); - break; - } - case XmlPullParser.END_DOCUMENT: { - mCurrentName = null; - mCurrentText = null; - if (mAttributeCount > 0) resetAttributes(); - break; - } - case XmlPullParser.START_TAG: { - mCurrentName = mIn.readInternedUTF(); - mCurrentText = null; - if (mAttributeCount > 0) resetAttributes(); - break; - } - case XmlPullParser.END_TAG: { - mCurrentName = mIn.readInternedUTF(); - mCurrentText = null; - if (mAttributeCount > 0) resetAttributes(); - break; - } - case XmlPullParser.TEXT: - case XmlPullParser.CDSECT: - case XmlPullParser.PROCESSING_INSTRUCTION: - case XmlPullParser.COMMENT: - case XmlPullParser.DOCDECL: - case XmlPullParser.IGNORABLE_WHITESPACE: { - mCurrentName = null; - mCurrentText = mIn.readUTF(); - if (mAttributeCount > 0) resetAttributes(); - break; - } - case XmlPullParser.ENTITY_REF: { - mCurrentName = mIn.readUTF(); - mCurrentText = resolveEntity(mCurrentName); - if (mAttributeCount > 0) resetAttributes(); - break; - } - default: { - throw new IOException("Unknown token " + token + " with type " + type); - } - } - } - - /** - * When the current tag is {@link #TEXT}, consume all subsequent "text" - * events, as described by {@link #next}. When finished, the current event - * will still be {@link #TEXT}. - */ - private void consumeAdditionalText() throws IOException, XmlPullParserException { - String combinedText = mCurrentText; - while (true) { - final int token = peekNextExternalToken(); - switch (token) { - case COMMENT: - case PROCESSING_INSTRUCTION: - // Quietly consumed - consumeToken(); - break; - case TEXT: - case CDSECT: - case ENTITY_REF: - // Additional text regions collected - consumeToken(); - combinedText += mCurrentText; - break; - default: - // Next token is something non-text, so wrap things up - mCurrentToken = TEXT; - mCurrentName = null; - mCurrentText = combinedText; - return; - } - } - } - - static @NonNull String resolveEntity(@NonNull String entity) - throws XmlPullParserException { - switch (entity) { - case "lt": return "<"; - case "gt": return ">"; - case "amp": return "&"; - case "apos": return "'"; - case "quot": return "\""; - } - if (entity.length() > 1 && entity.charAt(0) == '#') { - final char c = (char) Integer.parseInt(entity.substring(1)); - return new String(new char[] { c }); - } - throw new XmlPullParserException("Unknown entity " + entity); - } - - @Override - public void require(int type, String namespace, String name) - throws XmlPullParserException, IOException { - if (namespace != null && !namespace.isEmpty()) throw illegalNamespace(); - if (mCurrentToken != type || !Objects.equals(mCurrentName, name)) { - throw new XmlPullParserException(getPositionDescription()); - } - } - - @Override - public String nextText() throws XmlPullParserException, IOException { - if (getEventType() != START_TAG) { - throw new XmlPullParserException(getPositionDescription()); - } - int eventType = next(); - if (eventType == TEXT) { - String result = getText(); - eventType = next(); - if (eventType != END_TAG) { - throw new XmlPullParserException(getPositionDescription()); - } - return result; - } else if (eventType == END_TAG) { - return ""; - } else { - throw new XmlPullParserException(getPositionDescription()); - } - } - - @Override - public int nextTag() throws XmlPullParserException, IOException { - int eventType = next(); - if (eventType == TEXT && isWhitespace()) { - eventType = next(); - } - if (eventType != START_TAG && eventType != END_TAG) { - throw new XmlPullParserException(getPositionDescription()); - } - return eventType; - } - - /** - * Allocate and return a new {@link Attribute} associated with the tag being - * currently processed. This will automatically grow the internal pool as - * needed. - */ - private @NonNull Attribute obtainAttribute() { - if (mAttributeCount == mAttributes.length) { - final int before = mAttributes.length; - final int after = before + (before >> 1); - mAttributes = Arrays.copyOf(mAttributes, after); - for (int i = before; i < after; i++) { - mAttributes[i] = new Attribute(); - } - } - return mAttributes[mAttributeCount++]; - } - - /** - * Clear any {@link Attribute} instances that have been allocated by - * {@link #obtainAttribute()}, returning them into the pool for recycling. - */ - private void resetAttributes() { - for (int i = 0; i < mAttributeCount; i++) { - mAttributes[i].reset(); - } - mAttributeCount = 0; - } - - @Override - public int getAttributeIndex(String namespace, String name) { - if (namespace != null && !namespace.isEmpty()) throw illegalNamespace(); - for (int i = 0; i < mAttributeCount; i++) { - if (Objects.equals(mAttributes[i].name, name)) { - return i; - } - } - return -1; - } - - @Override - public String getAttributeValue(String namespace, String name) { - final int index = getAttributeIndex(namespace, name); - if (index != -1) { - return mAttributes[index].getValueString(); - } else { - return null; - } - } - - @Override - public String getAttributeValue(int index) { - return mAttributes[index].getValueString(); - } - - @Override - public byte[] getAttributeBytesHex(int index) throws XmlPullParserException { - return mAttributes[index].getValueBytesHex(); - } - - @Override - public byte[] getAttributeBytesBase64(int index) throws XmlPullParserException { - return mAttributes[index].getValueBytesBase64(); - } - - @Override - public int getAttributeInt(int index) throws XmlPullParserException { - return mAttributes[index].getValueInt(); - } - - @Override - public int getAttributeIntHex(int index) throws XmlPullParserException { - return mAttributes[index].getValueIntHex(); - } - - @Override - public long getAttributeLong(int index) throws XmlPullParserException { - return mAttributes[index].getValueLong(); - } - - @Override - public long getAttributeLongHex(int index) throws XmlPullParserException { - return mAttributes[index].getValueLongHex(); - } - - @Override - public float getAttributeFloat(int index) throws XmlPullParserException { - return mAttributes[index].getValueFloat(); - } - - @Override - public double getAttributeDouble(int index) throws XmlPullParserException { - return mAttributes[index].getValueDouble(); - } - - @Override - public boolean getAttributeBoolean(int index) throws XmlPullParserException { - return mAttributes[index].getValueBoolean(); - } - - @Override - public String getText() { - return mCurrentText; - } - - @Override - public char[] getTextCharacters(int[] holderForStartAndLength) { - final char[] chars = mCurrentText.toCharArray(); - holderForStartAndLength[0] = 0; - holderForStartAndLength[1] = chars.length; - return chars; - } - - @Override - public String getInputEncoding() { - return StandardCharsets.UTF_8.name(); - } - - @Override - public int getDepth() { - return mCurrentDepth; - } - - @Override - public String getPositionDescription() { - // Not very helpful, but it's the best information we have - return "Token " + mCurrentToken + " at depth " + mCurrentDepth; - } - - @Override - public int getLineNumber() { - return -1; - } - - @Override - public int getColumnNumber() { - return -1; - } - - @Override - public boolean isWhitespace() throws XmlPullParserException { - switch (mCurrentToken) { - case IGNORABLE_WHITESPACE: - return true; - case TEXT: - case CDSECT: - return !TextUtils.isGraphic(mCurrentText); - default: - throw new XmlPullParserException("Not applicable for token " + mCurrentToken); - } - } - - @Override - public String getNamespace() { - switch (mCurrentToken) { - case START_TAG: - case END_TAG: - // Namespaces are unsupported - return NO_NAMESPACE; - default: - return null; - } - } - - @Override - public String getName() { - return mCurrentName; - } - - @Override - public String getPrefix() { - // Prefixes are not supported - return null; - } - - @Override - public boolean isEmptyElementTag() throws XmlPullParserException { - switch (mCurrentToken) { - case START_TAG: - try { - return (peekNextExternalToken() == END_TAG); - } catch (IOException e) { - throw new XmlPullParserException(e.toString()); - } - default: - throw new XmlPullParserException("Not at START_TAG"); - } - } - - @Override - public int getAttributeCount() { - return mAttributeCount; - } - - @Override - public String getAttributeNamespace(int index) { - // Namespaces are unsupported - return NO_NAMESPACE; - } - - @Override - public String getAttributeName(int index) { - return mAttributes[index].name; - } - - @Override - public String getAttributePrefix(int index) { - // Prefixes are not supported - return null; - } - - @Override - public String getAttributeType(int index) { - // Validation is not supported - return "CDATA"; - } - - @Override - public boolean isAttributeDefault(int index) { - // Validation is not supported - return false; - } - - @Override - public int getEventType() throws XmlPullParserException { - return mCurrentToken; - } - - @Override - public int getNamespaceCount(int depth) throws XmlPullParserException { - // Namespaces are unsupported - return 0; - } - - @Override - public String getNamespacePrefix(int pos) throws XmlPullParserException { - // Namespaces are unsupported - throw new UnsupportedOperationException(); - } - - @Override - public String getNamespaceUri(int pos) throws XmlPullParserException { - // Namespaces are unsupported - throw new UnsupportedOperationException(); - } - - @Override - public String getNamespace(String prefix) { - // Namespaces are unsupported - throw new UnsupportedOperationException(); - } - - @Override - public void defineEntityReplacementText(String entityName, String replacementText) - throws XmlPullParserException { - // Custom entities are not supported - throw new UnsupportedOperationException(); - } - - @Override - public void setFeature(String name, boolean state) throws XmlPullParserException { - // Features are not supported - throw new UnsupportedOperationException(); - } - - @Override - public boolean getFeature(String name) { - // Features are not supported - throw new UnsupportedOperationException(); - } - - @Override - public void setProperty(String name, Object value) throws XmlPullParserException { - // Properties are not supported - throw new UnsupportedOperationException(); - } - - @Override - public Object getProperty(String name) { - // Properties are not supported - throw new UnsupportedOperationException(); - } - - private static IllegalArgumentException illegalNamespace() { - throw new IllegalArgumentException("Namespaces are not supported"); - } - - /** - * Holder representing a single attribute. This design enables object - * recycling without resorting to autoboxing. - *
- * To support conversion between human-readable XML and binary XML, the - * various accessor methods will transparently convert from/to - * human-readable values when needed. - */ - private static class Attribute { - public String name; - public int type; - - public String valueString; - public byte[] valueBytes; - public int valueInt; - public long valueLong; - public float valueFloat; - public double valueDouble; - - public void reset() { - name = null; - valueString = null; - valueBytes = null; - } - - public @Nullable String getValueString() { - switch (type) { - case TYPE_NULL: - return null; - case TYPE_STRING: - case TYPE_STRING_INTERNED: - return valueString; - case TYPE_BYTES_HEX: - return bytesToHexString(valueBytes); - case TYPE_BYTES_BASE64: - return Base64.encodeToString(valueBytes, Base64.NO_WRAP); - case TYPE_INT: - return Integer.toString(valueInt); - case TYPE_INT_HEX: - return Integer.toString(valueInt, 16); - case TYPE_LONG: - return Long.toString(valueLong); - case TYPE_LONG_HEX: - return Long.toString(valueLong, 16); - case TYPE_FLOAT: - return Float.toString(valueFloat); - case TYPE_DOUBLE: - return Double.toString(valueDouble); - case TYPE_BOOLEAN_TRUE: - return "true"; - case TYPE_BOOLEAN_FALSE: - return "false"; - default: - // Unknown data type; null is the best we can offer - return null; - } - } - - public @Nullable byte[] getValueBytesHex() throws XmlPullParserException { - switch (type) { - case TYPE_NULL: - return null; - case TYPE_BYTES_HEX: - case TYPE_BYTES_BASE64: - return valueBytes; - case TYPE_STRING: - case TYPE_STRING_INTERNED: - try { - return hexStringToBytes(valueString); - } catch (Exception e) { - throw new XmlPullParserException("Invalid attribute " + name + ": " + e); - } - default: - throw new XmlPullParserException("Invalid conversion from " + type); - } - } - - public @Nullable byte[] getValueBytesBase64() throws XmlPullParserException { - switch (type) { - case TYPE_NULL: - return null; - case TYPE_BYTES_HEX: - case TYPE_BYTES_BASE64: - return valueBytes; - case TYPE_STRING: - case TYPE_STRING_INTERNED: - try { - return Base64.decode(valueString, Base64.NO_WRAP); - } catch (Exception e) { - throw new XmlPullParserException("Invalid attribute " + name + ": " + e); - } - default: - throw new XmlPullParserException("Invalid conversion from " + type); - } - } - - public int getValueInt() throws XmlPullParserException { - switch (type) { - case TYPE_INT: - case TYPE_INT_HEX: - return valueInt; - case TYPE_STRING: - case TYPE_STRING_INTERNED: - try { - return Integer.parseInt(valueString); - } catch (Exception e) { - throw new XmlPullParserException("Invalid attribute " + name + ": " + e); - } - default: - throw new XmlPullParserException("Invalid conversion from " + type); - } - } - - public int getValueIntHex() throws XmlPullParserException { - switch (type) { - case TYPE_INT: - case TYPE_INT_HEX: - return valueInt; - case TYPE_STRING: - case TYPE_STRING_INTERNED: - try { - return Integer.parseInt(valueString, 16); - } catch (Exception e) { - throw new XmlPullParserException("Invalid attribute " + name + ": " + e); - } - default: - throw new XmlPullParserException("Invalid conversion from " + type); - } - } - - public long getValueLong() throws XmlPullParserException { - switch (type) { - case TYPE_LONG: - case TYPE_LONG_HEX: - return valueLong; - case TYPE_STRING: - case TYPE_STRING_INTERNED: - try { - return Long.parseLong(valueString); - } catch (Exception e) { - throw new XmlPullParserException("Invalid attribute " + name + ": " + e); - } - default: - throw new XmlPullParserException("Invalid conversion from " + type); - } - } - - public long getValueLongHex() throws XmlPullParserException { - switch (type) { - case TYPE_LONG: - case TYPE_LONG_HEX: - return valueLong; - case TYPE_STRING: - case TYPE_STRING_INTERNED: - try { - return Long.parseLong(valueString, 16); - } catch (Exception e) { - throw new XmlPullParserException("Invalid attribute " + name + ": " + e); - } - default: - throw new XmlPullParserException("Invalid conversion from " + type); - } - } - - public float getValueFloat() throws XmlPullParserException { - switch (type) { - case TYPE_FLOAT: - return valueFloat; - case TYPE_STRING: - case TYPE_STRING_INTERNED: - try { - return Float.parseFloat(valueString); - } catch (Exception e) { - throw new XmlPullParserException("Invalid attribute " + name + ": " + e); - } - default: - throw new XmlPullParserException("Invalid conversion from " + type); - } - } - - public double getValueDouble() throws XmlPullParserException { - switch (type) { - case TYPE_DOUBLE: - return valueDouble; - case TYPE_STRING: - case TYPE_STRING_INTERNED: - try { - return Double.parseDouble(valueString); - } catch (Exception e) { - throw new XmlPullParserException("Invalid attribute " + name + ": " + e); - } - default: - throw new XmlPullParserException("Invalid conversion from " + type); - } - } - - public boolean getValueBoolean() throws XmlPullParserException { - switch (type) { - case TYPE_BOOLEAN_TRUE: - return true; - case TYPE_BOOLEAN_FALSE: - return false; - case TYPE_STRING: - case TYPE_STRING_INTERNED: - if ("true".equalsIgnoreCase(valueString)) { - return true; - } else if ("false".equalsIgnoreCase(valueString)) { - return false; - } else { - throw new XmlPullParserException( - "Invalid attribute " + name + ": " + valueString); - } - default: - throw new XmlPullParserException("Invalid conversion from " + type); - } - } - } - - // NOTE: To support unbundled clients, we include an inlined copy - // of hex conversion logic from HexDump below - private final static char[] HEX_DIGITS = - { '0', '1', '2', '3', '4', '5', '6', '7', '8', '9', 'a', 'b', 'c', 'd', 'e', 'f' }; - - private static int toByte(char c) { - if (c >= '0' && c <= '9') return (c - '0'); - if (c >= 'A' && c <= 'F') return (c - 'A' + 10); - if (c >= 'a' && c <= 'f') return (c - 'a' + 10); - throw new IllegalArgumentException("Invalid hex char '" + c + "'"); - } - - static String bytesToHexString(byte[] value) { - final int length = value.length; - final char[] buf = new char[length * 2]; - int bufIndex = 0; - for (int i = 0; i < length; i++) { - byte b = value[i]; - buf[bufIndex++] = HEX_DIGITS[(b >>> 4) & 0x0F]; - buf[bufIndex++] = HEX_DIGITS[b & 0x0F]; - } - return new String(buf); - } - - static byte[] hexStringToBytes(String value) { - final int length = value.length(); - if (length % 2 != 0) { - throw new IllegalArgumentException("Invalid hex length " + length); - } - byte[] buffer = new byte[length / 2]; - for (int i = 0; i < length; i += 2) { - buffer[i / 2] = (byte) ((toByte(value.charAt(i)) << 4) - | toByte(value.charAt(i + 1))); - } - return buffer; - } -} diff --git a/core/java/com/android/internal/util/BinaryXmlSerializer.java b/core/java/com/android/internal/util/BinaryXmlSerializer.java deleted file mode 100644 index ca8e46c6c5615..0000000000000 --- a/core/java/com/android/internal/util/BinaryXmlSerializer.java +++ /dev/null @@ -1,404 +0,0 @@ -/* - * Copyright (C) 2020 The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package com.android.internal.util; - -import static org.xmlpull.v1.XmlPullParser.CDSECT; -import static org.xmlpull.v1.XmlPullParser.COMMENT; -import static org.xmlpull.v1.XmlPullParser.DOCDECL; -import static org.xmlpull.v1.XmlPullParser.END_DOCUMENT; -import static org.xmlpull.v1.XmlPullParser.END_TAG; -import static org.xmlpull.v1.XmlPullParser.ENTITY_REF; -import static org.xmlpull.v1.XmlPullParser.IGNORABLE_WHITESPACE; -import static org.xmlpull.v1.XmlPullParser.PROCESSING_INSTRUCTION; -import static org.xmlpull.v1.XmlPullParser.START_DOCUMENT; -import static org.xmlpull.v1.XmlPullParser.START_TAG; -import static org.xmlpull.v1.XmlPullParser.TEXT; - -import android.annotation.NonNull; -import android.annotation.Nullable; - -import com.android.modules.utils.TypedXmlSerializer; - -import org.xmlpull.v1.XmlPullParser; -import org.xmlpull.v1.XmlSerializer; - -import java.io.IOException; -import java.io.OutputStream; -import java.io.Writer; -import java.nio.charset.StandardCharsets; -import java.util.Arrays; - -/** - * Serializer that writes XML documents using a custom binary wire protocol - * which benchmarking has shown to be 4.3x faster and use 2.4x less disk space - * than {@code Xml.newFastSerializer()} for a typical {@code packages.xml}. - *
- * The high-level design of the wire protocol is to directly serialize the event - * stream, while efficiently and compactly writing strongly-typed primitives - * delivered through the {@link TypedXmlSerializer} interface. - *
- * Each serialized event is a single byte where the lower half is a normal - * {@link XmlPullParser} token and the upper half is an optional data type - * signal, such as {@link #TYPE_INT}. - *
- * This serializer has some specific limitations: - *
- * Benchmarks have demonstrated this class is 3x more efficient than using a - * {@link DataInputStream} with a {@link BufferedInputStream}. - */ -public class FastDataInput implements DataInput, Closeable { - protected static final int MAX_UNSIGNED_SHORT = 65_535; - - protected static final int DEFAULT_BUFFER_SIZE = 32_768; - - protected final VMRuntime mRuntime; - - protected final byte[] mBuffer; - protected final int mBufferCap; - - private InputStream mIn; - protected int mBufferPos; - protected int mBufferLim; - - /** - * Values that have been "interned" by {@link #readInternedUTF()}. - */ - private int mStringRefCount = 0; - private String[] mStringRefs = new String[32]; - - public FastDataInput(@NonNull InputStream in, int bufferSize) { - mRuntime = VMRuntime.getRuntime(); - mIn = Objects.requireNonNull(in); - if (bufferSize < 8) { - throw new IllegalArgumentException(); - } - - mBuffer = (byte[]) mRuntime.newNonMovableArray(byte.class, bufferSize); - mBufferCap = mBuffer.length; - } - - /** - * Obtain a {@link FastDataInput} configured with the given - * {@link InputStream} and which encodes large code-points using 3-byte - * sequences. - *
- * This is compatible with the {@link DataInput} API contract, - * which specifies that large code-points must be encoded with 3-byte - * sequences. - */ - public static FastDataInput obtain(@NonNull InputStream in) { - return new FastDataInput(in, DEFAULT_BUFFER_SIZE); - } - - /** - * Release a {@link FastDataInput} to potentially be recycled. You must not - * interact with the object after releasing it. - */ - public void release() { - mIn = null; - mBufferPos = 0; - mBufferLim = 0; - mStringRefCount = 0; - } - - /** - * Re-initializes the object for the new input. - */ - protected void setInput(@NonNull InputStream in) { - if (mIn != null) { - throw new IllegalStateException("setInput() called before calling release()"); - } - - mIn = Objects.requireNonNull(in); - mBufferPos = 0; - mBufferLim = 0; - mStringRefCount = 0; - } - - protected void fill(int need) throws IOException { - final int remain = mBufferLim - mBufferPos; - System.arraycopy(mBuffer, mBufferPos, mBuffer, 0, remain); - mBufferPos = 0; - mBufferLim = remain; - need -= remain; - - while (need > 0) { - int c = mIn.read(mBuffer, mBufferLim, mBufferCap - mBufferLim); - if (c == -1) { - throw new EOFException(); - } else { - mBufferLim += c; - need -= c; - } - } - } - - @Override - public void close() throws IOException { - mIn.close(); - release(); - } - - @Override - public void readFully(byte[] b) throws IOException { - readFully(b, 0, b.length); - } - - @Override - public void readFully(byte[] b, int off, int len) throws IOException { - // Attempt to read directly from buffer space if there's enough room, - // otherwise fall back to chunking into place - if (mBufferCap >= len) { - if (mBufferLim - mBufferPos < len) fill(len); - System.arraycopy(mBuffer, mBufferPos, b, off, len); - mBufferPos += len; - } else { - final int remain = mBufferLim - mBufferPos; - System.arraycopy(mBuffer, mBufferPos, b, off, remain); - mBufferPos += remain; - off += remain; - len -= remain; - - while (len > 0) { - int c = mIn.read(b, off, len); - if (c == -1) { - throw new EOFException(); - } else { - off += c; - len -= c; - } - } - } - } - - @Override - public String readUTF() throws IOException { - // Attempt to read directly from buffer space if there's enough room, - // otherwise fall back to chunking into place - final int len = readUnsignedShort(); - if (mBufferCap > len) { - if (mBufferLim - mBufferPos < len) fill(len); - final String res = ModifiedUtf8.decode(mBuffer, new char[len], mBufferPos, len); - mBufferPos += len; - return res; - } else { - final byte[] tmp = (byte[]) mRuntime.newNonMovableArray(byte.class, len + 1); - readFully(tmp, 0, len); - return ModifiedUtf8.decode(tmp, new char[len], 0, len); - } - } - - /** - * Read a {@link String} value with the additional signal that the given - * value is a candidate for being canonicalized, similar to - * {@link String#intern()}. - *
- * Canonicalization is implemented by writing each unique string value once - * the first time it appears, and then writing a lightweight {@code short} - * reference when that string is written again in the future. - * - * @see FastDataOutput#writeInternedUTF(String) - */ - public @NonNull String readInternedUTF() throws IOException { - final int ref = readUnsignedShort(); - if (ref == MAX_UNSIGNED_SHORT) { - final String s = readUTF(); - - // We can only safely intern when we have remaining values; if we're - // full we at least sent the string value above - if (mStringRefCount < MAX_UNSIGNED_SHORT) { - if (mStringRefCount == mStringRefs.length) { - mStringRefs = Arrays.copyOf(mStringRefs, - mStringRefCount + (mStringRefCount >> 1)); - } - mStringRefs[mStringRefCount++] = s; - } - - return s; - } else { - return mStringRefs[ref]; - } - } - - @Override - public boolean readBoolean() throws IOException { - return readByte() != 0; - } - - /** - * Returns the same decoded value as {@link #readByte()} but without - * actually consuming the underlying data. - */ - public byte peekByte() throws IOException { - if (mBufferLim - mBufferPos < 1) fill(1); - return mBuffer[mBufferPos]; - } - - @Override - public byte readByte() throws IOException { - if (mBufferLim - mBufferPos < 1) fill(1); - return mBuffer[mBufferPos++]; - } - - @Override - public int readUnsignedByte() throws IOException { - return Byte.toUnsignedInt(readByte()); - } - - @Override - public short readShort() throws IOException { - if (mBufferLim - mBufferPos < 2) fill(2); - return (short) (((mBuffer[mBufferPos++] & 0xff) << 8) | - ((mBuffer[mBufferPos++] & 0xff) << 0)); - } - - @Override - public int readUnsignedShort() throws IOException { - return Short.toUnsignedInt((short) readShort()); - } - - @Override - public char readChar() throws IOException { - return (char) readShort(); - } - - @Override - public int readInt() throws IOException { - if (mBufferLim - mBufferPos < 4) fill(4); - return (((mBuffer[mBufferPos++] & 0xff) << 24) | - ((mBuffer[mBufferPos++] & 0xff) << 16) | - ((mBuffer[mBufferPos++] & 0xff) << 8) | - ((mBuffer[mBufferPos++] & 0xff) << 0)); - } - - @Override - public long readLong() throws IOException { - if (mBufferLim - mBufferPos < 8) fill(8); - int h = ((mBuffer[mBufferPos++] & 0xff) << 24) | - ((mBuffer[mBufferPos++] & 0xff) << 16) | - ((mBuffer[mBufferPos++] & 0xff) << 8) | - ((mBuffer[mBufferPos++] & 0xff) << 0); - int l = ((mBuffer[mBufferPos++] & 0xff) << 24) | - ((mBuffer[mBufferPos++] & 0xff) << 16) | - ((mBuffer[mBufferPos++] & 0xff) << 8) | - ((mBuffer[mBufferPos++] & 0xff) << 0); - return (((long) h) << 32L) | ((long) l) & 0xffffffffL; - } - - @Override - public float readFloat() throws IOException { - return Float.intBitsToFloat(readInt()); - } - - @Override - public double readDouble() throws IOException { - return Double.longBitsToDouble(readLong()); - } - - @Override - public int skipBytes(int n) throws IOException { - // Callers should read data piecemeal - throw new UnsupportedOperationException(); - } - - @Override - public String readLine() throws IOException { - // Callers should read data piecemeal - throw new UnsupportedOperationException(); - } -} diff --git a/core/java/com/android/internal/util/FastDataOutput.java b/core/java/com/android/internal/util/FastDataOutput.java deleted file mode 100644 index e394c7449801b..0000000000000 --- a/core/java/com/android/internal/util/FastDataOutput.java +++ /dev/null @@ -1,269 +0,0 @@ -/* - * Copyright (C) 2020 The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package com.android.internal.util; - -import android.annotation.NonNull; - -import dalvik.system.VMRuntime; - -import java.io.BufferedOutputStream; -import java.io.Closeable; -import java.io.DataOutput; -import java.io.DataOutputStream; -import java.io.Flushable; -import java.io.IOException; -import java.io.OutputStream; -import java.util.HashMap; -import java.util.Objects; - -/** - * Optimized implementation of {@link DataOutput} which buffers data in memory - * before flushing to the underlying {@link OutputStream}. - *
- * Benchmarks have demonstrated this class is 2x more efficient than using a
- * {@link DataOutputStream} with a {@link BufferedOutputStream}.
- */
-public class FastDataOutput implements DataOutput, Flushable, Closeable {
- protected static final int MAX_UNSIGNED_SHORT = 65_535;
-
- protected static final int DEFAULT_BUFFER_SIZE = 32_768;
-
- protected final VMRuntime mRuntime;
-
- protected final byte[] mBuffer;
- protected final int mBufferCap;
-
- private OutputStream mOut;
- protected int mBufferPos;
-
- /**
- * Values that have been "interned" by {@link #writeInternedUTF(String)}.
- */
- private final HashMap
- * This is compatible with the {@link DataOutput} API contract,
- * which specifies that large code-points must be encoded with 3-byte
- * sequences.
- */
- public static FastDataOutput obtain(@NonNull OutputStream out) {
- return new FastDataOutput(out, DEFAULT_BUFFER_SIZE);
- }
-
- /**
- * Release a {@link FastDataOutput} to potentially be recycled. You must not
- * interact with the object after releasing it.
- */
- public void release() {
- if (mBufferPos > 0) {
- throw new IllegalStateException("Lingering data, call flush() before releasing.");
- }
-
- mOut = null;
- mBufferPos = 0;
- mStringRefs.clear();
- }
-
- /**
- * Re-initializes the object for the new output.
- */
- protected void setOutput(@NonNull OutputStream out) {
- if (mOut != null) {
- throw new IllegalStateException("setOutput() called before calling release()");
- }
-
- mOut = Objects.requireNonNull(out);
- mBufferPos = 0;
- mStringRefs.clear();
- }
-
- protected void drain() throws IOException {
- if (mBufferPos > 0) {
- mOut.write(mBuffer, 0, mBufferPos);
- mBufferPos = 0;
- }
- }
-
- @Override
- public void flush() throws IOException {
- drain();
- mOut.flush();
- }
-
- @Override
- public void close() throws IOException {
- mOut.close();
- release();
- }
-
- @Override
- public void write(int b) throws IOException {
- writeByte(b);
- }
-
- @Override
- public void write(byte[] b) throws IOException {
- write(b, 0, b.length);
- }
-
- @Override
- public void write(byte[] b, int off, int len) throws IOException {
- if (mBufferCap < len) {
- drain();
- mOut.write(b, off, len);
- } else {
- if (mBufferCap - mBufferPos < len) drain();
- System.arraycopy(b, off, mBuffer, mBufferPos, len);
- mBufferPos += len;
- }
- }
-
- @Override
- public void writeUTF(String s) throws IOException {
- final int len = (int) ModifiedUtf8.countBytes(s, false);
- if (len > MAX_UNSIGNED_SHORT) {
- throw new IOException("Modified UTF-8 length too large: " + len);
- }
-
- // Attempt to write directly to buffer space if there's enough room,
- // otherwise fall back to chunking into place
- if (mBufferCap >= 2 + len) {
- if (mBufferCap - mBufferPos < 2 + len) drain();
- writeShort(len);
- ModifiedUtf8.encode(mBuffer, mBufferPos, s);
- mBufferPos += len;
- } else {
- final byte[] tmp = (byte[]) mRuntime.newNonMovableArray(byte.class, len + 1);
- ModifiedUtf8.encode(tmp, 0, s);
- writeShort(len);
- write(tmp, 0, len);
- }
- }
-
- /**
- * Write a {@link String} value with the additional signal that the given
- * value is a candidate for being canonicalized, similar to
- * {@link String#intern()}.
- *
- * Canonicalization is implemented by writing each unique string value once
- * the first time it appears, and then writing a lightweight {@code short}
- * reference when that string is written again in the future.
- *
- * @see FastDataInput#readInternedUTF()
- */
- public void writeInternedUTF(@NonNull String s) throws IOException {
- Integer ref = mStringRefs.get(s);
- if (ref != null) {
- writeShort(ref);
- } else {
- writeShort(MAX_UNSIGNED_SHORT);
- writeUTF(s);
-
- // We can only safely intern when we have remaining values; if we're
- // full we at least sent the string value above
- ref = mStringRefs.size();
- if (ref < MAX_UNSIGNED_SHORT) {
- mStringRefs.put(s, ref);
- }
- }
- }
-
- @Override
- public void writeBoolean(boolean v) throws IOException {
- writeByte(v ? 1 : 0);
- }
-
- @Override
- public void writeByte(int v) throws IOException {
- if (mBufferCap - mBufferPos < 1) drain();
- mBuffer[mBufferPos++] = (byte) ((v >> 0) & 0xff);
- }
-
- @Override
- public void writeShort(int v) throws IOException {
- if (mBufferCap - mBufferPos < 2) drain();
- mBuffer[mBufferPos++] = (byte) ((v >> 8) & 0xff);
- mBuffer[mBufferPos++] = (byte) ((v >> 0) & 0xff);
- }
-
- @Override
- public void writeChar(int v) throws IOException {
- writeShort((short) v);
- }
-
- @Override
- public void writeInt(int v) throws IOException {
- if (mBufferCap - mBufferPos < 4) drain();
- mBuffer[mBufferPos++] = (byte) ((v >> 24) & 0xff);
- mBuffer[mBufferPos++] = (byte) ((v >> 16) & 0xff);
- mBuffer[mBufferPos++] = (byte) ((v >> 8) & 0xff);
- mBuffer[mBufferPos++] = (byte) ((v >> 0) & 0xff);
- }
-
- @Override
- public void writeLong(long v) throws IOException {
- if (mBufferCap - mBufferPos < 8) drain();
- int i = (int) (v >> 32);
- mBuffer[mBufferPos++] = (byte) ((i >> 24) & 0xff);
- mBuffer[mBufferPos++] = (byte) ((i >> 16) & 0xff);
- mBuffer[mBufferPos++] = (byte) ((i >> 8) & 0xff);
- mBuffer[mBufferPos++] = (byte) ((i >> 0) & 0xff);
- i = (int) v;
- mBuffer[mBufferPos++] = (byte) ((i >> 24) & 0xff);
- mBuffer[mBufferPos++] = (byte) ((i >> 16) & 0xff);
- mBuffer[mBufferPos++] = (byte) ((i >> 8) & 0xff);
- mBuffer[mBufferPos++] = (byte) ((i >> 0) & 0xff);
- }
-
- @Override
- public void writeFloat(float v) throws IOException {
- writeInt(Float.floatToIntBits(v));
- }
-
- @Override
- public void writeDouble(double v) throws IOException {
- writeLong(Double.doubleToLongBits(v));
- }
-
- @Override
- public void writeBytes(String s) throws IOException {
- // Callers should use writeUTF()
- throw new UnsupportedOperationException();
- }
-
- @Override
- public void writeChars(String s) throws IOException {
- // Callers should use writeUTF()
- throw new UnsupportedOperationException();
- }
-}
diff --git a/core/java/com/android/internal/util/ModifiedUtf8.java b/core/java/com/android/internal/util/ModifiedUtf8.java
deleted file mode 100644
index a144c0034dd2e..0000000000000
--- a/core/java/com/android/internal/util/ModifiedUtf8.java
+++ /dev/null
@@ -1,110 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.internal.util;
-
-import java.io.UTFDataFormatException;
-
-public class ModifiedUtf8 {
- /**
- * Decodes a byte array containing modified UTF-8 bytes into a string.
- *
- * Note that although this method decodes the (supposedly impossible) zero byte to U+0000,
- * that's what the RI does too.
- */
- public static String decode(byte[] in, char[] out, int offset, int utfSize)
- throws UTFDataFormatException {
- int count = 0, s = 0, a;
- while (count < utfSize) {
- if ((out[s] = (char) in[offset + count++]) < '\u0080') {
- s++;
- } else if (((a = out[s]) & 0xe0) == 0xc0) {
- if (count >= utfSize) {
- throw new UTFDataFormatException("bad second byte at " + count);
- }
- int b = in[offset + count++];
- if ((b & 0xC0) != 0x80) {
- throw new UTFDataFormatException("bad second byte at " + (count - 1));
- }
- out[s++] = (char) (((a & 0x1F) << 6) | (b & 0x3F));
- } else if ((a & 0xf0) == 0xe0) {
- if (count + 1 >= utfSize) {
- throw new UTFDataFormatException("bad third byte at " + (count + 1));
- }
- int b = in[offset + count++];
- int c = in[offset + count++];
- if (((b & 0xC0) != 0x80) || ((c & 0xC0) != 0x80)) {
- throw new UTFDataFormatException("bad second or third byte at " + (count - 2));
- }
- out[s++] = (char) (((a & 0x0F) << 12) | ((b & 0x3F) << 6) | (c & 0x3F));
- } else {
- throw new UTFDataFormatException("bad byte at " + (count - 1));
- }
- }
- return new String(out, 0, s);
- }
-
- /**
- * Returns the number of bytes the modified UTF-8 representation of 's' would take. Note
- * that this is just the space for the bytes representing the characters, not the length
- * which precedes those bytes, because different callers represent the length differently,
- * as two, four, or even eight bytes. If {@code shortLength} is true, we'll throw an
- * exception if the string is too long for its length to be represented by a short.
- */
- public static long countBytes(String s, boolean shortLength) throws UTFDataFormatException {
- long result = 0;
- final int length = s.length();
- for (int i = 0; i < length; ++i) {
- char ch = s.charAt(i);
- if (ch != 0 && ch <= 127) { // U+0000 uses two bytes.
- ++result;
- } else if (ch <= 2047) {
- result += 2;
- } else {
- result += 3;
- }
- if (shortLength && result > 65535) {
- throw new UTFDataFormatException("String more than 65535 UTF bytes long");
- }
- }
- return result;
- }
-
- /**
- * Encodes the modified UTF-8 bytes corresponding to string {@code s} into the
- * byte array {@code dst}, starting at the given {@code offset}.
- */
- public static void encode(byte[] dst, int offset, String s) {
- final int length = s.length();
- for (int i = 0; i < length; i++) {
- char ch = s.charAt(i);
- if (ch != 0 && ch <= 127) { // U+0000 uses two bytes.
- dst[offset++] = (byte) ch;
- } else if (ch <= 2047) {
- dst[offset++] = (byte) (0xc0 | (0x1f & (ch >> 6)));
- dst[offset++] = (byte) (0x80 | (0x3f & ch));
- } else {
- dst[offset++] = (byte) (0xe0 | (0x0f & (ch >> 12)));
- dst[offset++] = (byte) (0x80 | (0x3f & (ch >> 6)));
- dst[offset++] = (byte) (0x80 | (0x3f & ch));
- }
- }
- }
-
- private ModifiedUtf8() {
- }
-}
diff --git a/core/java/com/android/modules/utils/TypedXmlPullParser.java b/core/java/com/android/modules/utils/TypedXmlPullParser.java
deleted file mode 100644
index 8f870909c7d5e..0000000000000
--- a/core/java/com/android/modules/utils/TypedXmlPullParser.java
+++ /dev/null
@@ -1,328 +0,0 @@
-/*
- * Copyright (C) 2020 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.modules.utils;
-
-import android.annotation.NonNull;
-import android.annotation.Nullable;
-
-import org.xmlpull.v1.XmlPullParser;
-import org.xmlpull.v1.XmlPullParserException;
-
-/**
- * Specialization of {@link XmlPullParser} which adds explicit methods to
- * support consistent and efficient conversion of primitive data types.
- */
-public interface TypedXmlPullParser extends XmlPullParser {
- /**
- * @return index of requested attribute, otherwise {@code -1} if undefined
- */
- default int getAttributeIndex(@Nullable String namespace, @NonNull String name) {
- final boolean namespaceNull = (namespace == null);
- final int count = getAttributeCount();
- for (int i = 0; i < count; i++) {
- if ((namespaceNull || namespace.equals(getAttributeNamespace(i)))
- && name.equals(getAttributeName(i))) {
- return i;
- }
- }
- return -1;
- }
-
- /**
- * @return index of requested attribute
- * @throws XmlPullParserException if the value is undefined
- */
- default int getAttributeIndexOrThrow(@Nullable String namespace, @NonNull String name)
- throws XmlPullParserException {
- final int index = getAttributeIndex(namespace, name);
- if (index == -1) {
- throw new XmlPullParserException("Missing attribute " + name);
- } else {
- return index;
- }
- }
-
- /**
- * @return decoded strongly-typed {@link #getAttributeValue}
- * @throws XmlPullParserException if the value is malformed
- */
- @NonNull byte[] getAttributeBytesHex(int index) throws XmlPullParserException;
-
- /**
- * @return decoded strongly-typed {@link #getAttributeValue}
- * @throws XmlPullParserException if the value is malformed
- */
- @NonNull byte[] getAttributeBytesBase64(int index) throws XmlPullParserException;
-
- /**
- * @return decoded strongly-typed {@link #getAttributeValue}
- * @throws XmlPullParserException if the value is malformed
- */
- int getAttributeInt(int index) throws XmlPullParserException;
-
- /**
- * @return decoded strongly-typed {@link #getAttributeValue}
- * @throws XmlPullParserException if the value is malformed
- */
- int getAttributeIntHex(int index) throws XmlPullParserException;
-
- /**
- * @return decoded strongly-typed {@link #getAttributeValue}
- * @throws XmlPullParserException if the value is malformed
- */
- long getAttributeLong(int index) throws XmlPullParserException;
-
- /**
- * @return decoded strongly-typed {@link #getAttributeValue}
- * @throws XmlPullParserException if the value is malformed
- */
- long getAttributeLongHex(int index) throws XmlPullParserException;
-
- /**
- * @return decoded strongly-typed {@link #getAttributeValue}
- * @throws XmlPullParserException if the value is malformed
- */
- float getAttributeFloat(int index) throws XmlPullParserException;
-
- /**
- * @return decoded strongly-typed {@link #getAttributeValue}
- * @throws XmlPullParserException if the value is malformed
- */
- double getAttributeDouble(int index) throws XmlPullParserException;
-
- /**
- * @return decoded strongly-typed {@link #getAttributeValue}
- * @throws XmlPullParserException if the value is malformed
- */
- boolean getAttributeBoolean(int index) throws XmlPullParserException;
-
- /**
- * @return decoded strongly-typed {@link #getAttributeValue}
- * @throws XmlPullParserException if the value is malformed or undefined
- */
- default @NonNull byte[] getAttributeBytesHex(@Nullable String namespace,
- @NonNull String name) throws XmlPullParserException {
- return getAttributeBytesHex(getAttributeIndexOrThrow(namespace, name));
- }
-
- /**
- * @return decoded strongly-typed {@link #getAttributeValue}
- * @throws XmlPullParserException if the value is malformed or undefined
- */
- default @NonNull byte[] getAttributeBytesBase64(@Nullable String namespace,
- @NonNull String name) throws XmlPullParserException {
- return getAttributeBytesBase64(getAttributeIndexOrThrow(namespace, name));
- }
-
- /**
- * @return decoded strongly-typed {@link #getAttributeValue}
- * @throws XmlPullParserException if the value is malformed or undefined
- */
- default int getAttributeInt(@Nullable String namespace, @NonNull String name)
- throws XmlPullParserException {
- return getAttributeInt(getAttributeIndexOrThrow(namespace, name));
- }
-
- /**
- * @return decoded strongly-typed {@link #getAttributeValue}
- * @throws XmlPullParserException if the value is malformed or undefined
- */
- default int getAttributeIntHex(@Nullable String namespace, @NonNull String name)
- throws XmlPullParserException {
- return getAttributeIntHex(getAttributeIndexOrThrow(namespace, name));
- }
-
- /**
- * @return decoded strongly-typed {@link #getAttributeValue}
- * @throws XmlPullParserException if the value is malformed or undefined
- */
- default long getAttributeLong(@Nullable String namespace, @NonNull String name)
- throws XmlPullParserException {
- return getAttributeLong(getAttributeIndexOrThrow(namespace, name));
- }
-
- /**
- * @return decoded strongly-typed {@link #getAttributeValue}
- * @throws XmlPullParserException if the value is malformed or undefined
- */
- default long getAttributeLongHex(@Nullable String namespace, @NonNull String name)
- throws XmlPullParserException {
- return getAttributeLongHex(getAttributeIndexOrThrow(namespace, name));
- }
-
- /**
- * @return decoded strongly-typed {@link #getAttributeValue}
- * @throws XmlPullParserException if the value is malformed or undefined
- */
- default float getAttributeFloat(@Nullable String namespace, @NonNull String name)
- throws XmlPullParserException {
- return getAttributeFloat(getAttributeIndexOrThrow(namespace, name));
- }
-
- /**
- * @return decoded strongly-typed {@link #getAttributeValue}
- * @throws XmlPullParserException if the value is malformed or undefined
- */
- default double getAttributeDouble(@Nullable String namespace, @NonNull String name)
- throws XmlPullParserException {
- return getAttributeDouble(getAttributeIndexOrThrow(namespace, name));
- }
-
- /**
- * @return decoded strongly-typed {@link #getAttributeValue}
- * @throws XmlPullParserException if the value is malformed or undefined
- */
- default boolean getAttributeBoolean(@Nullable String namespace, @NonNull String name)
- throws XmlPullParserException {
- return getAttributeBoolean(getAttributeIndexOrThrow(namespace, name));
- }
-
- /**
- * @return decoded strongly-typed {@link #getAttributeValue}, otherwise
- * default value if the value is malformed or undefined
- */
- default @Nullable byte[] getAttributeBytesHex(@Nullable String namespace,
- @NonNull String name, @Nullable byte[] defaultValue) {
- final int index = getAttributeIndex(namespace, name);
- if (index == -1) return defaultValue;
- try {
- return getAttributeBytesHex(index);
- } catch (Exception ignored) {
- return defaultValue;
- }
- }
-
- /**
- * @return decoded strongly-typed {@link #getAttributeValue}, otherwise
- * default value if the value is malformed or undefined
- */
- default @Nullable byte[] getAttributeBytesBase64(@Nullable String namespace,
- @NonNull String name, @Nullable byte[] defaultValue) {
- final int index = getAttributeIndex(namespace, name);
- if (index == -1) return defaultValue;
- try {
- return getAttributeBytesBase64(index);
- } catch (Exception ignored) {
- return defaultValue;
- }
- }
-
- /**
- * @return decoded strongly-typed {@link #getAttributeValue}, otherwise
- * default value if the value is malformed or undefined
- */
- default int getAttributeInt(@Nullable String namespace, @NonNull String name,
- int defaultValue) {
- final int index = getAttributeIndex(namespace, name);
- if (index == -1) return defaultValue;
- try {
- return getAttributeInt(index);
- } catch (Exception ignored) {
- return defaultValue;
- }
- }
-
- /**
- * @return decoded strongly-typed {@link #getAttributeValue}, otherwise
- * default value if the value is malformed or undefined
- */
- default int getAttributeIntHex(@Nullable String namespace, @NonNull String name,
- int defaultValue) {
- final int index = getAttributeIndex(namespace, name);
- if (index == -1) return defaultValue;
- try {
- return getAttributeIntHex(index);
- } catch (Exception ignored) {
- return defaultValue;
- }
- }
-
- /**
- * @return decoded strongly-typed {@link #getAttributeValue}, otherwise
- * default value if the value is malformed or undefined
- */
- default long getAttributeLong(@Nullable String namespace, @NonNull String name,
- long defaultValue) {
- final int index = getAttributeIndex(namespace, name);
- if (index == -1) return defaultValue;
- try {
- return getAttributeLong(index);
- } catch (Exception ignored) {
- return defaultValue;
- }
- }
-
- /**
- * @return decoded strongly-typed {@link #getAttributeValue}, otherwise
- * default value if the value is malformed or undefined
- */
- default long getAttributeLongHex(@Nullable String namespace, @NonNull String name,
- long defaultValue) {
- final int index = getAttributeIndex(namespace, name);
- if (index == -1) return defaultValue;
- try {
- return getAttributeLongHex(index);
- } catch (Exception ignored) {
- return defaultValue;
- }
- }
-
- /**
- * @return decoded strongly-typed {@link #getAttributeValue}, otherwise
- * default value if the value is malformed or undefined
- */
- default float getAttributeFloat(@Nullable String namespace, @NonNull String name,
- float defaultValue) {
- final int index = getAttributeIndex(namespace, name);
- if (index == -1) return defaultValue;
- try {
- return getAttributeFloat(index);
- } catch (Exception ignored) {
- return defaultValue;
- }
- }
-
- /**
- * @return decoded strongly-typed {@link #getAttributeValue}, otherwise
- * default value if the value is malformed or undefined
- */
- default double getAttributeDouble(@Nullable String namespace, @NonNull String name,
- double defaultValue) {
- final int index = getAttributeIndex(namespace, name);
- if (index == -1) return defaultValue;
- try {
- return getAttributeDouble(index);
- } catch (Exception ignored) {
- return defaultValue;
- }
- }
-
- /**
- * @return decoded strongly-typed {@link #getAttributeValue}, otherwise
- * default value if the value is malformed or undefined
- */
- default boolean getAttributeBoolean(@Nullable String namespace, @NonNull String name,
- boolean defaultValue) {
- final int index = getAttributeIndex(namespace, name);
- if (index == -1) return defaultValue;
- try {
- return getAttributeBoolean(index);
- } catch (Exception ignored) {
- return defaultValue;
- }
- }
-}
diff --git a/core/java/com/android/modules/utils/TypedXmlSerializer.java b/core/java/com/android/modules/utils/TypedXmlSerializer.java
deleted file mode 100644
index 872e1e4ed9bb5..0000000000000
--- a/core/java/com/android/modules/utils/TypedXmlSerializer.java
+++ /dev/null
@@ -1,101 +0,0 @@
-/*
- * Copyright (C) 2020 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.modules.utils;
-
-import android.annotation.NonNull;
-import android.annotation.Nullable;
-
-import org.xmlpull.v1.XmlSerializer;
-
-import java.io.IOException;
-
-/**
- * Specialization of {@link XmlSerializer} which adds explicit methods to
- * support consistent and efficient conversion of primitive data types.
- */
-public interface TypedXmlSerializer extends XmlSerializer {
- /**
- * Functionally equivalent to {@link #attribute(String, String, String)} but
- * with the additional signal that the given value is a candidate for being
- * canonicalized, similar to {@link String#intern()}.
- */
- @NonNull XmlSerializer attributeInterned(@Nullable String namespace, @NonNull String name,
- @NonNull String value) throws IOException;
-
- /**
- * Encode the given strongly-typed value and serialize using
- * {@link #attribute(String, String, String)}.
- */
- @NonNull XmlSerializer attributeBytesHex(@Nullable String namespace, @NonNull String name,
- @NonNull byte[] value) throws IOException;
-
- /**
- * Encode the given strongly-typed value and serialize using
- * {@link #attribute(String, String, String)}.
- */
- @NonNull XmlSerializer attributeBytesBase64(@Nullable String namespace, @NonNull String name,
- @NonNull byte[] value) throws IOException;
-
- /**
- * Encode the given strongly-typed value and serialize using
- * {@link #attribute(String, String, String)}.
- */
- @NonNull XmlSerializer attributeInt(@Nullable String namespace, @NonNull String name,
- int value) throws IOException;
-
- /**
- * Encode the given strongly-typed value and serialize using
- * {@link #attribute(String, String, String)}.
- */
- @NonNull XmlSerializer attributeIntHex(@Nullable String namespace, @NonNull String name,
- int value) throws IOException;
-
- /**
- * Encode the given strongly-typed value and serialize using
- * {@link #attribute(String, String, String)}.
- */
- @NonNull XmlSerializer attributeLong(@Nullable String namespace, @NonNull String name,
- long value) throws IOException;
-
- /**
- * Encode the given strongly-typed value and serialize using
- * {@link #attribute(String, String, String)}.
- */
- @NonNull XmlSerializer attributeLongHex(@Nullable String namespace, @NonNull String name,
- long value) throws IOException;
-
- /**
- * Encode the given strongly-typed value and serialize using
- * {@link #attribute(String, String, String)}.
- */
- @NonNull XmlSerializer attributeFloat(@Nullable String namespace, @NonNull String name,
- float value) throws IOException;
-
- /**
- * Encode the given strongly-typed value and serialize using
- * {@link #attribute(String, String, String)}.
- */
- @NonNull XmlSerializer attributeDouble(@Nullable String namespace, @NonNull String name,
- double value) throws IOException;
-
- /**
- * Encode the given strongly-typed value and serialize using
- * {@link #attribute(String, String, String)}.
- */
- @NonNull XmlSerializer attributeBoolean(@Nullable String namespace, @NonNull String name,
- boolean value) throws IOException;
-}
diff --git a/core/tests/coretests/src/com/android/internal/util/FastDataTest.java b/core/tests/coretests/src/com/android/internal/util/FastDataTest.java
index 512ece38a2298..de325ab7d186e 100644
--- a/core/tests/coretests/src/com/android/internal/util/FastDataTest.java
+++ b/core/tests/coretests/src/com/android/internal/util/FastDataTest.java
@@ -23,6 +23,9 @@ import static org.junit.Assert.fail;
import android.annotation.NonNull;
import android.util.ExceptionUtils;
+import com.android.modules.utils.FastDataInput;
+import com.android.modules.utils.FastDataOutput;
+
import libcore.util.HexEncoding;
import org.junit.Assume;