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

Commit 818f42ca authored May 04, 2021 by Joe Bolinger

Propogate userId parameter to challenge client.

Fix: 184915229
Test: manually create second profile on device and enroll face / fingerprint
Change-Id: Id5968938681be3b84d84f3dc85b00a9d05ce3d45

parent 82df05f9

services/core/java/com/android/server/biometrics/sensors/GenerateChallengeClient.java

+2 −2

Original line number	Diff line number	Diff line
		@@ -31,8 +31,8 @@ public abstract class GenerateChallengeClient<T> extends HalClientMonitor<T> {

		public GenerateChallengeClient(@NonNull Context context, @NonNull LazyDaemon<T> lazyDaemon,
		@NonNull IBinder token, @NonNull ClientMonitorCallbackConverter listener,
		@NonNull String owner, int sensorId) {
		super(context, lazyDaemon, token, listener, 0 /* userId /, owner, 0 / cookie */, sensorId,
		int userId, @NonNull String owner, int sensorId) {
		super(context, lazyDaemon, token, listener, userId, owner, 0 /* cookie */, sensorId,
		BiometricsProtoEnums.MODALITY_UNKNOWN, BiometricsProtoEnums.ACTION_UNKNOWN,
		BiometricsProtoEnums.CLIENT_UNKNOWN);
		}

services/core/java/com/android/server/biometrics/sensors/RevokeChallengeClient.java

+2 −2

Original line number	Diff line number	Diff line
		@@ -26,8 +26,8 @@ import com.android.server.biometrics.BiometricsProto;
		public abstract class RevokeChallengeClient<T> extends HalClientMonitor<T> {

		public RevokeChallengeClient(@NonNull Context context, @NonNull LazyDaemon<T> lazyDaemon,
		@NonNull IBinder token, @NonNull String owner, int sensorId) {
		super(context, lazyDaemon, token, null /* listener /, 0 / userId */, owner,
		@NonNull IBinder token, int userId, @NonNull String owner, int sensorId) {
		super(context, lazyDaemon, token, null /* listener */, userId, owner,
		0 /* cookie */, sensorId, BiometricsProtoEnums.MODALITY_UNKNOWN,
		BiometricsProtoEnums.ACTION_UNKNOWN, BiometricsProtoEnums.CLIENT_UNKNOWN);
		}

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

+3 −2

Original line number	Diff line number	Diff line
		@@ -35,8 +35,9 @@ public class FaceGenerateChallengeClient extends GenerateChallengeClient<ISessio

		FaceGenerateChallengeClient(@NonNull Context context,
		@NonNull LazyDaemon<ISession> lazyDaemon, @NonNull IBinder token,
		@NonNull ClientMonitorCallbackConverter listener, @NonNull String owner, int sensorId) {
		super(context, lazyDaemon, token, listener, owner, sensorId);
		@NonNull ClientMonitorCallbackConverter listener, int userId, @NonNull String owner,
		int sensorId) {
		super(context, lazyDaemon, token, listener, userId, owner, sensorId);
		}

		@Override

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

+2 −2

Original line number	Diff line number	Diff line
		@@ -300,7 +300,7 @@ public class FaceProvider implements IBinder.DeathRecipient, ServiceProvider {
		mHandler.post(() -> {
		final FaceGenerateChallengeClient client = new FaceGenerateChallengeClient(mContext,
		mSensors.get(sensorId).getLazySession(), token,
		new ClientMonitorCallbackConverter(receiver), opPackageName, sensorId);
		new ClientMonitorCallbackConverter(receiver), userId, opPackageName, sensorId);
		scheduleForSensor(sensorId, client);
		});
		}
		@@ -310,7 +310,7 @@ public class FaceProvider implements IBinder.DeathRecipient, ServiceProvider {
		@NonNull String opPackageName, long challenge) {
		mHandler.post(() -> {
		final FaceRevokeChallengeClient client = new FaceRevokeChallengeClient(mContext,
		mSensors.get(sensorId).getLazySession(), token, opPackageName, sensorId,
		mSensors.get(sensorId).getLazySession(), token, userId, opPackageName, sensorId,
		challenge);
		scheduleForSensor(sensorId, client);
		});

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

+2 −2

Original line number	Diff line number	Diff line
		@@ -37,8 +37,8 @@ public class FaceRevokeChallengeClient extends RevokeChallengeClient<ISession> {

		FaceRevokeChallengeClient(@NonNull Context context,
		@NonNull LazyDaemon<ISession> lazyDaemon, @NonNull IBinder token,
		@NonNull String owner, int sensorId, long challenge) {
		super(context, lazyDaemon, token, owner, sensorId);
		int userId, @NonNull String owner, int sensorId, long challenge) {
		super(context, lazyDaemon, token, userId, owner, sensorId);
		mChallenge = challenge;
		}