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

Commit 895c12fa authored by Jeff Sharkey's avatar Jeff Sharkey Committed by Automerger Merge Worker
Browse files

Merge "Add dropbox entries as files to dumpstate ZIP." am: d63b06b4 am: 4c3ff4d9 am: e142623a 

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2422779



Change-Id: I31b0791f037ccbcbd97215f6db02a85a9541d815
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 7357be30 e142623a

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

+1 −12
Original line number Diff line number Diff line
@@ -723,7 +723,7 @@ public final class DropBoxManagerService extends SystemService { 
                out.append(file.getPath()).append("\n");

            }



            if ((entry.flags & DropBoxManager.IS_TEXT) != 0 && (doPrint || !doFile)) {

            if ((entry.flags & DropBoxManager.IS_TEXT) != 0 && doPrint) {

                DropBoxManager.Entry dbe = null;

                InputStreamReader isr = null;

                try {
@@ -747,17 +747,6 @@ public final class DropBoxManagerService extends SystemService { 
                            }

                        }

                        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(text.trim().replace('\n', '/'));

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

                        }

                        out.append("\n");

                    }

                } catch (IOException e) {

                    out.append("*** ").append(e.toString()).append("\n");