summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Devin Moore <devinmoore@google.com> 2024-12-10 19:10:57 +0000
committer Devin Moore <devinmoore@google.com> 2024-12-10 19:14:24 +0000
commit0bb5e508b0da824a7180c9bdafcce1768c0c576f (patch)
treee18349efbf94a20d810d6080e70476b95aecbdbe
parent1c9eb66a33ce28e34c03a39f5721355a5fb1f05c (diff)
AllowBlocking in ServiceManager binder
Java ServiceManager should allow blocking calls in system_server. Test: boot cuttlefish device and see WTF logs go away at boot Bug: 361700949 Change-Id: Icec1a45221a28ea2ce29756c81b22b70f2a5d0eb
-rw-r--r--core/java/android/os/ServiceManagerNative.java3
1 files changed, 2 insertions, 1 deletions
diff --git a/core/java/android/os/ServiceManagerNative.java b/core/java/android/os/ServiceManagerNative.java
index 49b696d95723..7ea521ec5dd4 100644
--- a/core/java/android/os/ServiceManagerNative.java
+++ b/core/java/android/os/ServiceManagerNative.java
@@ -50,7 +50,8 @@ public final class ServiceManagerNative {
class ServiceManagerProxy implements IServiceManager {
public ServiceManagerProxy(IBinder remote) {
mRemote = remote;
- mServiceManager = IServiceManager.Stub.asInterface(this.getNativeServiceManager());
+ mServiceManager = IServiceManager.Stub.asInterface(
+ Binder.allowBlocking(this.getNativeServiceManager()));
}
public IBinder asBinder() {