resolve merge conflicts of 0b77cb9fa6941163c4a4099471bef6ef564c0ffe to oc-mr1-dev-plus-aosp
Test: I solemnly swear I tested this conflict resolution.
Change-Id: If51b3d48a3553b81ad7aa79764e649debc844cac
diff --git a/common/hardware_interface.h b/common/hardware_interface.h
index c9e2f85..94442d1 100644
--- a/common/hardware_interface.h
+++ b/common/hardware_interface.h
@@ -94,6 +94,15 @@
// Returns the timestamp of the current OS build.
virtual int64_t GetBuildTimestamp() const = 0;
+
+ // Returns whether the first active ping was sent to Omaha at some point, and
+ // that the value is persisted across recovery (and powerwash) once set with
+ // |SetFirstActiveOmahaPingSent()|.
+ virtual bool GetFirstActiveOmahaPingSent() const = 0;
+
+ // Persist the fact that first active ping was sent to omaha. It bails out if
+ // it fails.
+ virtual void SetFirstActiveOmahaPingSent() = 0;
};
} // namespace chromeos_update_engine