Merge "Fix NPE in AppExitInfo statsd logging" into sc-dev

2021-05-11 01:43:50 +00:00
parent 7b32d78264 9a03b11636
commit a5d90cd21a
1 changed files with 1 additions and 1 deletions
--- 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());
        }