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

Commit 4c3ff4d9 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 

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



Change-Id: I254105c71f3ccd1fd95b90fe9e8de1b95a0a8952
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 451ce2d7 d63b06b4

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

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

                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;

                DropBoxManager.Entry dbe = null;

                InputStreamReader isr = null;

                InputStreamReader isr = null;

                try {

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

                            }

                        }

                        }

                        if (!newline) out.append("\n");

                        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) {

                } catch (IOException e) {

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

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