summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author TreeHugger Robot <treehugger-gerrit@google.com> 2021-01-05 17:23:17 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 2021-01-05 17:23:17 +0000
commit31d0862eca09541eee6a2db6f914087d2ce1f4e4 (patch)
treedb7b3ebef8ccd68130bd128d72e6ec474a671dca
parentb26f201709cb9c7dbd7e14ae7186cc1098bd4332 (diff)
parent179ed2b7d826bfc8826c17d9088283e6156a6346 (diff)
Merge "Fix FastDataOutput performance bug."
-rw-r--r--core/java/com/android/internal/util/FastDataOutput.java3
1 files changed, 1 insertions, 2 deletions
diff --git a/core/java/com/android/internal/util/FastDataOutput.java b/core/java/com/android/internal/util/FastDataOutput.java
index 83d26e181228..cf5b2966d889 100644
--- a/core/java/com/android/internal/util/FastDataOutput.java
+++ b/core/java/com/android/internal/util/FastDataOutput.java
@@ -115,8 +115,7 @@ public class FastDataOutput implements DataOutput, Flushable, Closeable {
// Magnitude of this returned value indicates the number of bytes
// required to encode the string; sign indicates success/failure
- int len = CharsetUtils.toModifiedUtf8Bytes(s, mBufferPtr, mBufferPos + 2,
- mBufferCap - mBufferPos - 2);
+ int len = CharsetUtils.toModifiedUtf8Bytes(s, mBufferPtr, mBufferPos + 2, mBufferCap);
if (Math.abs(len) > MAX_UNSIGNED_SHORT) {
throw new IOException("Modified UTF-8 length too large: " + len);
}