Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 400b81c9 authored by Devin Moore's avatar Devin Moore Committed by Automerger Merge Worker
Browse files

Merge "AllowBlocking in ServiceManager binder" into main am: 876ed19f 

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



Change-Id: Ie0888cb5eaf2006f7477dc7f54e18928b7a7e7da
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 33e1636d 876ed19f

core/java/android/os/ServiceManagerNative.java

+2 −1
Original line number Diff line number Diff line
@@ -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() {