Snap for 9556825 from fe94a87a6437fe218c8e0dc58aa608ce197f2f68 to mainline-adservices-releaseaml_ads_331611190

Change-Id: Ibbe245821d0de8caf3f1ac3b6b9f3c9248240c55

1 files changed, 15 insertions, 7 deletions

diff --git a/statsd/src/matchers/SimpleAtomMatchingTracker.cpp b/statsd/src/matchers/SimpleAtomMatchingTracker.cpp
index 76bd4761..a0e30b24 100644
--- a/statsd/src/matchers/SimpleAtomMatchingTracker.cpp
+++ b/statsd/src/matchers/SimpleAtomMatchingTracker.cpp
@@ -42,20 +42,28 @@ SimpleAtomMatchingTracker::SimpleAtomMatchingTracker(const int64_t& id, const in
 SimpleAtomMatchingTracker::~SimpleAtomMatchingTracker() {
 }
 
-bool SimpleAtomMatchingTracker::init(const vector<AtomMatcher>& allAtomMatchers,
-                                     const vector<sp<AtomMatchingTracker>>& allAtomMatchingTrackers,
-                                     const unordered_map<int64_t, int>& matcherMap,
-                                     vector<bool>& stack) {
+optional<InvalidConfigReason> SimpleAtomMatchingTracker::init(
+        const vector<AtomMatcher>& allAtomMatchers,
+        const vector<sp<AtomMatchingTracker>>& allAtomMatchingTrackers,
+        const unordered_map<int64_t, int>& matcherMap, vector<bool>& stack) {
     // no need to do anything.
-    return mInitialized;
+    if (!mInitialized) {
+        return createInvalidConfigReasonWithMatcher(
+                INVALID_CONFIG_REASON_MATCHER_TRACKER_NOT_INITIALIZED, mId);
+    }
+    return nullopt;
 }
 
-bool SimpleAtomMatchingTracker::onConfigUpdated(
+optional<InvalidConfigReason> SimpleAtomMatchingTracker::onConfigUpdated(
         const AtomMatcher& matcher, const int index,
         const unordered_map<int64_t, int>& atomMatchingTrackerMap) {
     mIndex = index;
     // Do not need to update mMatcher since the matcher must be identical across the update.
-    return mInitialized;
+    if (!mInitialized) {
+        return createInvalidConfigReasonWithMatcher(
+                INVALID_CONFIG_REASON_MATCHER_TRACKER_NOT_INITIALIZED, mId);
+    }
+    return nullopt;
 }
 
 void SimpleAtomMatchingTracker::onLogEvent(