summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--services/core/java/com/android/server/biometrics/AuthenticationClient.java8
-rw-r--r--services/core/java/com/android/server/biometrics/BiometricServiceBase.java (renamed from services/core/java/com/android/server/biometrics/BiometricService.java)8
-rw-r--r--services/core/java/com/android/server/biometrics/ClientMonitor.java17
-rw-r--r--services/core/java/com/android/server/biometrics/EnrollClient.java8
-rw-r--r--services/core/java/com/android/server/biometrics/EnumerateClient.java7
-rw-r--r--services/core/java/com/android/server/biometrics/RemovalClient.java8
-rw-r--r--services/core/java/com/android/server/biometrics/face/FaceService.java4
-rw-r--r--services/core/java/com/android/server/biometrics/fingerprint/FingerprintService.java8
8 files changed, 36 insertions, 32 deletions
diff --git a/services/core/java/com/android/server/biometrics/AuthenticationClient.java b/services/core/java/com/android/server/biometrics/AuthenticationClient.java
index 65e55d66a4bb..aa4d34ef78b6 100644
--- a/services/core/java/com/android/server/biometrics/AuthenticationClient.java
+++ b/services/core/java/com/android/server/biometrics/AuthenticationClient.java
@@ -139,8 +139,8 @@ public abstract class AuthenticationClient extends ClientMonitor {
public abstract void onAuthenticationConfirmed();
public AuthenticationClient(Context context, Metrics metrics,
- BiometricService.DaemonWrapper daemon, long halDeviceId, IBinder token,
- BiometricService.ServiceListener listener, int targetUserId, int groupId, long opId,
+ BiometricServiceBase.DaemonWrapper daemon, long halDeviceId, IBinder token,
+ BiometricServiceBase.ServiceListener listener, int targetUserId, int groupId, long opId,
boolean restricted, String owner, Bundle bundle,
IBiometricPromptReceiver dialogReceiver, IStatusBarService statusBarService,
boolean requireConfirmation) {
@@ -207,7 +207,7 @@ public abstract class AuthenticationClient extends ClientMonitor {
private void notifyClientAuthenticationSucceeded(BiometricAuthenticator.Identifier identifier)
throws RemoteException {
- final BiometricService.ServiceListener listener = getListener();
+ final BiometricServiceBase.ServiceListener listener = getListener();
// Explicitly have if/else here to make it super obvious in case the code is
// touched in the future.
if (!getIsRestricted()) {
@@ -256,7 +256,7 @@ public abstract class AuthenticationClient extends ClientMonitor {
}
}
- final BiometricService.ServiceListener listener = getListener();
+ final BiometricServiceBase.ServiceListener listener = getListener();
if (listener != null) {
try {
mMetricsLogger.action(mMetrics.actionBiometricAuth(), authenticated);
diff --git a/services/core/java/com/android/server/biometrics/BiometricService.java b/services/core/java/com/android/server/biometrics/BiometricServiceBase.java
index c9b740d203cf..d25da5900858 100644
--- a/services/core/java/com/android/server/biometrics/BiometricService.java
+++ b/services/core/java/com/android/server/biometrics/BiometricServiceBase.java
@@ -72,7 +72,8 @@ import java.util.Map;
*
* @hide
*/
-public abstract class BiometricService extends SystemService implements IHwBinder.DeathRecipient {
+public abstract class BiometricServiceBase extends SystemService
+ implements IHwBinder.DeathRecipient {
protected static final boolean DEBUG = true;
@@ -529,7 +530,7 @@ public abstract class BiometricService extends SystemService implements IHwBinde
*
* @param context The system server context.
*/
- public BiometricService(Context context) {
+ public BiometricServiceBase(Context context) {
super(context);
mContext = context;
mStatusBarService = IStatusBarService.Stub.asInterface(
@@ -630,7 +631,8 @@ public abstract class BiometricService extends SystemService implements IHwBinde
if (error == BiometricConstants.BIOMETRIC_ERROR_CANCELED) {
mHandler.removeCallbacks(mResetClientState);
if (mPendingClient != null) {
- if (DEBUG) Slog.v(getTag(), "start pending client " + mPendingClient.getOwnerString());
+ if (DEBUG) Slog.v(getTag(), "start pending client " +
+ mPendingClient.getOwnerString());
startClient(mPendingClient, false);
mPendingClient = null;
}
diff --git a/services/core/java/com/android/server/biometrics/ClientMonitor.java b/services/core/java/com/android/server/biometrics/ClientMonitor.java
index 408e26ab0efb..d1daad583fff 100644
--- a/services/core/java/com/android/server/biometrics/ClientMonitor.java
+++ b/services/core/java/com/android/server/biometrics/ClientMonitor.java
@@ -38,7 +38,7 @@ import java.util.NoSuchElementException;
*/
public abstract class ClientMonitor implements IBinder.DeathRecipient {
protected static final int ERROR_ESRCH = 3; // Likely HAL is dead. See errno.h.
- protected static final boolean DEBUG = BiometricService.DEBUG;
+ protected static final boolean DEBUG = BiometricServiceBase.DEBUG;
private static final AudioAttributes FINGERPRINT_SONFICATION_ATTRIBUTES =
new AudioAttributes.Builder()
.setContentType(AudioAttributes.CONTENT_TYPE_SONIFICATION)
@@ -54,10 +54,10 @@ public abstract class ClientMonitor implements IBinder.DeathRecipient {
private final String mOwner;
private final VibrationEffect mSuccessVibrationEffect;
private final VibrationEffect mErrorVibrationEffect;
- private final BiometricService.DaemonWrapper mDaemon;
+ private final BiometricServiceBase.DaemonWrapper mDaemon;
private IBinder mToken;
- private BiometricService.ServiceListener mListener;
+ private BiometricServiceBase.ServiceListener mListener;
protected final MetricsLogger mMetricsLogger;
protected final Metrics mMetrics;
@@ -76,9 +76,10 @@ public abstract class ClientMonitor implements IBinder.DeathRecipient {
* permission
* @param owner name of the client that owns this
*/
- public ClientMonitor(Context context, Metrics metrics, BiometricService.DaemonWrapper daemon,
- long halDeviceId, IBinder token, BiometricService.ServiceListener listener, int userId,
- int groupId, boolean restricted, String owner) {
+ public ClientMonitor(Context context, Metrics metrics,
+ BiometricServiceBase.DaemonWrapper daemon, long halDeviceId, IBinder token,
+ BiometricServiceBase.ServiceListener listener, int userId, int groupId,
+ boolean restricted, String owner) {
mContext = context;
mMetrics = metrics;
mDaemon = daemon;
@@ -221,11 +222,11 @@ public abstract class ClientMonitor implements IBinder.DeathRecipient {
return mOwner;
}
- public final BiometricService.ServiceListener getListener() {
+ public final BiometricServiceBase.ServiceListener getListener() {
return mListener;
}
- public final BiometricService.DaemonWrapper getDaemonWrapper() {
+ public final BiometricServiceBase.DaemonWrapper getDaemonWrapper() {
return mDaemon;
}
diff --git a/services/core/java/com/android/server/biometrics/EnrollClient.java b/services/core/java/com/android/server/biometrics/EnrollClient.java
index 7d186a925984..76dc5a91bdbe 100644
--- a/services/core/java/com/android/server/biometrics/EnrollClient.java
+++ b/services/core/java/com/android/server/biometrics/EnrollClient.java
@@ -35,10 +35,10 @@ public abstract class EnrollClient extends ClientMonitor {
private final byte[] mCryptoToken;
private final BiometricUtils mBiometricUtils;
- public EnrollClient(Context context, Metrics metrics, BiometricService.DaemonWrapper daemon,
- long halDeviceId, IBinder token, BiometricService.ServiceListener listener, int userId,
- int groupId, byte[] cryptoToken, boolean restricted, String owner,
- BiometricUtils utils) {
+ public EnrollClient(Context context, Metrics metrics,
+ BiometricServiceBase.DaemonWrapper daemon, long halDeviceId, IBinder token,
+ BiometricServiceBase.ServiceListener listener, int userId, int groupId,
+ byte[] cryptoToken, boolean restricted, String owner, BiometricUtils utils) {
super(context, metrics, daemon, halDeviceId, token, listener, userId, groupId, restricted,
owner);
mBiometricUtils = utils;
diff --git a/services/core/java/com/android/server/biometrics/EnumerateClient.java b/services/core/java/com/android/server/biometrics/EnumerateClient.java
index 159d95edf869..47dc7ffda456 100644
--- a/services/core/java/com/android/server/biometrics/EnumerateClient.java
+++ b/services/core/java/com/android/server/biometrics/EnumerateClient.java
@@ -29,9 +29,10 @@ import java.util.ArrayList;
* A class to keep track of the enumeration state for a given client.
*/
public abstract class EnumerateClient extends ClientMonitor {
- public EnumerateClient(Context context, Metrics metrics, BiometricService.DaemonWrapper daemon,
- long halDeviceId, IBinder token, BiometricService.ServiceListener listener, int groupId,
- int userId, boolean restricted, String owner) {
+ public EnumerateClient(Context context, Metrics metrics,
+ BiometricServiceBase.DaemonWrapper daemon, long halDeviceId, IBinder token,
+ BiometricServiceBase.ServiceListener listener, int groupId, int userId,
+ boolean restricted, String owner) {
super(context, metrics, daemon, halDeviceId, token, listener, userId, groupId, restricted,
owner);
}
diff --git a/services/core/java/com/android/server/biometrics/RemovalClient.java b/services/core/java/com/android/server/biometrics/RemovalClient.java
index 1995b9c313d4..15b3773314bf 100644
--- a/services/core/java/com/android/server/biometrics/RemovalClient.java
+++ b/services/core/java/com/android/server/biometrics/RemovalClient.java
@@ -32,10 +32,10 @@ public abstract class RemovalClient extends ClientMonitor {
private final int mBiometricId;
private final BiometricUtils mBiometricUtils;
- public RemovalClient(Context context, Metrics metrics, BiometricService.DaemonWrapper daemon,
- long halDeviceId, IBinder token, BiometricService.ServiceListener listener,
- int biometricId, int groupId, int userId, boolean restricted, String owner,
- BiometricUtils utils) {
+ public RemovalClient(Context context, Metrics metrics,
+ BiometricServiceBase.DaemonWrapper daemon, long halDeviceId, IBinder token,
+ BiometricServiceBase.ServiceListener listener, int biometricId, int groupId, int userId,
+ boolean restricted, String owner, BiometricUtils utils) {
super(context, metrics, daemon, halDeviceId, token, listener, userId, groupId, restricted,
owner);
mBiometricId = biometricId;
diff --git a/services/core/java/com/android/server/biometrics/face/FaceService.java b/services/core/java/com/android/server/biometrics/face/FaceService.java
index 376eabc92875..b3627236ec41 100644
--- a/services/core/java/com/android/server/biometrics/face/FaceService.java
+++ b/services/core/java/com/android/server/biometrics/face/FaceService.java
@@ -52,7 +52,7 @@ import com.android.internal.logging.MetricsLogger;
import com.android.internal.statusbar.IStatusBarService;
import com.android.internal.util.DumpUtils;
import com.android.server.SystemServerInitThreadPool;
-import com.android.server.biometrics.BiometricService;
+import com.android.server.biometrics.BiometricServiceBase;
import com.android.server.biometrics.BiometricUtils;
import com.android.server.biometrics.Metrics;
@@ -73,7 +73,7 @@ import java.util.List;
*
* @hide
*/
-public class FaceService extends BiometricService {
+public class FaceService extends BiometricServiceBase {
protected static final String TAG = "FaceService";
private static final boolean DEBUG = true;
diff --git a/services/core/java/com/android/server/biometrics/fingerprint/FingerprintService.java b/services/core/java/com/android/server/biometrics/fingerprint/FingerprintService.java
index 1852aa84d817..717eb5ad310c 100644
--- a/services/core/java/com/android/server/biometrics/fingerprint/FingerprintService.java
+++ b/services/core/java/com/android/server/biometrics/fingerprint/FingerprintService.java
@@ -59,7 +59,7 @@ import com.android.internal.statusbar.IStatusBarService;
import com.android.internal.util.DumpUtils;
import com.android.server.SystemServerInitThreadPool;
import com.android.server.biometrics.AuthenticationClient;
-import com.android.server.biometrics.BiometricService;
+import com.android.server.biometrics.BiometricServiceBase;
import com.android.server.biometrics.BiometricUtils;
import com.android.server.biometrics.ClientMonitor;
import com.android.server.biometrics.EnumerateClient;
@@ -84,7 +84,7 @@ import java.util.concurrent.CopyOnWriteArrayList;
*
* @hide
*/
-public class FingerprintService extends BiometricService {
+public class FingerprintService extends BiometricServiceBase {
protected static final String TAG = "FingerprintService";
private static final boolean DEBUG = true;
@@ -514,7 +514,7 @@ public class FingerprintService extends BiometricService {
/**
* An internal class to help clean up unknown fingerprints in the hardware and software.
*/
- private final class InternalEnumerateClient extends BiometricService.EnumerateClientImpl {
+ private final class InternalEnumerateClient extends BiometricServiceBase.EnumerateClientImpl {
private List<Fingerprint> mEnrolledList;
private List<Fingerprint> mUnknownFingerprints = new ArrayList<>(); // list of fp to delete
@@ -577,7 +577,7 @@ public class FingerprintService extends BiometricService {
/**
* An internal class to help clean up unknown fingerprints in hardware and software.
*/
- private final class InternalRemovalClient extends BiometricService.RemovalClientImpl {
+ private final class InternalRemovalClient extends BiometricServiceBase.RemovalClientImpl {
public InternalRemovalClient(Context context,
DaemonWrapper daemon, long halDeviceId, IBinder token,
ServiceListener listener, int fingerId, int groupId, int userId, boolean restricted,
generated by cgit v1.2.3-59-g8ed1b (git 2.39.0) at 2025-12-09 21:29:43 +0000