commit 3668d6bb0076cfa631f05189c6b2c1b9e3ecd7e0
author Andy Hung <hunga@google.com> Tue Dec 03 22:17:33 2019 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Tue Dec 03 22:17:33 2019 +0000
tree a6889db78f919d8f57d6afea1a691780f9a221d0
parent 2ecc61b152e6cee0ca15bb76b753960d1d9378fc
parent eff0d0824c9c087c00153dece27e5dc3f8cd0c15

Merge "MediaMetrics: Fix crash when logging during SystemServer stop"

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();
+                }
             }
         }