From: Chenjie Yu <cjyu@google.com>
Date: Mon, 22 Jan 2018 23:10:54 +0000 (-0800)
Subject: Fix flaky crashes caused during LogEvent destroy
X-Git-Tag: android-x86-9.0-r1~251^2~20^2
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=3ca368318ae8909c861e56c7d93035ab344ca10a;p=android-x86%2Fframeworks-base.git

Fix flaky crashes caused during LogEvent destroy

Test: cts tested
Change-Id: I0329a64506b5838d2572cda0d1b86ad78bae4253
---

diff --git a/cmds/statsd/src/logd/LogEvent.cpp b/cmds/statsd/src/logd/LogEvent.cpp
index 6782f3fd6fcf..34fa3c404d10 100644
--- a/cmds/statsd/src/logd/LogEvent.cpp
+++ b/cmds/statsd/src/logd/LogEvent.cpp
@@ -36,13 +36,13 @@ using std::string;
 using android::util::ProtoOutputStream;
 
 LogEvent::LogEvent(log_msg& msg) {
-    android_log_context context =
+    mContext =
             create_android_log_parser(msg.msg() + sizeof(uint32_t), msg.len() - sizeof(uint32_t));
     mTimestampNs = msg.entry_v1.sec * NS_PER_SEC + msg.entry_v1.nsec;
     mLogUid = msg.entry_v4.uid;
-    init(context);
-    if (context) {
-        android_log_destroy(&context);
+    init(mContext);
+    if (mContext) {
+        android_log_destroy(&mContext);
     }
 }