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

Merge "[WMS][Bugfix] Fix hang when dumping local window."

Browse Source
This commit is contained in:
Treehugger Robot
2023-02-10 07:03:22 +00:00
committed by Gerrit Code Review
parent 14487f24c6 c79b915f70
commit 635ddd9c70
1 changed files with 18 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -34,6 +34,7 @@ import android.content.res.Resources.NotFoundException;
import android.graphics.Color;
import android.graphics.Point;
import android.graphics.Rect;
import android.os.ParcelFileDescriptor;
import android.os.RemoteException;
import android.os.ShellCommand;
import android.os.UserHandle;
@@ -46,6 +47,7 @@ import android.view.ViewDebug;
import com.android.internal.os.ByteTransferPipe;
import com.android.internal.protolog.ProtoLogImpl;
import com.android.server.IoThread;
import com.android.server.wm.LetterboxConfiguration.LetterboxBackgroundType;
import com.android.server.wm.LetterboxConfiguration.LetterboxHorizontalReachabilityPosition;
import com.android.server.wm.LetterboxConfiguration.LetterboxVerticalReachabilityPosition;
@@ -571,8 +573,22 @@ public class WindowManagerShellCommand extends ShellCommand {
ByteTransferPipe pipe = null;
try {
pipe = new ByteTransferPipe();
w.mClient.executeCommand(ViewDebug.REMOTE_COMMAND_DUMP_ENCODED, null,
pipe.getWriteFd());
final ParcelFileDescriptor pfd = pipe.getWriteFd();
if (w.isClientLocal()) {
// Make it asynchronous to avoid writer from being blocked
// by waiting for the buffer to be consumed in the same process.
IoThread.getExecutor().execute(() -> {
try {
w.mClient.executeCommand(
ViewDebug.REMOTE_COMMAND_DUMP_ENCODED, null, pfd);
} catch (RemoteException e) {
// Ignore for local call.
}
});
} else {
w.mClient.executeCommand(
ViewDebug.REMOTE_COMMAND_DUMP_ENCODED, null, pfd);
}
requestList.add(Pair.create(w.getName(), pipe));
} catch (IOException | RemoteException e) {
// Skip this window