Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit fc33255d authored by Jeffrey Huang's avatar Jeffrey Huang Committed by Android (Google) Code Review
Browse files

Merge "Make ProtoOutputStream public"

parents 5978f56d 80900f24

apex/statsd/service/java/com/android/server/stats/StatsCompanionService.java

+13 −13
Original line number Diff line number Diff line
@@ -112,7 +112,6 @@ import android.util.Log; 
import android.util.Slog;

import android.util.StatsLog;

import android.util.proto.ProtoOutputStream;

import android.util.proto.ProtoStream;



import com.android.internal.annotations.GuardedBy;

import com.android.internal.app.procstats.IProcessStats;
@@ -586,23 +585,24 @@ public class StatsCompanionService extends IStatsCompanionService.Stub { 
                                installer = "";

                            }

                            long applicationInfoToken =

                                    output.start(ProtoStream.FIELD_TYPE_MESSAGE

                                            | ProtoStream.FIELD_COUNT_REPEATED

                                    output.start(ProtoOutputStream.FIELD_TYPE_MESSAGE

                                            | ProtoOutputStream.FIELD_COUNT_REPEATED

                                                    | APPLICATION_INFO_FIELD_ID);

                            output.write(ProtoStream.FIELD_TYPE_INT32

                                    | ProtoStream.FIELD_COUNT_SINGLE | UID_FIELD_ID,

                            output.write(ProtoOutputStream.FIELD_TYPE_INT32

                                    | ProtoOutputStream.FIELD_COUNT_SINGLE | UID_FIELD_ID,

                                            pi.get(j).applicationInfo.uid);

                            output.write(ProtoStream.FIELD_TYPE_INT64

                                    | ProtoStream.FIELD_COUNT_SINGLE

                            output.write(ProtoOutputStream.FIELD_TYPE_INT64

                                    | ProtoOutputStream.FIELD_COUNT_SINGLE

                                            | VERSION_FIELD_ID, pi.get(j).getLongVersionCode());

                            output.write(ProtoStream.FIELD_TYPE_STRING

                                    | ProtoStream.FIELD_COUNT_SINGLE | VERSION_STRING_FIELD_ID,

                            output.write(ProtoOutputStream.FIELD_TYPE_STRING

                                    | ProtoOutputStream.FIELD_COUNT_SINGLE

                                    | VERSION_STRING_FIELD_ID,

                                            pi.get(j).versionName);

                            output.write(ProtoStream.FIELD_TYPE_STRING

                                    | ProtoStream.FIELD_COUNT_SINGLE

                            output.write(ProtoOutputStream.FIELD_TYPE_STRING

                                    | ProtoOutputStream.FIELD_COUNT_SINGLE

                                            | PACKAGE_NAME_FIELD_ID, pi.get(j).packageName);

                            output.write(ProtoStream.FIELD_TYPE_STRING

                                    | ProtoStream.FIELD_COUNT_SINGLE

                            output.write(ProtoOutputStream.FIELD_TYPE_STRING

                                    | ProtoOutputStream.FIELD_COUNT_SINGLE

                                            | INSTALLER_FIELD_ID,

                                                    installer == null ? "" : installer);

                            numRecords++;

api/current.txt

+65 −0
Original line number Diff line number Diff line
@@ -49475,6 +49475,71 @@ package android.util { 














}



























package android.util.proto {

























  public final class ProtoOutputStream {













    ctor public ProtoOutputStream();













    ctor public ProtoOutputStream(int);













    ctor public ProtoOutputStream(@NonNull java.io.OutputStream);













    method public static int checkFieldId(long, long);













    method public void dump(@NonNull String);













    method public void end(long);













    method public void flush();













    method @NonNull public byte[] getBytes();













    method @Nullable public static String getFieldCountString(long);













    method @NonNull public static String getFieldIdString(long);













    method @Nullable public static String getFieldTypeString(long);













    method public int getRawSize();













    method @Nullable public static String getWireTypeString(int);













    method public static long makeFieldId(int, long);













    method public static long makeToken(int, boolean, int, int, int);













    method public long start(long);













    method @NonNull public static String token2String(long);













    method public void write(long, double);













    method public void write(long, float);













    method public void write(long, int);













    method public void write(long, long);













    method public void write(long, boolean);













    method public void write(long, @Nullable String);













    method public void write(long, @Nullable byte[]);













    method public void writeTag(int, int);













    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_SHIFT = 3; // 0x3













    field public static final long FIELD_TYPE_BOOL = 34359738368L; // 0x800000000L













    field public static final long FIELD_TYPE_BYTES = 51539607552L; // 0xc00000000L













    field public static final long FIELD_TYPE_DOUBLE = 4294967296L; // 0x100000000L













    field public static final long FIELD_TYPE_ENUM = 60129542144L; // 0xe00000000L













    field public static final long FIELD_TYPE_FIXED32 = 30064771072L; // 0x700000000L













    field public static final long FIELD_TYPE_FIXED64 = 25769803776L; // 0x600000000L













    field public static final long FIELD_TYPE_FLOAT = 8589934592L; // 0x200000000L













    field public static final long FIELD_TYPE_INT32 = 21474836480L; // 0x500000000L













    field public static final long FIELD_TYPE_INT64 = 12884901888L; // 0x300000000L













    field public static final long FIELD_TYPE_MASK = 1095216660480L; // 0xff00000000L













    field public static final long FIELD_TYPE_MESSAGE = 47244640256L; // 0xb00000000L













    field public static final long FIELD_TYPE_SFIXED32 = 64424509440L; // 0xf00000000L













    field public static final long FIELD_TYPE_SFIXED64 = 68719476736L; // 0x1000000000L













    field public static final int FIELD_TYPE_SHIFT = 32; // 0x20













    field public static final long FIELD_TYPE_SINT32 = 73014444032L; // 0x1100000000L













    field public static final long FIELD_TYPE_SINT64 = 77309411328L; // 0x1200000000L













    field public static final long FIELD_TYPE_STRING = 38654705664L; // 0x900000000L













    field public static final long FIELD_TYPE_UINT32 = 55834574848L; // 0xd00000000L













    field public static final long FIELD_TYPE_UINT64 = 17179869184L; // 0x400000000L













    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













  }

























}



























package android.view {





























  public abstract class AbsSavedState implements android.os.Parcelable {

























api/test-current.txt



+0
−128




























Original line number
Diff line number
Diff line








@@ -4247,138 +4247,10 @@ package android.util.proto {













    method public void writeRawZigZag64(long);















  }





























  public final class ProtoOutputStream extends android.util.proto.ProtoStream {













    ctor public ProtoOutputStream();













    ctor public ProtoOutputStream(int);













    ctor public ProtoOutputStream(java.io.OutputStream);













    ctor public ProtoOutputStream(java.io.FileDescriptor);













    method public static int checkFieldId(long, long);













    method public void dump(String);













    method public void end(long);













    method @Deprecated public void endObject(long);













    method @Deprecated public void endRepeatedObject(long);













    method public void flush();













    method public byte[] getBytes();













    method public int getRawSize();













    method public static long makeFieldId(int, long);













    method public long start(long);













    method @Deprecated public long startObject(long);













    method @Deprecated public long startRepeatedObject(long);













    method public void write(long, double);













    method public void write(long, float);













    method public void write(long, int);













    method public void write(long, long);













    method public void write(long, boolean);













    method public void write(long, String);













    method public void write(long, byte[]);













    method @Deprecated public void writeBool(long, boolean);













    method @Deprecated public void writeBytes(long, byte[]);













    method @Deprecated public void writeDouble(long, double);













    method @Deprecated public void writeEnum(long, int);













    method @Deprecated public void writeFixed32(long, int);













    method @Deprecated public void writeFixed64(long, long);













    method @Deprecated public void writeFloat(long, float);













    method @Deprecated public void writeInt32(long, int);













    method @Deprecated public void writeInt64(long, long);













    method @Deprecated public void writeObject(long, byte[]);













    method @Deprecated public void writePackedBool(long, boolean[]);













    method @Deprecated public void writePackedDouble(long, double[]);













    method @Deprecated public void writePackedEnum(long, int[]);













    method @Deprecated public void writePackedFixed32(long, int[]);













    method @Deprecated public void writePackedFixed64(long, long[]);













    method @Deprecated public void writePackedFloat(long, float[]);













    method @Deprecated public void writePackedInt32(long, int[]);













    method @Deprecated public void writePackedInt64(long, long[]);













    method @Deprecated public void writePackedSFixed32(long, int[]);













    method @Deprecated public void writePackedSFixed64(long, long[]);













    method @Deprecated public void writePackedSInt32(long, int[]);













    method @Deprecated public void writePackedSInt64(long, long[]);













    method @Deprecated public void writePackedUInt32(long, int[]);













    method @Deprecated public void writePackedUInt64(long, long[]);













    method @Deprecated public void writeRepeatedBool(long, boolean);













    method @Deprecated public void writeRepeatedBytes(long, byte[]);













    method @Deprecated public void writeRepeatedDouble(long, double);













    method @Deprecated public void writeRepeatedEnum(long, int);













    method @Deprecated public void writeRepeatedFixed32(long, int);













    method @Deprecated public void writeRepeatedFixed64(long, long);













    method @Deprecated public void writeRepeatedFloat(long, float);













    method @Deprecated public void writeRepeatedInt32(long, int);













    method @Deprecated public void writeRepeatedInt64(long, long);













    method @Deprecated public void writeRepeatedObject(long, byte[]);













    method @Deprecated public void writeRepeatedSFixed32(long, int);













    method @Deprecated public void writeRepeatedSFixed64(long, long);













    method @Deprecated public void writeRepeatedSInt32(long, int);













    method @Deprecated public void writeRepeatedSInt64(long, long);













    method @Deprecated public void writeRepeatedString(long, String);













    method @Deprecated public void writeRepeatedUInt32(long, int);













    method @Deprecated public void writeRepeatedUInt64(long, long);













    method @Deprecated public void writeSFixed32(long, int);













    method @Deprecated public void writeSFixed64(long, long);













    method @Deprecated public void writeSInt32(long, int);













    method @Deprecated public void writeSInt64(long, long);













    method @Deprecated public void writeString(long, String);













    method public void writeTag(int, int);













    method @Deprecated public void writeUInt32(long, int);













    method @Deprecated public void writeUInt64(long, long);













  }





























  public class ProtoParseException extends java.lang.RuntimeException {















    ctor public ProtoParseException(String);















  }





























  public abstract class ProtoStream {













    ctor public ProtoStream();













    method public static int convertObjectIdToOrdinal(int);













    method public static int getDepthFromToken(long);













    method public static String getFieldCountString(long);













    method public static String getFieldIdString(long);













    method public static String getFieldTypeString(long);













    method public static int getObjectIdFromToken(long);













    method public static int getOffsetFromToken(long);













    method public static boolean getRepeatedFromToken(long);













    method public static int getTagSizeFromToken(long);













    method public static String getWireTypeString(int);













    method public static long makeFieldId(int, long);













    method public static long makeToken(int, boolean, int, int, int);













    method public static String token2String(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 = 34359738368L; // 0x800000000L













    field public static final long FIELD_TYPE_BYTES = 51539607552L; // 0xc00000000L













    field public static final long FIELD_TYPE_DOUBLE = 4294967296L; // 0x100000000L













    field public static final long FIELD_TYPE_ENUM = 60129542144L; // 0xe00000000L













    field public static final long FIELD_TYPE_FIXED32 = 30064771072L; // 0x700000000L













    field public static final long FIELD_TYPE_FIXED64 = 25769803776L; // 0x600000000L













    field public static final long FIELD_TYPE_FLOAT = 8589934592L; // 0x200000000L













    field public static final long FIELD_TYPE_INT32 = 21474836480L; // 0x500000000L













    field public static final long FIELD_TYPE_INT64 = 12884901888L; // 0x300000000L













    field public static final long FIELD_TYPE_MASK = 1095216660480L; // 0xff00000000L













    field public static final long FIELD_TYPE_MESSAGE = 47244640256L; // 0xb00000000L













    field protected static final String[] FIELD_TYPE_NAMES;













    field public static final long FIELD_TYPE_SFIXED32 = 64424509440L; // 0xf00000000L













    field public static final long FIELD_TYPE_SFIXED64 = 68719476736L; // 0x1000000000L













    field public static final int FIELD_TYPE_SHIFT = 32; // 0x20













    field public static final long FIELD_TYPE_SINT32 = 73014444032L; // 0x1100000000L













    field public static final long FIELD_TYPE_SINT64 = 77309411328L; // 0x1200000000L













    field public static final long FIELD_TYPE_STRING = 38654705664L; // 0x900000000L













    field public static final long FIELD_TYPE_UINT32 = 55834574848L; // 0xd00000000L













    field public static final long FIELD_TYPE_UINT64 = 17179869184L; // 0x400000000L













    field public static final long FIELD_TYPE_UNKNOWN = 0L; // 0x0L













    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 WireTypeMismatchException extends android.util.proto.ProtoParseException {















    ctor public WireTypeMismatchException(String);















  }

































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



+193
−123


























File changed.
Preview size limit exceeded, changes collapsed.
























core/java/android/util/proto/ProtoStream.java



+304
−18


























File changed.
Preview size limit exceeded, changes collapsed.