Merge "Add android.util.proto package as an @TestApi." (073e4e40) · Commits · e / os / android_frameworks_base

api/test-current.txt

+150 −0

Original line number	Diff line number	Diff line
		@@ -41027,6 +41027,156 @@ package android.util {

		}

		package android.util.proto {

		public final class EncodedBuffer {
		ctor public EncodedBuffer();
		ctor public EncodedBuffer(int);
		method public void dumpBuffers(java.lang.String);
		method public static void dumpByteString(java.lang.String, java.lang.String, byte[]);
		method public void editRawFixed32(int, int);
		method public byte[] getBytes(int);
		method public int getChunkCount();
		method public java.lang.String getDebugString();
		method public int getRawFixed32At(int);
		method public static int getRawVarint32Size(int);
		method public static int getRawVarint64Size(long);
		method public static int getRawZigZag32Size(int);
		method public static int getRawZigZag64Size(long);
		method public int getReadPos();
		method public int getReadableSize();
		method public int getWriteBufIndex();
		method public int getWriteIndex();
		method public int getWritePos();
		method public byte readRawByte();
		method public int readRawFixed32();
		method public long readRawUnsigned();
		method public void rewindRead();
		method public void rewindWriteTo(int);
		method public void skipRead(int);
		method public void startEditing();
		method public void writeFromThisBuffer(int, int);
		method public void writeRawBuffer(byte[]);
		method public void writeRawBuffer(byte[], int, int);
		method public void writeRawByte(byte);
		method public void writeRawFixed32(int);
		method public void writeRawFixed64(long);
		method public void writeRawVarint32(int);
		method public void writeRawVarint64(long);
		method public void writeRawZigZag32(int);
		method public void writeRawZigZag64(long);
		}

		public final class ProtoOutputStream {
		ctor public ProtoOutputStream();
		ctor public ProtoOutputStream(int);
		method public static int checkFieldId(long, long);
		method public static int convertObjectIdToOrdinal(int);
		method public void dump(java.lang.String);
		method public void endObject(long);
		method public void endRepeatedObject(long);
		method public byte[] getBytes();
		method public static int getDepthFromToken(long);
		method public static int getObjectIdFromToken(long);
		method public static boolean getRepeatedFromToken(long);
		method public static int getSizePosFromToken(long);
		method public static int getTagSizeFromToken(long);
		method public static long makeFieldId(int, long);
		method public static long makeToken(int, boolean, int, int, int);
		method public long startObject(long);
		method public long startRepeatedObject(long);
		method public static java.lang.String token2String(long);
		method public void writeBool(long, boolean);
		method public void writeBytes(long, byte[]);
		method public void writeDouble(long, double);
		method public void writeEnum(long, int);
		method public void writeFixed32(long, int);
		method public void writeFixed64(long, long);
		method public void writeFloat(long, float);
		method public void writeInt32(long, int);
		method public void writeInt64(long, long);
		method public void writePackedBool(long, boolean[]);
		method public void writePackedDouble(long, double[]);
		method public void writePackedEnum(long, int[]);
		method public void writePackedFixed32(long, int[]);
		method public void writePackedFixed64(long, long[]);
		method public void writePackedFloat(long, float[]);
		method public void writePackedInt32(long, int[]);
		method public void writePackedInt64(long, long[]);
		method public void writePackedSFixed32(long, int[]);
		method public void writePackedSFixed64(long, long[]);
		method public void writePackedSInt32(long, int[]);
		method public void writePackedSInt64(long, long[]);
		method public void writePackedUInt32(long, int[]);
		method public void writePackedUInt64(long, long[]);
		method public void writeRepeatedBool(long, boolean);
		method public void writeRepeatedBytes(long, byte[]);
		method public void writeRepeatedDouble(long, double);
		method public void writeRepeatedEnum(long, int);
		method public void writeRepeatedFixed32(long, int);
		method public void writeRepeatedFixed64(long, long);
		method public void writeRepeatedFloat(long, float);
		method public void writeRepeatedInt32(long, int);
		method public void writeRepeatedInt64(long, long);
		method public void writeRepeatedSFixed32(long, int);
		method public void writeRepeatedSFixed64(long, long);
		method public void writeRepeatedSInt32(long, int);
		method public void writeRepeatedSInt64(long, long);
		method public void writeRepeatedString(long, java.lang.String);
		method public void writeRepeatedUInt32(long, int);
		method public void writeRepeatedUInt64(long, long);
		method public void writeSFixed32(long, int);
		method public void writeSFixed64(long, long);
		method public void writeSInt32(long, int);
		method public void writeSInt64(long, long);
		method public void writeString(long, java.lang.String);
		method public void writeTag(int, int);
		method public void writeUInt32(long, int);
		method public void writeUInt64(long, long);
		field public static final long FIELD_COUNT_MASK = 16492674416640L; // 0xf0000000000L
		field public static final long FIELD_COUNT_PACKED = 5497558138880L; // 0x50000000000L
		field public static final long FIELD_COUNT_REPEATED = 2199023255552L; // 0x20000000000L
		field public static final int FIELD_COUNT_SHIFT = 40; // 0x28
		field public static final long FIELD_COUNT_SINGLE = 1099511627776L; // 0x10000000000L
		field public static final long FIELD_COUNT_UNKNOWN = 0L; // 0x0L
		field public static final int FIELD_ID_MASK = -8; // 0xfffffff8
		field public static final int FIELD_ID_SHIFT = 3; // 0x3
		field public static final long FIELD_TYPE_BOOL = 55834574848L; // 0xd00000000L
		field public static final long FIELD_TYPE_BYTES = 64424509440L; // 0xf00000000L
		field public static final long FIELD_TYPE_DOUBLE = 4294967296L; // 0x100000000L
		field public static final long FIELD_TYPE_ENUM = 68719476736L; // 0x1000000000L
		field public static final long FIELD_TYPE_FIXED32 = 38654705664L; // 0x900000000L
		field public static final long FIELD_TYPE_FIXED64 = 42949672960L; // 0xa00000000L
		field public static final long FIELD_TYPE_FLOAT = 8589934592L; // 0x200000000L
		field public static final long FIELD_TYPE_INT32 = 12884901888L; // 0x300000000L
		field public static final long FIELD_TYPE_INT64 = 17179869184L; // 0x400000000L
		field public static final long FIELD_TYPE_MASK = 1095216660480L; // 0xff00000000L
		field public static final long FIELD_TYPE_OBJECT = 73014444032L; // 0x1100000000L
		field public static final long FIELD_TYPE_SFIXED32 = 47244640256L; // 0xb00000000L
		field public static final long FIELD_TYPE_SFIXED64 = 51539607552L; // 0xc00000000L
		field public static final int FIELD_TYPE_SHIFT = 32; // 0x20
		field public static final long FIELD_TYPE_SINT32 = 30064771072L; // 0x700000000L
		field public static final long FIELD_TYPE_SINT64 = 34359738368L; // 0x800000000L
		field public static final long FIELD_TYPE_STRING = 60129542144L; // 0xe00000000L
		field public static final long FIELD_TYPE_UINT32 = 21474836480L; // 0x500000000L
		field public static final long FIELD_TYPE_UINT64 = 25769803776L; // 0x600000000L
		field public static final long FIELD_TYPE_UNKNOWN = 0L; // 0x0L
		field public static final java.lang.String TAG = "ProtoOutputStream";
		field public static final int WIRE_TYPE_END_GROUP = 4; // 0x4
		field public static final int WIRE_TYPE_FIXED32 = 5; // 0x5
		field public static final int WIRE_TYPE_FIXED64 = 1; // 0x1
		field public static final int WIRE_TYPE_LENGTH_DELIMITED = 2; // 0x2
		field public static final int WIRE_TYPE_MASK = 7; // 0x7
		field public static final int WIRE_TYPE_START_GROUP = 3; // 0x3
		field public static final int WIRE_TYPE_VARINT = 0; // 0x0
		}

		public class ProtoParseException extends java.lang.RuntimeException {
		ctor public ProtoParseException(java.lang.String);
		}

		}

		package android.view {

		public abstract class AbsSavedState implements android.os.Parcelable {

core/java/android/util/proto/EncodedBuffer.java

0 → 100644

+678 −0

File added.

Preview size limit exceeded, changes collapsed.

core/java/android/util/proto/ProtoOutputStream.java

0 → 100644

+1599 −0

File added.

Preview size limit exceeded, changes collapsed.

core/java/android/util/proto/ProtoParseException.java

0 → 100644

+38 −0

Original line number	Diff line number	Diff line
		/*
		* Copyright (C) 2012 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 android.util.proto;

		import android.annotation.TestApi;

		/**
		* Thrown when there is an error parsing protobuf data.
		*
		* @hide
		*/
		@TestApi
		public class ProtoParseException extends RuntimeException {

		/**
		* Construct a ProtoParseException.
		*
		* @param msg The message.
		*/
		public ProtoParseException(String msg) {
		super(msg);
		}
		}

core/java/android/util/proto/package.html

0 → 100644

+5 −0

Original line number	Diff line number	Diff line
		<body>
		Provides utility classes to export protocol buffers from the system.

		{@hide}
		</body>