commit eff0d0824c9c087c00153dece27e5dc3f8cd0c15
author Andy Hung <hunga@google.com> Tue Dec 03 12:23:45 2019 -0800
committer Andy Hung <hunga@google.com> Tue Dec 03 12:48:44 2019 -0800
tree 4652bccc0062303e7c99bd6faec7cfb8328495b5
parent 15ccc647468f14ffedf5a6e5eda7290f0131f358

MediaMetrics: Fix crash when logging during SystemServer stop

Test: adb shell stop / start many times
Bug: 144864166
Change-Id: Ieed2d6edcdc2a0ff92ae4a3a373c56788abff4d3

services/mediaanalytics/MediaAnalyticsService.cpp

diff --git a/services/mediaanalytics/MediaAnalyticsService.cpp b/services/mediaanalytics/MediaAnalyticsService.cpp
index 1ed8b74..f1e9af7 100644
--- a/services/mediaanalytics/MediaAnalyticsService.cpp
+++ b/services/mediaanalytics/MediaAnalyticsService.cpp
@@ -489,9 +489,10 @@
             if (!status.isOk()) {
                 ALOGE("%s: getNamesForUids failed: %s",
                         __func__, status.exceptionMessage().c_str());
-            }
-            if (!names[0].empty()) {
-                pkg = names[0].c_str();
+            } else {
+                if (!names[0].empty()) {
+                    pkg = names[0].c_str();
+                }
             }
         }