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

Merge "Dump binder proxies interface descriptors on a separate thread." into sc-dev

Browse Source
This commit is contained in:
Martijn Coenen
2021-04-16 14:23:48 +00:00
committed by Android (Google) Code Review
parent 229a149a91 0110dc4836
commit 79b9512c9a
1 changed files with 38 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

55
core/java/android/os/BinderProxy.java
View File

@@ -34,6 +34,9 @@ import java.util.ArrayList;
import java.util.Arrays;
import java.util.HashMap;
import java.util.Map;
import java.util.concurrent.ExecutorService;
import java.util.concurrent.Executors;
import java.util.concurrent.TimeUnit;
/**
* Java proxy for a native IBinder object.
@@ -262,27 +265,45 @@ public final class BinderProxy implements IBinder {
Log.e(Binder.TAG, "RemoteException while disabling app freezer");
}
for (WeakReference<BinderProxy> weakRef : proxiesToQuery) {
BinderProxy bp = weakRef.get();
String key;
if (bp == null) {
key = "<cleared weak-ref>";
} else {
try {
key = bp.getInterfaceDescriptor();
if ((key == null || key.isEmpty()) && !bp.isBinderAlive()) {
key = "<proxy to dead node>";
// We run the dump on a separate thread, because there are known cases where
// a process overrides getInterfaceDescriptor() and somehow blocks on it, causing
// the calling thread (usually AMS) to hit the watchdog.
// Do the dumping on a separate thread instead, and give up after a while.
ExecutorService executorService = Executors.newSingleThreadExecutor();
executorService.submit(() -> {
for (WeakReference<BinderProxy> weakRef : proxiesToQuery) {
BinderProxy bp = weakRef.get();
String key;
if (bp == null) {
key = "<cleared weak-ref>";
} else {
try {
key = bp.getInterfaceDescriptor();
if ((key == null || key.isEmpty()) && !bp.isBinderAlive()) {
key = "<proxy to dead node>";
}
} catch (Throwable t) {
key = "<exception during getDescriptor>";
}
} catch (Throwable t) {
key = "<exception during getDescriptor>";
}
Integer i = counts.get(key);
if (i == null) {
counts.put(key, 1);
} else {
counts.put(key, i + 1);
}
}
Integer i = counts.get(key);
if (i == null) {
counts.put(key, 1);
} else {
counts.put(key, i + 1);
});
try {
executorService.shutdown();
boolean dumpDone = executorService.awaitTermination(20, TimeUnit.SECONDS);
if (!dumpDone) {
Log.e(Binder.TAG, "Failed to complete binder proxy dump,"
+ " dumping what we have so far.");
}
} catch (InterruptedException e) {
// Ignore
}
try {
ActivityManager.getService().enableAppFreezer(true);