Merge "5/n: Add support for initial coex cases" into sc-dev am: 30a9a9b5ec (b3d1ab40) · Commits · e / os / android_frameworks_base

services/core/java/com/android/server/biometrics/BiometricService.java

+15 −0

Original line number	Diff line number	Diff line
		@@ -73,6 +73,7 @@ import com.android.internal.os.SomeArgs;
		import com.android.internal.statusbar.IStatusBarService;
		import com.android.internal.util.DumpUtils;
		import com.android.server.SystemService;
		import com.android.server.biometrics.sensors.CoexCoordinator;

		import java.io.FileDescriptor;
		import java.io.PrintWriter;
		@@ -1100,6 +1101,12 @@ public class BiometricService extends SystemService {
		}
		return new ArrayList<>();
		}

		public boolean isAdvancedCoexLogicEnabled(Context context) {
		return (Build.IS_USERDEBUG \|\| Build.IS_ENG)
		&& Settings.Secure.getInt(context.getContentResolver(),
		CoexCoordinator.SETTING_ENABLE_NAME, 0) != 0;
		}
		}

		/**
		@@ -1126,6 +1133,12 @@ public class BiometricService extends SystemService {
		mSettingObserver = mInjector.getSettingObserver(context, mHandler,
		mEnabledOnKeyguardCallbacks);

		// TODO(b/193089985) This logic lives here (outside of CoexCoordinator) so that it doesn't
		// need to depend on context. We can remove this code once the advanced logic is enabled
		// by default.
		CoexCoordinator coexCoordinator = CoexCoordinator.getInstance();
		coexCoordinator.setAdvancedLogicEnabled(injector.isAdvancedCoexLogicEnabled(context));

		try {
		injector.getActivityManagerService().registerUserSwitchObserver(
		new UserSwitchObserver() {
		@@ -1437,5 +1450,7 @@ public class BiometricService extends SystemService {
		pw.println();
		pw.println("CurrentSession: " + mCurrentAuthSession);
		pw.println();
		pw.println("CoexCoordinator: " + CoexCoordinator.getInstance().toString());
		pw.println();
		}
		}

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

+2 −1

Original line number	Diff line number	Diff line
		@@ -359,7 +359,8 @@ public class BiometricScheduler {
		* @param gestureAvailabilityDispatcher may be null if the sensor does not support gestures
		* (such as fingerprint swipe).
		*/
		public BiometricScheduler(@NonNull String tag, @SensorType int sensorType,
		public BiometricScheduler(@NonNull String tag,
		@SensorType int sensorType,
		@Nullable GestureAvailabilityDispatcher gestureAvailabilityDispatcher) {
		this(tag, sensorType, gestureAvailabilityDispatcher, IBiometricService.Stub.asInterface(
		ServiceManager.getService(Context.BIOMETRIC_SERVICE)), LOG_NUM_RECENT_OPERATIONS,

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

+86 −2

Original line number	Diff line number	Diff line
		@@ -16,11 +16,17 @@

		package com.android.server.biometrics.sensors;

		import static com.android.server.biometrics.sensors.BiometricScheduler.SENSOR_TYPE_FACE;
		import static com.android.server.biometrics.sensors.BiometricScheduler.SENSOR_TYPE_UDFPS;
		import static com.android.server.biometrics.sensors.BiometricScheduler.sensorTypeToString;

		import android.annotation.NonNull;
		import android.annotation.Nullable;
		import android.util.Slog;

		import com.android.internal.annotations.VisibleForTesting;
		import com.android.server.biometrics.sensors.fingerprint.Udfps;

		import java.util.HashMap;
		import java.util.Map;

		@@ -33,6 +39,8 @@ import java.util.Map;
		public class CoexCoordinator {

		private static final String TAG = "BiometricCoexCoordinator";
		public static final String SETTING_ENABLE_NAME =
		"com.android.server.biometrics.sensors.CoexCoordinator.enable";
		private static final boolean DEBUG = true;

		/**
		@@ -54,16 +62,30 @@ public class CoexCoordinator {

		private static CoexCoordinator sInstance;

		/**
		* @return a singleton instance.
		*/
		@NonNull
		static CoexCoordinator getInstance() {
		public static CoexCoordinator getInstance() {
		if (sInstance == null) {
		sInstance = new CoexCoordinator();
		}
		return sInstance;
		}

		@VisibleForTesting
		public void setAdvancedLogicEnabled(boolean enabled) {
		mAdvancedLogicEnabled = enabled;
		}

		@VisibleForTesting
		void reset() {
		mClientMap.clear();
		}

		// SensorType to AuthenticationClient map
		private final Map<Integer, AuthenticationClient<?>> mClientMap;
		private boolean mAdvancedLogicEnabled;

		private CoexCoordinator() {
		// Singleton
		@@ -105,8 +127,33 @@ public class CoexCoordinator {
		callback.sendHapticFeedback();
		// For BP, BiometricService will add the authToken to Keystore.
		callback.sendAuthenticationResult(false /* addAuthTokenIfStrong */);
		} else if (isUnknownClient(client)) {
		// Client doesn't exist in our map for some reason. Give the user feedback so the
		// device doesn't feel like it's stuck. All other cases below can assume that the
		// client exists in our map.
		callback.sendHapticFeedback();
		callback.sendAuthenticationResult(true /* addAuthTokenIfStrong */);
		} else if (mAdvancedLogicEnabled && client.isKeyguard()) {
		if (isSingleAuthOnly(client)) {
		// Single sensor authentication
		callback.sendHapticFeedback();
		callback.sendAuthenticationResult(true /* addAuthTokenIfStrong */);
		} else {
		// Multi sensor authentication
		AuthenticationClient<?> udfps = mClientMap.getOrDefault(SENSOR_TYPE_UDFPS, null);
		if (isCurrentFaceAuth(client)) {
		if (isPointerDown(udfps)) {
		// Face auth success while UDFPS pointer down. No callback, no haptic.
		// Feedback will be provided after UDFPS result.
		} else {
		callback.sendHapticFeedback();
		callback.sendAuthenticationResult(true /* addAuthTokenIfStrong */);
		}
		}
		}
		} else {
		// Keyguard, FingerprintManager, FaceManager, etc
		// Non-keyguard authentication. For example, Fingerprint Settings use of
		// FingerprintManager for highlighting fingers
		callback.sendHapticFeedback();
		callback.sendAuthenticationResult(true /* addAuthTokenIfStrong */);
		}
		@@ -123,4 +170,41 @@ public class CoexCoordinator {
		callback.sendAuthenticationResult(false /* addAuthTokenIfStrong */);
		}
		}

		private boolean isCurrentFaceAuth(@NonNull AuthenticationClient<?> client) {
		return client == mClientMap.getOrDefault(SENSOR_TYPE_FACE, null);
		}

		private boolean isPointerDown(@Nullable AuthenticationClient<?> client) {
		if (client instanceof Udfps) {
		return ((Udfps) client).isPointerDown();
		}
		return false;
		}

		private boolean isUnknownClient(@NonNull AuthenticationClient<?> client) {
		for (AuthenticationClient<?> c : mClientMap.values()) {
		if (c == client) {
		return false;
		}
		}
		return true;
		}

		private boolean isSingleAuthOnly(@NonNull AuthenticationClient<?> client) {
		if (mClientMap.values().size() != 1) {
		return false;
		}

		for (AuthenticationClient<?> c : mClientMap.values()) {
		if (c != client) {
		return false;
		}
		}
		return true;
		}

		public String toString() {
		return "Enabled: " + mAdvancedLogicEnabled;
		}
		}

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

+2 −2

Original line number	Diff line number	Diff line
		@@ -494,8 +494,8 @@ public class Sensor {
		mToken = new Binder();
		mHandler = handler;
		mSensorProperties = sensorProperties;
		mScheduler = new UserAwareBiometricScheduler(tag, BiometricScheduler.SENSOR_TYPE_FACE,
		null /* gestureAvailabilityDispatcher */,
		mScheduler = new UserAwareBiometricScheduler(tag,
		BiometricScheduler.SENSOR_TYPE_FACE, null /* gestureAvailabilityDispatcher */,
		() -> mCurrentSession != null ? mCurrentSession.mUserId : UserHandle.USER_NULL,
		new UserAwareBiometricScheduler.UserSwitchCallback() {
		@NonNull

services/core/java/com/android/server/biometrics/sensors/fingerprint/Udfps.java

+1 −0

Original line number	Diff line number	Diff line
		@@ -27,4 +27,5 @@ public interface Udfps {
		void onPointerDown(int x, int y, float minor, float major);
		void onPointerUp();
		void onUiReady();
		boolean isPointerDown();
		}