diff options
author | Chih-Hung Hsieh <chh@google.com> | 2019-01-14 14:58:22 -0800 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2019-01-14 14:58:22 -0800 |
commit | bc807065993c2d37670443ddc6f41c06b55cc5d7 (patch) | |
tree | c39a71c10c7e409bdc4d80d03486605b4b9351e9 /libs/androidfw/AttributeResolution.cpp | |
parent | 1c2ceb24ed5cbcf1843fba78c357ac3fa01bdb6a (diff) | |
parent | cd06f9ee04750c886d0a4d64cf49e938b57df75a (diff) |
Merge "Fix/suppress androidfw google-explicit-constructor warnings" am: 392f0052c2 am: 99a3d72b98
am: cd06f9ee04
Change-Id: I0340acdbd6530f9bd9f67333974bcc65ff97e0e5
Diffstat (limited to 'libs/androidfw/AttributeResolution.cpp')
-rw-r--r-- | libs/androidfw/AttributeResolution.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libs/androidfw/AttributeResolution.cpp b/libs/androidfw/AttributeResolution.cpp index 57e3491895e6..3dc1f2cd56c5 100644 --- a/libs/androidfw/AttributeResolution.cpp +++ b/libs/androidfw/AttributeResolution.cpp @@ -51,7 +51,7 @@ class XmlAttributeFinder class BagAttributeFinder : public BackTrackingAttributeFinder<BagAttributeFinder, const ResolvedBag::Entry*> { public: - BagAttributeFinder(const ResolvedBag* bag) + explicit BagAttributeFinder(const ResolvedBag* bag) : BackTrackingAttributeFinder(bag != nullptr ? bag->entries : nullptr, bag != nullptr ? bag->entries + bag->entry_count : nullptr) { } |