diff options
| author | Chih-Hung Hsieh <chh@google.com> | 2019-01-14 14:16:59 -0800 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2019-01-14 14:16:59 -0800 |
| commit | cd06f9ee04750c886d0a4d64cf49e938b57df75a (patch) | |
| tree | 7afe9c85f97da33cdaf0c72a4d15243d23e7fb40 /libs/androidfw/AttributeResolution.cpp | |
| parent | d887e0f5f97ef81f98d829e59944ca0bf3d79e76 (diff) | |
| parent | 99a3d72b9855c96b3a1c96aa87f36b6bf3908635 (diff) | |
Merge "Fix/suppress androidfw google-explicit-constructor warnings" am: 392f0052c2
am: 99a3d72b98
Change-Id: Icb12400292dae8ed091f1a55eb2f0a7e50e84667
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 f912af4f7190..2fcecf252a26 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) { } |