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

Merge "Dumping the view hierarchy to the output stream instead of a separate file"

Browse Source
This commit is contained in:
Sunny Goyal
2019-11-22 18:49:36 +00:00
committed by Android (Google) Code Review
parent daa5ac49ac 9a3d0cc53a
commit 8470c533ba
1 changed files with 2 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
services/core/java/com/android/server/wm/WindowManagerShellCommand.java
View File

@@ -20,7 +20,6 @@ import static android.os.Build.IS_USER;
import android.graphics.Point;
import android.graphics.Rect;
import android.os.ParcelFileDescriptor;
import android.os.RemoteException;
import android.os.ShellCommand;
import android.os.UserHandle;
@@ -352,9 +351,7 @@ public class WindowManagerShellCommand extends ShellCommand {
}
private int runDumpVisibleWindowViews(PrintWriter pw) {
ParcelFileDescriptor outFile = openFileForSystem(getNextArgRequired(), "w");
try (ZipOutputStream out = new ZipOutputStream(
new ParcelFileDescriptor.AutoCloseOutputStream(outFile))) {
try (ZipOutputStream out = new ZipOutputStream(getRawOutputStream())) {
ArrayList<Pair<String, ByteTransferPipe>> requestList = new ArrayList<>();
synchronized (mInternal.mGlobalLock) {
// Request dump from all windows parallelly before writing to disk.
@@ -368,7 +365,6 @@ public class WindowManagerShellCommand extends ShellCommand {
requestList.add(Pair.create(w.getName(), pipe));
} catch (IOException | RemoteException e) {
// Skip this window
pw.println("Error for window " + w.getName() + " : " + e.getMessage());
if (pipe != null) {
pipe.kill();
}
@@ -382,8 +378,6 @@ public class WindowManagerShellCommand extends ShellCommand {
data = entry.second.get();
} catch (IOException e) {
// Ignore this window
pw.println(
"Error for window " + entry.first + " : " + e.getMessage());
continue;
}
out.putNextEntry(new ZipEntry(entry.first));
@@ -414,7 +408,7 @@ public class WindowManagerShellCommand extends ShellCommand {
pw.println(" Dismiss the keyguard, prompting user for auth if necessary.");
pw.println(" set-user-rotation [free|lock] [-d DISPLAY_ID] [rotation]");
pw.println(" Set user rotation mode and user rotation.");
pw.println(" dump-visible-window-views out-file");
pw.println(" dump-visible-window-views");
pw.println(" Dumps the encoded view hierarchies of visible windows");
pw.println(" set-fix-to-user-rotation [-d DISPLAY_ID] [enabled|disabled]");
pw.println(" Enable or disable rotating display for app requested orientation.");