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

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

Change-Id: I254105c71f3ccd1fd95b90fe9e8de1b95a0a8952
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Jeff Sharkey
2023-02-10 21:31:35 +00:00
committed by Automerger Merge Worker
parent 451ce2d723 d63b06b429
commit 4c3ff4d98e
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

@@ -693,7 +693,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 {
@@ -717,17 +717,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");