summaryrefslogtreecommitdiff
path: root/libs/binder/BufferedTextOutput.cpp
diff options
context:
space:
mode:
author Yi Kong <yikong@google.com> 2018-06-08 12:44:44 -0700
committer android-build-merger <android-build-merger@google.com> 2018-06-08 12:44:44 -0700
commitaabd6b7fa343654cd85b3b2da392e424d037d15a (patch)
treecbc9fea00e9b67d631bde2bbb70de5b151dfcadc /libs/binder/BufferedTextOutput.cpp
parent83af600986a41b38213e798bba8ea89ad0523096 (diff)
parenta800be8391e6c91501f6bedd48af1abdc63ede0d (diff)
Merge "[binder] Replace NULL/0 with nullptr"
am: a800be8391 Change-Id: I7e118d3def0f9643a79fa9003a89234340d941ea
Diffstat (limited to 'libs/binder/BufferedTextOutput.cpp')
-rw-r--r--libs/binder/BufferedTextOutput.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/libs/binder/BufferedTextOutput.cpp b/libs/binder/BufferedTextOutput.cpp
index 30e70b074e..0946aca876 100644
--- a/libs/binder/BufferedTextOutput.cpp
+++ b/libs/binder/BufferedTextOutput.cpp
@@ -36,7 +36,7 @@ struct BufferedTextOutput::BufferState : public RefBase
{
explicit BufferState(int32_t _seq)
: seq(_seq)
- , buffer(NULL)
+ , buffer(nullptr)
, bufferPos(0)
, bufferSize(0)
, atFront(true)
@@ -266,13 +266,13 @@ BufferedTextOutput::BufferState* BufferedTextOutput::getBuffer() const
if ((mFlags&MULTITHREADED) != 0) {
ThreadState* ts = getThreadState();
if (ts) {
- while (ts->states.size() <= (size_t)mIndex) ts->states.add(NULL);
+ while (ts->states.size() <= (size_t)mIndex) ts->states.add(nullptr);
BufferState* bs = ts->states[mIndex].get();
- if (bs != NULL && bs->seq == mSeq) return bs;
+ if (bs != nullptr && bs->seq == mSeq) return bs;
ts->states.editItemAt(mIndex) = new BufferState(mIndex);
bs = ts->states[mIndex].get();
- if (bs != NULL) return bs;
+ if (bs != nullptr) return bs;
}
}