Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Add dropbox entries as files to dumpstate ZIP." am: d63b06b429 am: 4c3ff4d98e am: e142623a01

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

Change-Id: I31b0791f037ccbcbd97215f6db02a85a9541d815
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Jeff Sharkey
2023-02-10 23:11:05 +00:00
committed by Automerger Merge Worker
parent 7357be30dd e142623a01
commit 895c12fa33
1 changed files with 1 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
services/core/java/com/android/server/DropBoxManagerService.java
View File

@@ -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");