diff --git a/services/core/java/com/android/server/biometrics/sensors/face/FaceService.java b/services/core/java/com/android/server/biometrics/sensors/face/FaceService.java index 94d47aa029a26..779558e8893e1 100644 --- a/services/core/java/com/android/server/biometrics/sensors/face/FaceService.java +++ b/services/core/java/com/android/server/biometrics/sensors/face/FaceService.java @@ -632,7 +632,7 @@ public class FaceService extends SystemService { for (String instance : instances) { final String fqName = IFace.DESCRIPTOR + "/" + instance; final IFace face = IFace.Stub.asInterface( - ServiceManager.waitForDeclaredService(fqName)); + Binder.allowBlocking(ServiceManager.waitForDeclaredService(fqName))); if (face == null) { Slog.e(TAG, "Unable to get declared service: " + fqName); continue; diff --git a/services/core/java/com/android/server/biometrics/sensors/face/aidl/FaceProvider.java b/services/core/java/com/android/server/biometrics/sensors/face/aidl/FaceProvider.java index 23be50e5925ae..84d239ef2b504 100644 --- a/services/core/java/com/android/server/biometrics/sensors/face/aidl/FaceProvider.java +++ b/services/core/java/com/android/server/biometrics/sensors/face/aidl/FaceProvider.java @@ -33,6 +33,7 @@ import android.hardware.biometrics.face.SensorProps; import android.hardware.face.Face; import android.hardware.face.FaceSensorPropertiesInternal; import android.hardware.face.IFaceServiceReceiver; +import android.os.Binder; import android.os.Handler; import android.os.IBinder; import android.os.Looper; @@ -173,7 +174,9 @@ public class FaceProvider implements IBinder.DeathRecipient, ServiceProvider { Slog.d(getTag(), "Daemon was null, reconnecting"); mDaemon = IFace.Stub.asInterface( - ServiceManager.waitForDeclaredService(IFace.DESCRIPTOR + "/" + mHalInstanceName)); + Binder.allowBlocking( + ServiceManager.waitForDeclaredService( + IFace.DESCRIPTOR + "/" + mHalInstanceName))); if (mDaemon == null) { Slog.e(getTag(), "Unable to get daemon"); return null;