commit a710c7444b1a17b3fc9b2abf4fba0987482d6c47
author Jeff Sharkey <jsharkey@android.com> Fri Nov 14 22:00:54 2014 +0000
committer Android Git Automerger <android-git-automerger@android.com> Fri Nov 14 22:00:54 2014 +0000
tree 3aa517ccd807e33a170957c23dfa98ef83576fca
parent 0a39f8ffe012e43f16836b057f3f0d1bc05158f3
parent 9fb00cb428f3d4b0241490146f4d5a7b75fc552e

am 9fb00cb4: am 17fe99ac: Merge "Fix NPE in DropBoxManagerService.dump()" into lmp-mr1-dev automerge: bec816a

* commit '9fb00cb428f3d4b0241490146f4d5a7b75fc552e':
  Fix NPE in DropBoxManagerService.dump()

services/core/java/com/android/server/DropBoxManagerService.java

diff --git a/services/core/java/com/android/server/DropBoxManagerService.java b/services/core/java/com/android/server/DropBoxManagerService.java
index 29b04da..a44cb72 100644
--- a/services/core/java/com/android/server/DropBoxManagerService.java
+++ b/services/core/java/com/android/server/DropBoxManagerService.java
@@ -408,9 +408,14 @@
                         if (!newline) out.append("\n");
                     } else {
                         String text = dbe.getText(70);
-                        boolean truncated = (text.length() == 70);
-                        out.append("    ").append(text.trim().replace('\n', '/'));
-                        if (truncated) out.append(" ...");
+                        out.append("    ");
+                        if (text == null) {
+                            out.append("[null]");
+                        } else {
+                            boolean truncated = (text.length() == 70);
+                            out.append(text.trim().replace('\n', '/'));
+                            if (truncated) out.append(" ...");
+                        }
                         out.append("\n");
                     }
                 } catch (IOException e) {