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

Merge "[WMS][Bugfix] Catch exception when dump local window." am: 9b40b1ff61 am: 7d8ac48014

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

Change-Id: Ib042905f7be4895f054df0e9e59e688c2f90d82e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Riddle Hsu
2023-03-13 12:12:30 +00:00
committed by Automerger Merge Worker
parent 0627eab3aa 7d8ac48014
commit e1b1e3d98e
1 changed files with 18 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -42,6 +42,7 @@ import android.provider.Settings;
import android.util.DisplayMetrics;
import android.util.Pair;
import android.view.Display;
import android.view.IWindow;
import android.view.IWindowManager;
import android.view.ViewDebug;
@@ -554,6 +555,22 @@ public class WindowManagerShellCommand extends ShellCommand {
return 0;
}
private void dumpLocalWindowAsync(IWindow client, ParcelFileDescriptor pfd) {
// Make it asynchronous to avoid writer from being blocked
// by waiting for the buffer to be consumed in the same process.
IoThread.getExecutor().execute(() -> {
synchronized (mInternal.mGlobalLock) {
try {
client.executeCommand(ViewDebug.REMOTE_COMMAND_DUMP_ENCODED, null, pfd);
} catch (Exception e) {
// Ignore RemoteException for local call. Just print trace for other
// exceptions caused by RC with tolerable low possibility.
e.printStackTrace();
}
}
});
}
private int runDumpVisibleWindowViews(PrintWriter pw) {
if (!mInternal.checkCallingPermission(android.Manifest.permission.DUMP,
"runDumpVisibleWindowViews()")) {
@@ -576,16 +593,7 @@ public class WindowManagerShellCommand extends ShellCommand {
pipe = new ByteTransferPipe();
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.
}
});
dumpLocalWindowAsync(w.mClient, pfd);
} else {
w.mClient.executeCommand(
ViewDebug.REMOTE_COMMAND_DUMP_ENCODED, null, pfd);