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

Merge "Add null check in FaceService#isHardwareDetected"

Browse Source
This commit is contained in:
TreeHugger Robot
2020-07-15 00:19:57 +00:00
committed by Android (Google) Code Review
parent d3ced6d982 d6fe1304bf
commit 97683bf1da
2 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/java/android/hardware/face/FaceManager.java
View File

@@ -71,7 +71,7 @@ public class FaceManager implements BiometricAuthenticator, BiometricFaceConstan
private static final int MSG_SET_FEATURE_COMPLETED = 107;
private static final int MSG_CHALLENGE_GENERATED = 108;
private IFaceService mService;
private final IFaceService mService;
private final Context mContext;
private IBinder mToken = new Binder();
private AuthenticationCallback mAuthenticationCallback;

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

@@ -30,6 +30,7 @@ import android.hardware.face.IFaceServiceReceiver;
import android.os.Binder;
import android.os.IBinder;
import android.os.NativeHandle;
import android.util.Slog;
import android.view.Surface;
import com.android.internal.util.DumpUtils;
@@ -177,6 +178,10 @@ public class FaceService extends SystemService {
@Override // Binder call
public boolean isHardwareDetected(String opPackageName) {
Utils.checkPermission(getContext(), USE_BIOMETRIC_INTERNAL);
if (mFace10 == null) {
Slog.wtf(TAG, "No HAL, caller: " + opPackageName);
return false;
}
final long token = Binder.clearCallingIdentity();
try {
return mFace10.isHardwareDetected();