aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBrian Duff <bduff@google.com>2015-02-17 17:58:47 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2015-02-17 17:58:47 +0000
commitf1c606d95efbfdb7a028dff14f9e8773d30a63b4 (patch)
treec46150edae5057d78548ca05881e6120e3aa6c3c
parent7304898f86cd6b2e525772e9cda4ba686b7d3fd2 (diff)
parent971aedc78cbafac28e521808710574803708202f (diff)
downloadexternal_protobuf-f1c606d95efbfdb7a028dff14f9e8773d30a63b4.zip
external_protobuf-f1c606d95efbfdb7a028dff14f9e8773d30a63b4.tar.gz
external_protobuf-f1c606d95efbfdb7a028dff14f9e8773d30a63b4.tar.bz2
am 971aedc7: Merge "Add reset() and position() to CodedOutputByteBufferNano."
* commit '971aedc78cbafac28e521808710574803708202f': Add reset() and position() to CodedOutputByteBufferNano.
-rw-r--r--java/src/main/java/com/google/protobuf/nano/CodedOutputByteBufferNano.java17
1 files changed, 17 insertions, 0 deletions
diff --git a/java/src/main/java/com/google/protobuf/nano/CodedOutputByteBufferNano.java b/java/src/main/java/com/google/protobuf/nano/CodedOutputByteBufferNano.java
index bedd238..324a63f 100644
--- a/java/src/main/java/com/google/protobuf/nano/CodedOutputByteBufferNano.java
+++ b/java/src/main/java/com/google/protobuf/nano/CodedOutputByteBufferNano.java
@@ -898,6 +898,23 @@ public final class CodedOutputByteBufferNano {
}
/**
+ * Returns the position within the internal buffer.
+ */
+ public int position() {
+ return buffer.position();
+ }
+
+ /**
+ * Resets the position within the internal buffer to zero.
+ *
+ * @see #position
+ * @see #spaceLeft
+ */
+ public void reset() {
+ buffer.clear();
+ }
+
+ /**
* If you create a CodedOutputStream around a simple flat array, you must
* not attempt to write more bytes than the array has space. Otherwise,
* this exception will be thrown.