Merge "Fix NPE in DropBoxManagerService.dump()" into lmp-mr1-dev (17fe99ac) · Commits · e / os / android_frameworks_base

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

+8 −3

Original line number	Original line	Diff line number	Diff line
	@@ -408,9 +408,14 @@ public final class DropBoxManagerService extends IDropBoxManagerService.Stub {
	if (!newline) out.append("\n");		if (!newline) out.append("\n");
	} else {		} else {
	String text = dbe.getText(70);		String text = dbe.getText(70);
			out.append(" ");
			if (text == null) {
			out.append("[null]");
			} else {
	boolean truncated = (text.length() == 70);		boolean truncated = (text.length() == 70);
	out.append(" ").append(text.trim().replace('\n', '/'));		out.append(text.trim().replace('\n', '/'));
	if (truncated) out.append(" ...");		if (truncated) out.append(" ...");
			}
	out.append("\n");		out.append("\n");
	}		}
	} catch (IOException e) {		} catch (IOException e) {