From 9a03b116368eab1ace3de834a9ee92a92f2b1b96 Mon Sep 17 00:00:00 2001
From: Jing Ji <jji@google.com>
Date: Mon, 10 May 2021 17:21:42 -0700
Subject: [PATCH] Fix NPE in AppExitInfo statsd logging

Bug: 184859606
Bug: 154511130
Test: statsd_testdrive
Test: atest CtsStatsdAtomHostTestCases:AppExitHostTest
Change-Id: I50193d6dd734bfcc8241aa8d4edf487d742926ec
---
 .../core/java/com/android/server/am/AppExitInfoTracker.java     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/services/core/java/com/android/server/am/AppExitInfoTracker.java b/services/core/java/com/android/server/am/AppExitInfoTracker.java
index da06753ef0f46..1b5483af46ed6 100644
--- a/services/core/java/com/android/server/am/AppExitInfoTracker.java
+++ b/services/core/java/com/android/server/am/AppExitInfoTracker.java
@@ -879,7 +879,7 @@ public final class AppExitInfoTracker {
         if (TextUtils.equals(pkgName, processName)) {
             // Omit the process name here to save space
             processName = null;
-        } else if (processName != null && processName.startsWith(pkgName)) {
+        } else if (processName != null && pkgName != null && processName.startsWith(pkgName)) {
             // Strip the prefix to save space
             processName = processName.substring(pkgName.length());
         }