Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

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

Change-Id: I0613085f320615bd48d389872fd3f6385d7ac429
This commit is contained in:
TreeHugger Robot
2021-05-27 22:02:15 +00:00
committed by Automerger Merge Worker
parent 89e77c7f32 adf6f104ca
commit d02de5a078
2 changed files with 17 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -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

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

@@ -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