commit a481b48dcfadc0aeaabeed0d0e35c4117840365d
author Adrian Roos <roosa@google.com> Fri Jan 29 09:21:58 2016 -0800
committer Adrian Roos <roosa@google.com> Fri Jan 29 18:26:56 2016 +0000
tree 2c783e02eb413b101ba83bc3b27513e4b2220f6c
parent 883043b25124afef4352955e2ad328808bede687

Fix NPE when logging a WTF in unknown process

Bug: 26873463
Change-Id: I548c10b43f5784152b9227926aa37170fd9fd78f

services/core/java/com/android/server/am/ActivityManagerService.java

diff --git a/services/core/java/com/android/server/am/ActivityManagerService.java b/services/core/java/com/android/server/am/ActivityManagerService.java
index b5982c3..7dd93d8 100644
--- a/services/core/java/com/android/server/am/ActivityManagerService.java
+++ b/services/core/java/com/android/server/am/ActivityManagerService.java
@@ -12970,9 +12970,11 @@
 
         final StringBuilder sb = new StringBuilder(1024);
         appendDropBoxProcessHeaders(process, processName, sb);
-        sb.append("Foreground: ")
-                .append(process.isInterestingToUserLocked() ? "Yes" : "No")
-                .append("\n");
+        if (process != null) {
+            sb.append("Foreground: ")
+                    .append(process.isInterestingToUserLocked() ? "Yes" : "No")
+                    .append("\n");
+        }
         if (activity != null) {
             sb.append("Activity: ").append(activity.shortComponentName).append("\n");
         }