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

Commit 24fdd0fd authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Return immediately from isHardwareDetected" into sc-dev am: adf6f104... 

Merge "Return immediately from isHardwareDetected" into sc-dev am: adf6f104 am: 264855a0 am: c118e631

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

Change-Id: I12a4dc53fc0884acf5b251591abf7e725eff2b8b
parents 1c1988ce c118e631

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

+8 −1
Original line number Diff line number Diff line
@@ -160,6 +160,13 @@ public class FaceProvider implements IBinder.DeathRecipient, ServiceProvider { 
        return "FaceProvider/" + mHalInstanceName;

    }



    boolean hasHalInstance() {

        if (mTestHalEnabled) {

            return true;

        }

        return ServiceManager.checkService(IFace.DESCRIPTOR + "/" + mHalInstanceName) != null;

    }



    @Nullable

    @VisibleForTesting

    synchronized IFace getHalInstance() {
@@ -291,7 +298,7 @@ public class FaceProvider implements IBinder.DeathRecipient, ServiceProvider { 


    @Override

    public boolean isHardwareDetected(int sensorId) {

        return getHalInstance() != null;

        return hasHalInstance();

    }



    @Override

services/core/java/com/android/server/biometrics/sensors/fingerprint/aidl/FingerprintProvider.java

+9 −1
Original line number Diff line number Diff line
@@ -172,6 +172,14 @@ public class FingerprintProvider implements IBinder.DeathRecipient, ServiceProvi 
        return "FingerprintProvider/" + mHalInstanceName;

    }



    boolean hasHalInstance() {

        if (mTestHalEnabled) {

            return true;

        }

        return (ServiceManager.checkService(IFingerprint.DESCRIPTOR + "/" + mHalInstanceName)

                != null);

    }



    @Nullable

    @VisibleForTesting

    synchronized IFingerprint getHalInstance() {
@@ -454,7 +462,7 @@ public class FingerprintProvider implements IBinder.DeathRecipient, ServiceProvi 


    @Override

    public boolean isHardwareDetected(int sensorId) {

        return getHalInstance() != null;

        return hasHalInstance();

    }



    @Override