commit 3133c401cd34e3c75b25320b50566c93494310a7
author Dianne Hackborn <hackbod@google.com> Fri Aug 29 12:53:07 2014 -0700
committer Dianne Hackborn <hackbod@google.com> Fri Aug 29 13:59:11 2014 -0700
tree b47b965ce2cc487f254ea155175ee9ba5dfe9f7f
parent 78358b17885cfb99f359f54c11565c0c3a998928

Fix issue #17329290: NPE during ContentProviderRecord.dump()

Don't NPE.

Change-Id: I5e59583e97b969b1739fc39a1520bd1930302313

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

diff --git a/services/core/java/com/android/server/am/ContentProviderRecord.java b/services/core/java/com/android/server/am/ContentProviderRecord.java
index ff22764..a37249d 100644
--- a/services/core/java/com/android/server/am/ContentProviderRecord.java
+++ b/services/core/java/com/android/server/am/ContentProviderRecord.java
@@ -166,8 +166,16 @@
         }
         if (full) {
             if (hasExternalProcessHandles()) {
-                pw.print(prefix); pw.print("externals=");
-                        pw.println(externalProcessTokenToHandle.size());
+                pw.print(prefix); pw.print("externals:");
+                if (externalProcessTokenToHandle != null) {
+                    pw.print(" w/token=");
+                    pw.print(externalProcessTokenToHandle.size());
+                }
+                if (externalProcessNoHandleCount > 0) {
+                    pw.print(" notoken=");
+                    pw.print(externalProcessNoHandleCount);
+                }
+                pw.println();
             }
         } else {
             if (connections.size() > 0 || externalProcessNoHandleCount > 0) {