diff options
| author | TreeHugger Robot <treehugger-gerrit@google.com> | 2017-05-31 01:07:21 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2017-05-31 01:07:27 +0000 |
| commit | a9873bc8f6df680463f410a8f0f27b9465c9334e (patch) | |
| tree | c83d90abe5a1007f9e1dedae8d619d44e21375a3 /core/java/android | |
| parent | 13eef357d6f22ff29d47239e8c6cf72ad1f417c3 (diff) | |
| parent | c91663674c07781864a062bf9164ec3853269bfb (diff) | |
Merge changes I4b58610f,Ib758756a into oc-dev
* changes:
Turn off the check in the test because the assertion is off in the implementation.
Fix typos that cause infinite recursion and CTS test failure.
Diffstat (limited to 'core/java/android')
| -rw-r--r-- | core/java/android/util/proto/ProtoOutputStream.java | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/core/java/android/util/proto/ProtoOutputStream.java b/core/java/android/util/proto/ProtoOutputStream.java index adf49387a05d..480abc1482a3 100644 --- a/core/java/android/util/proto/ProtoOutputStream.java +++ b/core/java/android/util/proto/ProtoOutputStream.java @@ -1593,7 +1593,7 @@ public final class ProtoOutputStream { assertNotCompacted(); final int id = checkFieldId(fieldId, FIELD_COUNT_REPEATED | FIELD_TYPE_FIXED64); - writeRepeatedFixed64(id, val); + writeRepeatedFixed64Impl(id, val); } private void writeRepeatedFixed64Impl(int id, long val) { @@ -1720,7 +1720,7 @@ public final class ProtoOutputStream { assertNotCompacted(); final int id = checkFieldId(fieldId, FIELD_COUNT_REPEATED | FIELD_TYPE_SFIXED64); - writeRepeatedSFixed64(id, val); + writeRepeatedSFixed64Impl(id, val); } private void writeRepeatedSFixed64Impl(int id, long val) { @@ -1785,7 +1785,7 @@ public final class ProtoOutputStream { assertNotCompacted(); final int id = checkFieldId(fieldId, FIELD_COUNT_REPEATED | FIELD_TYPE_BOOL); - writeRepeatedBool(id, val); + writeRepeatedBoolImpl(id, val); } private void writeRepeatedBoolImpl(int id, boolean val) { |