commit 26b034bbe972f4d3a39dc55144ed061b61313d21
author Felipe Leme <felipeal@google.com> Fri Aug 19 23:01:06 2016 +0000
committer android-build-merger <android-build-merger@google.com> Fri Aug 19 23:01:06 2016 +0000
tree 6355640def0f4996b8791d897bd28d1c29579e3b
parent 992e1914ae97a3ea44b433d221ababfeca9155a4
parent ed8a2b011303e2c520b3624835cfe03aae723119

Split 'generating' and 'pulling' in 2 messages.
am: 8206c1caf4

Change-Id: Ief348a2ea6c686c012e9417599ecf58bf62dedc9

bootstat/bootstat.cpp

diff --git a/bootstat/bootstat.cpp b/bootstat/bootstat.cpp
index 26e0ffc..d547c19 100644
--- a/bootstat/bootstat.cpp
+++ b/bootstat/bootstat.cpp
@@ -169,7 +169,19 @@
 void RecordBootComplete() {
   BootEventRecordStore boot_event_store;
   BootEventRecordStore::BootEventRecord record;
+
   time_t uptime = bootstat::ParseUptime();
+  time_t current_time_utc = time(nullptr);
+
+  if (boot_event_store.GetBootEvent("last_boot_time_utc", &record)) {
+    time_t last_boot_time_utc = record.second;
+    time_t time_since_last_boot = difftime(current_time_utc,
+                                           last_boot_time_utc);
+    boot_event_store.AddBootEventWithValue("time_since_last_boot",
+                                           time_since_last_boot);
+  }
+
+  boot_event_store.AddBootEventWithValue("last_boot_time_utc", current_time_utc);
 
   // The boot_complete metric has two variants: boot_complete and
   // ota_boot_complete.  The latter signifies that the device is booting after

rootdir/asan.options

diff --git a/rootdir/asan.options b/rootdir/asan.options
index 70e0eca..d728f12 100644
--- a/rootdir/asan.options
+++ b/rootdir/asan.options
@@ -3,4 +3,5 @@
 alloc_dealloc_mismatch=0
 allocator_may_return_null=1
 detect_container_overflow=0
+abort_on_error=1
 include_if_exists=/system/asan.options.%b