Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a710c744 authored by Jeff Sharkey's avatar Jeff Sharkey Committed by Android Git Automerger
Browse files

am 9fb00cb4: am 17fe99ac: Merge "Fix NPE in DropBoxManagerService.dump()" into... 

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

* commit '9fb00cb4':
  Fix NPE in DropBoxManagerService.dump()
parents 0a39f8ff 9fb00cb4

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

+8 −3
Original line number Diff line number Diff line
@@ -408,9 +408,14 @@ public final class DropBoxManagerService extends IDropBoxManagerService.Stub { 
                        if (!newline) out.append("\n");

                    } else {

                        String text = dbe.getText(70);

                        out.append("    ");

                        if (text == null) {

                            out.append("[null]");

                        } else {

                            boolean truncated = (text.length() == 70);

                        out.append("    ").append(text.trim().replace('\n', '/'));

                            out.append(text.trim().replace('\n', '/'));

                            if (truncated) out.append(" ...");

                        }

                        out.append("\n");

                    }

                } catch (IOException e) {