Fix NPE in DropBoxManagerService.dump()
Bug: 18374803
Change-Id: Id1f66a0887d1584f97b127e837a4fad31f7d9d57
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) {