diff options
author | Yao Chen <yaochen@google.com> | 2019-05-08 21:31:04 +0000 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2019-05-08 21:31:04 +0000 |
commit | a8a18f6d3237b622305ad4e55b37f59acd9cafb7 (patch) | |
tree | 7b1b0bef9d7f110b508a4708f0045dbdf87cfa79 /libs | |
parent | 5c96be454f6686e3be5f31a20ab05a0198b0393a (diff) | |
parent | a51f3fa6fed47604361981bacf1f0b78fd75f645 (diff) | |
download | base-a8a18f6d3237b622305ad4e55b37f59acd9cafb7.tar.gz |
Merge "Remove encryption from incidentd" into qt-dev
Diffstat (limited to 'libs')
-rw-r--r-- | libs/protoutil/src/ProtoFileReader.cpp | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/libs/protoutil/src/ProtoFileReader.cpp b/libs/protoutil/src/ProtoFileReader.cpp index c7f1129fbbaa..bbb1fe374f0e 100644 --- a/libs/protoutil/src/ProtoFileReader.cpp +++ b/libs/protoutil/src/ProtoFileReader.cpp @@ -99,7 +99,6 @@ ProtoFileReader::next() // Shouldn't get to here. Always call hasNext() before calling next(). return 0; } - mPos++; return mBuffer[mOffset++]; } @@ -131,7 +130,6 @@ ProtoFileReader::move(size_t amt) const size_t chunk = mMaxOffset - mOffset > amt ? amt : mMaxOffset - mOffset; mOffset += chunk; - mPos += chunk; amt -= chunk; } } |