summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--core/jni/android_view_ThreadedRenderer.cpp2
-rw-r--r--libs/hwui/renderthread/CanvasContext.cpp2
-rw-r--r--libs/hwui/tests/macrobench/TestSceneRunner.cpp2
-rw-r--r--libs/hwui/tests/microbench/TaskManagerBench.cpp2
-rw-r--r--libs/hwui/tests/unit/FrameBuilderTests.cpp4
-rw-r--r--libs/hwui/tests/unit/RenderNodeTests.cpp2
-rw-r--r--libs/hwui/utils/TestWindowContext.cpp2
-rw-r--r--services/tests/servicestests/jni/apf_jni.cpp4
-rw-r--r--tools/aapt/Command.cpp2
-rw-r--r--tools/aapt2/compile/XmlIdCollector.cpp2
-rw-r--r--tools/aapt2/link/ManifestFixer.cpp2
-rw-r--r--tools/aapt2/proto/TableProtoDeserializer.cpp2
-rw-r--r--tools/aapt2/split/TableSplitter.cpp2
-rw-r--r--tools/aapt2/unflatten/BinaryResourceParser.cpp2
14 files changed, 16 insertions, 16 deletions
diff --git a/core/jni/android_view_ThreadedRenderer.cpp b/core/jni/android_view_ThreadedRenderer.cpp
index 7717143fbe2a..2b8e1fd92417 100644
--- a/core/jni/android_view_ThreadedRenderer.cpp
+++ b/core/jni/android_view_ThreadedRenderer.cpp
@@ -80,7 +80,7 @@ void onRenderNodeRemoved(JNIEnv* env, RenderNode* node);
class ScopedRemovedRenderNodeObserver : public TreeObserver {
public:
- ScopedRemovedRenderNodeObserver(JNIEnv* env) : mEnv(env) {}
+ explicit ScopedRemovedRenderNodeObserver(JNIEnv* env) : mEnv(env) {}
~ScopedRemovedRenderNodeObserver() {
for (auto& node : mMaybeRemovedNodes) {
if (node->hasParents()) continue;
diff --git a/libs/hwui/renderthread/CanvasContext.cpp b/libs/hwui/renderthread/CanvasContext.cpp
index e6399d4ec789..18cecc2231a8 100644
--- a/libs/hwui/renderthread/CanvasContext.cpp
+++ b/libs/hwui/renderthread/CanvasContext.cpp
@@ -762,7 +762,7 @@ void CanvasContext::waitOnFences() {
class CanvasContext::FuncTaskProcessor : public TaskProcessor<bool> {
public:
- FuncTaskProcessor(Caches& caches)
+ explicit FuncTaskProcessor(Caches& caches)
: TaskProcessor<bool>(&caches.tasks) {}
virtual void onProcess(const sp<Task<bool> >& task) override {
diff --git a/libs/hwui/tests/macrobench/TestSceneRunner.cpp b/libs/hwui/tests/macrobench/TestSceneRunner.cpp
index c5af06160b62..807cf73d3aab 100644
--- a/libs/hwui/tests/macrobench/TestSceneRunner.cpp
+++ b/libs/hwui/tests/macrobench/TestSceneRunner.cpp
@@ -41,7 +41,7 @@ public:
template<class T>
class ModifiedMovingAverage {
public:
- ModifiedMovingAverage(int weight) : mWeight(weight) {}
+ explicit ModifiedMovingAverage(int weight) : mWeight(weight) {}
T add(T today) {
if (!mHasValue) {
diff --git a/libs/hwui/tests/microbench/TaskManagerBench.cpp b/libs/hwui/tests/microbench/TaskManagerBench.cpp
index c6b9f3bca55f..cf47f273c144 100644
--- a/libs/hwui/tests/microbench/TaskManagerBench.cpp
+++ b/libs/hwui/tests/microbench/TaskManagerBench.cpp
@@ -29,7 +29,7 @@ class TrivialTask : public Task<char> {};
class TrivialProcessor : public TaskProcessor<char> {
public:
- TrivialProcessor(TaskManager* manager)
+ explicit TrivialProcessor(TaskManager* manager)
: TaskProcessor(manager) {}
virtual ~TrivialProcessor() {}
virtual void onProcess(const sp<Task<char> >& task) override {
diff --git a/libs/hwui/tests/unit/FrameBuilderTests.cpp b/libs/hwui/tests/unit/FrameBuilderTests.cpp
index 0f16b1512586..103f15613981 100644
--- a/libs/hwui/tests/unit/FrameBuilderTests.cpp
+++ b/libs/hwui/tests/unit/FrameBuilderTests.cpp
@@ -1919,7 +1919,7 @@ static void testProperty(std::function<void(RenderProperties&)> propSetupCallbac
std::function<void(const RectOp&, const BakedOpState&)> opValidateCallback) {
class PropertyTestRenderer : public TestRendererBase {
public:
- PropertyTestRenderer(std::function<void(const RectOp&, const BakedOpState&)> callback)
+ explicit PropertyTestRenderer(std::function<void(const RectOp&, const BakedOpState&)> callback)
: mCallback(callback) {}
void onRectOp(const RectOp& op, const BakedOpState& state) override {
EXPECT_EQ(mIndex++, 0);
@@ -2040,7 +2040,7 @@ void testSaveLayerAlphaClip(SaveLayerAlphaData* outObservedData,
std::function<void(RenderProperties&)> propSetupCallback) {
class SaveLayerAlphaClipTestRenderer : public TestRendererBase {
public:
- SaveLayerAlphaClipTestRenderer(SaveLayerAlphaData* outData)
+ explicit SaveLayerAlphaClipTestRenderer(SaveLayerAlphaData* outData)
: mOutData(outData) {}
OffscreenBuffer* startTemporaryLayer(uint32_t width, uint32_t height) override {
diff --git a/libs/hwui/tests/unit/RenderNodeTests.cpp b/libs/hwui/tests/unit/RenderNodeTests.cpp
index b2997dfb357f..43ee65482b6e 100644
--- a/libs/hwui/tests/unit/RenderNodeTests.cpp
+++ b/libs/hwui/tests/unit/RenderNodeTests.cpp
@@ -55,7 +55,7 @@ TEST(RenderNode, hasParents) {
TEST(RenderNode, releasedCallback) {
class DecRefOnReleased : public GlFunctorLifecycleListener {
public:
- DecRefOnReleased(int* refcnt) : mRefCnt(refcnt) {}
+ explicit DecRefOnReleased(int* refcnt) : mRefCnt(refcnt) {}
void onGlFunctorReleased(Functor* functor) override {
*mRefCnt -= 1;
}
diff --git a/libs/hwui/utils/TestWindowContext.cpp b/libs/hwui/utils/TestWindowContext.cpp
index c88549173219..eba676944e28 100644
--- a/libs/hwui/utils/TestWindowContext.cpp
+++ b/libs/hwui/utils/TestWindowContext.cpp
@@ -58,7 +58,7 @@ class TestWindowContext::TestWindowData {
public:
- TestWindowData(SkISize size) : mSize(size) {
+ explicit TestWindowData(SkISize size) : mSize(size) {
android::BufferQueue::createBufferQueue(&mProducer, &mConsumer);
mCpuConsumer = new android::CpuConsumer(mConsumer, 1);
mCpuConsumer->setName(android::String8("TestWindowContext"));
diff --git a/services/tests/servicestests/jni/apf_jni.cpp b/services/tests/servicestests/jni/apf_jni.cpp
index 7d142eb76b95..19819ac47cb6 100644
--- a/services/tests/servicestests/jni/apf_jni.cpp
+++ b/services/tests/servicestests/jni/apf_jni.cpp
@@ -39,7 +39,7 @@ static jint com_android_server_ApfTest_apfSimulate(
class ScopedPcap {
public:
- ScopedPcap(pcap_t* pcap) : pcap_ptr(pcap) {}
+ explicit ScopedPcap(pcap_t* pcap) : pcap_ptr(pcap) {}
~ScopedPcap() {
pcap_close(pcap_ptr);
}
@@ -51,7 +51,7 @@ class ScopedPcap {
class ScopedFILE {
public:
- ScopedFILE(FILE* fp) : file(fp) {}
+ explicit ScopedFILE(FILE* fp) : file(fp) {}
~ScopedFILE() {
fclose(file);
}
diff --git a/tools/aapt/Command.cpp b/tools/aapt/Command.cpp
index 9976d00fa872..447ace6e4e47 100644
--- a/tools/aapt/Command.cpp
+++ b/tools/aapt/Command.cpp
@@ -494,7 +494,7 @@ struct ImpliedFeature {
struct Feature {
Feature() : required(false), version(-1) {}
- Feature(bool required, int32_t version = -1) : required(required), version(version) {}
+ explicit Feature(bool required, int32_t version = -1) : required(required), version(version) {}
/**
* Whether the feature is required.
diff --git a/tools/aapt2/compile/XmlIdCollector.cpp b/tools/aapt2/compile/XmlIdCollector.cpp
index f40689eaeb47..9fc979c34353 100644
--- a/tools/aapt2/compile/XmlIdCollector.cpp
+++ b/tools/aapt2/compile/XmlIdCollector.cpp
@@ -35,7 +35,7 @@ struct IdCollector : public xml::Visitor {
std::vector<SourcedResourceName>* mOutSymbols;
- IdCollector(std::vector<SourcedResourceName>* outSymbols) : mOutSymbols(outSymbols) {
+ explicit IdCollector(std::vector<SourcedResourceName>* outSymbols) : mOutSymbols(outSymbols) {
}
void visit(xml::Element* element) override {
diff --git a/tools/aapt2/link/ManifestFixer.cpp b/tools/aapt2/link/ManifestFixer.cpp
index 953e87e104be..4d8c5fbd2039 100644
--- a/tools/aapt2/link/ManifestFixer.cpp
+++ b/tools/aapt2/link/ManifestFixer.cpp
@@ -220,7 +220,7 @@ class FullyQualifiedClassNameVisitor : public xml::Visitor {
public:
using xml::Visitor::visit;
- FullyQualifiedClassNameVisitor(const StringPiece16& package) : mPackage(package) {
+ explicit FullyQualifiedClassNameVisitor(const StringPiece16& package) : mPackage(package) {
}
void visit(xml::Element* el) override {
diff --git a/tools/aapt2/proto/TableProtoDeserializer.cpp b/tools/aapt2/proto/TableProtoDeserializer.cpp
index 82e4fb0146ab..6489b8615520 100644
--- a/tools/aapt2/proto/TableProtoDeserializer.cpp
+++ b/tools/aapt2/proto/TableProtoDeserializer.cpp
@@ -30,7 +30,7 @@ class ReferenceIdToNameVisitor : public ValueVisitor {
public:
using ValueVisitor::visit;
- ReferenceIdToNameVisitor(const std::map<ResourceId, ResourceNameRef>* mapping) :
+ explicit ReferenceIdToNameVisitor(const std::map<ResourceId, ResourceNameRef>* mapping) :
mMapping(mapping) {
assert(mMapping);
}
diff --git a/tools/aapt2/split/TableSplitter.cpp b/tools/aapt2/split/TableSplitter.cpp
index 4bfdb1205e19..2dfe2a239900 100644
--- a/tools/aapt2/split/TableSplitter.cpp
+++ b/tools/aapt2/split/TableSplitter.cpp
@@ -40,7 +40,7 @@ static ConfigDescription copyWithoutDensity(const ConfigDescription& config) {
*/
class SplitValueSelector {
public:
- SplitValueSelector(const SplitConstraints& constraints) {
+ explicit SplitValueSelector(const SplitConstraints& constraints) {
for (const ConfigDescription& config : constraints.configs) {
if (config.density == 0) {
mDensityIndependentConfigs.insert(config);
diff --git a/tools/aapt2/unflatten/BinaryResourceParser.cpp b/tools/aapt2/unflatten/BinaryResourceParser.cpp
index ec4675167676..5cd1c8b47ede 100644
--- a/tools/aapt2/unflatten/BinaryResourceParser.cpp
+++ b/tools/aapt2/unflatten/BinaryResourceParser.cpp
@@ -47,7 +47,7 @@ private:
public:
using ValueVisitor::visit;
- ReferenceIdToNameVisitor(const std::map<ResourceId, ResourceName>* mapping) :
+ explicit ReferenceIdToNameVisitor(const std::map<ResourceId, ResourceName>* mapping) :
mMapping(mapping) {
assert(mMapping);
}