Merge "incidentd: dumping jobscheduler to proto" (6b7bf947) · Commits · e / os / android_frameworks_base

core/java/android/content/ClipData.java

+42 −1

Original line number	Diff line number	Diff line
		@@ -34,16 +34,18 @@ import android.text.Spanned;
		import android.text.TextUtils;
		import android.text.style.URLSpan;
		import android.util.Log;
		import android.util.proto.ProtoOutputStream;

		import com.android.internal.util.ArrayUtils;

		import libcore.io.IoUtils;

		import java.io.FileInputStream;
		import java.io.FileNotFoundException;
		import java.io.IOException;
		import java.io.InputStreamReader;
		import java.util.ArrayList;
		import java.util.List;
		import libcore.io.IoUtils;

		/**
		* Representation of a clipped data on the clipboard.
		@@ -665,6 +667,25 @@ public class ClipData implements Parcelable {
		b.append("NULL");
		}
		}

		/** @hide */
		public void writeToProto(ProtoOutputStream proto, long fieldId) {
		final long token = proto.start(fieldId);

		if (mHtmlText != null) {
		proto.write(ClipDataProto.Item.HTML_TEXT, mHtmlText);
		} else if (mText != null) {
		proto.write(ClipDataProto.Item.TEXT, mText.toString());
		} else if (mUri != null) {
		proto.write(ClipDataProto.Item.URI, mUri.toString());
		} else if (mIntent != null) {
		mIntent.writeToProto(proto, ClipDataProto.Item.INTENT, true, true, true, true);
		} else {
		proto.write(ClipDataProto.Item.NOTHING, true);
		}

		proto.end(token);
		}
		}

		/**
		@@ -1047,6 +1068,26 @@ public class ClipData implements Parcelable {
		}
		}

		/** @hide */
		public void writeToProto(ProtoOutputStream proto, long fieldId) {
		final long token = proto.start(fieldId);

		if (mClipDescription != null) {
		mClipDescription.writeToProto(proto, ClipDataProto.DESCRIPTION);
		}
		if (mIcon != null) {
		final long iToken = proto.start(ClipDataProto.ICON);
		proto.write(ClipDataProto.Icon.WIDTH, mIcon.getWidth());
		proto.write(ClipDataProto.Icon.HEIGHT, mIcon.getHeight());
		proto.end(iToken);
		}
		for (int i = 0; i < mItems.size(); i++) {
		mItems.get(i).writeToProto(proto, ClipDataProto.ITEMS);
		}

		proto.end(token);
		}

		/** @hide */
		public void collectUris(List<Uri> out) {
		for (int i = 0; i < mItems.size(); ++i) {

core/java/android/content/ClipDescription.java

+23 −0

Original line number	Diff line number	Diff line
		@@ -21,6 +21,7 @@ import android.os.Parcelable;
		import android.os.PersistableBundle;
		import android.text.TextUtils;
		import android.util.TimeUtils;
		import android.util.proto.ProtoOutputStream;

		import java.util.ArrayList;
		import java.util.Arrays;
		@@ -337,6 +338,28 @@ public class ClipDescription implements Parcelable {
		return !first;
		}

		/** @hide */
		public void writeToProto(ProtoOutputStream proto, long fieldId) {
		final long token = proto.start(fieldId);

		final int size = mMimeTypes.size();
		for (int i = 0; i < size; i++) {
		proto.write(ClipDescriptionProto.MIME_TYPES, mMimeTypes.get(i));
		}

		if (mLabel != null) {
		proto.write(ClipDescriptionProto.LABEL, mLabel.toString());
		}
		if (mExtras != null) {
		mExtras.writeToProto(proto, ClipDescriptionProto.EXTRAS);
		}
		if (mTimeStamp > 0) {
		proto.write(ClipDescriptionProto.TIMESTAMP_MS, mTimeStamp);
		}

		proto.end(token);
		}

		@Override
		public int describeContents() {
		return 0;

core/java/android/content/ComponentName.java

+3 −1

Original line number	Diff line number	Diff line
		@@ -284,9 +284,11 @@ public final class ComponentName implements Parcelable, Cloneable, Comparable<Co
		}

		/** Put this here so that individual services don't have to reimplement this. @hide */
		public void toProto(ProtoOutputStream proto) {
		public void writeToProto(ProtoOutputStream proto, long fieldId) {
		final long token = proto.start(fieldId);
		proto.write(ComponentNameProto.PACKAGE_NAME, mPackage);
		proto.write(ComponentNameProto.CLASS_NAME, mClass);
		proto.end(token);
		}

		@Override

core/java/android/content/Intent.java

+6 −0

Original line number	Diff line number	Diff line
		@@ -9409,6 +9409,12 @@ public class Intent implements Parcelable, Cloneable {
		}
		}

		/** @hide */
		public void writeToProto(ProtoOutputStream proto, long fieldId) {
		// Same input parameters that toString() gives to toShortString().
		writeToProto(proto, fieldId, true, true, true, false);
		}

		/** @hide */
		public void writeToProto(ProtoOutputStream proto, long fieldId, boolean secure, boolean comp,
		boolean extras, boolean clip) {

core/java/android/net/Network.java

+8 −0

Original line number	Diff line number	Diff line
		@@ -21,6 +21,7 @@ import android.os.Parcelable;
		import android.system.ErrnoException;
		import android.system.Os;
		import android.system.OsConstants;
		import android.util.proto.ProtoOutputStream;

		import com.android.okhttp.internalandroidapi.Dns;
		import com.android.okhttp.internalandroidapi.HttpURLConnectionFactory;
		@@ -402,4 +403,11 @@ public class Network implements Parcelable {
		public String toString() {
		return Integer.toString(netId);
		}

		/** @hide */
		public void writeToProto(ProtoOutputStream proto, long fieldId) {
		final long token = proto.start(fieldId);
		proto.write(NetworkProto.NET_ID, netId);
		proto.end(token);
		}
		}