commit dff3e5f392da1374eafc2a83641b55b885cadcbd
author Elliott Hughes <enh@google.com> Wed Jan 20 01:29:12 2016 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Wed Jan 20 01:29:12 2016 +0000
tree 1ffda1ee99b6d431e8c620218a7ee5957fdac14d
parent a04d75b30e3f5c2d46762bf6847132254124762a
parent 05dfeaf2aea4f2985b6252de300bf3cf2931d22b

Merge "bootstat: Fix the base includes to be AOSP-friendly."

logd/LogBuffer.cpp

diff --git a/logd/LogBuffer.cpp b/logd/LogBuffer.cpp
index cdf5d08..9e0d451 100644
--- a/logd/LogBuffer.cpp
+++ b/logd/LogBuffer.cpp
@@ -332,13 +332,21 @@
         }
     }
 
-    bool setLast = mLastSet[id] && (it == mLast[id]);
+    bool setLast[LOG_ID_MAX];
+    bool doSetLast = false;
+    log_id_for_each(i) {
+        doSetLast |= setLast[i] = mLastSet[i] && (it == mLast[i]);
+    }
     it = mLogElements.erase(it);
-    if (setLast) {
-        if (it == mLogElements.end()) { // unlikely
-            mLastSet[id] = false;
-        } else {
-            mLast[id] = it;
+    if (doSetLast) {
+        log_id_for_each(i) {
+            if (setLast[i]) {
+                if (it == mLogElements.end()) { // unlikely
+                    mLastSet[i] = false;
+                } else {
+                    mLast[i] = it;
+                }
+            }
         }
     }
     if (coalesce) {

metricsd/uploader/upload_service.cc

diff --git a/metricsd/uploader/upload_service.cc b/metricsd/uploader/upload_service.cc
index ab44b28..0dc59a4 100644
--- a/metricsd/uploader/upload_service.cc
+++ b/metricsd/uploader/upload_service.cc
@@ -90,6 +90,7 @@
 
 void UploadService::OnShutdown(int* exit_code) {
   metricsd_service_runner_.Stop();
+  PersistToDisk();
 }
 
 void UploadService::InitForTest(SystemProfileSetter* setter) {