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

Commit d1cfa5ad authored by Joe Bolinger's avatar Joe Bolinger Committed by Automerger Merge Worker
Browse files

Merge "Fix oneway complaints for face auth." into sc-dev am: 9338f70d 

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

Change-Id: I59b0d68f5af62a131e37ef9424e6f0aa4c15c3d7
parents 0ca0d166 9338f70d

services/core/java/com/android/server/biometrics/sensors/face/FaceService.java

+1 −1
Original line number Diff line number Diff line
@@ -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;

services/core/java/com/android/server/biometrics/sensors/face/aidl/FaceProvider.java

+4 −1
Original line number Diff line number Diff line
@@ -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;