summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Devin Moore <devinmoore@google.com> 2024-12-10 20:51:34 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> 2024-12-10 20:51:34 +0000
commit876ed19fc023b33f58407030a99db2c67398edcf (patch)
tree9744484ca203095ee376b142b6736b49fd83b5c7
parent87f71c6892eedf0a1ef7fef1236603b7a7bb20d9 (diff)
parent0bb5e508b0da824a7180c9bdafcce1768c0c576f (diff)
Merge "AllowBlocking in ServiceManager binder" into main
-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() {