Merge "Unsubscribe from ALS events when UDFPS does not have an active touch." into sc-dev (15a8430f) · Commits · e / os / android_frameworks_base

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

+68 −14

Original line number	Diff line number	Diff line
		@@ -48,6 +48,64 @@ public abstract class LoggableMonitor {
		private boolean mLightSensorEnabled = false;
		private boolean mShouldLogMetrics = true;

		/**
		* Probe for loggable attributes that can be continuously monitored, such as ambient light.
		*
		* Disable probes when the sensors are in states that are not interesting for monitoring
		* purposes to save power.
		*/
		protected interface Probe {
		/** Ensure the probe is actively sampling for new data. */
		void enable();
		/** Stop sampling data. */
		void disable();
		}

		/**
		* Client monitor callback that exposes a probe.
		*
		* Disables the probe when the operation completes.
		*/
		protected static class CallbackWithProbe<T extends Probe>
		implements BaseClientMonitor.Callback {
		private final boolean mStartWithClient;
		private final T mProbe;

		public CallbackWithProbe(@NonNull T probe, boolean startWithClient) {
		mProbe = probe;
		mStartWithClient = startWithClient;
		}

		@Override
		public void onClientStarted(@NonNull BaseClientMonitor clientMonitor) {
		if (mStartWithClient) {
		mProbe.enable();
		}
		}

		@Override
		public void onClientFinished(@NonNull BaseClientMonitor clientMonitor, boolean success) {
		mProbe.disable();
		}

		@NonNull
		public T getProbe() {
		return mProbe;
		}
		}

		private class ALSProbe implements Probe {
		@Override
		public void enable() {
		setLightSensorLoggingEnabled(getAmbientLightSensor(mSensorManager));
		}

		@Override
		public void disable() {
		setLightSensorLoggingEnabled(null);
		}
		}

		// report only the most recent value
		// consider com.android.server.display.utils.AmbientFilter or similar if need arises
		private volatile float mLastAmbientLux = 0;
		@@ -285,21 +343,17 @@ public abstract class LoggableMonitor {
		return latency;
		}

		/** Get a callback to start/stop ALS capture when client runs. */
		/**
		* Get a callback to start/stop ALS capture when client runs.
		*
		* If the probe should not run for the entire operation, do not set startWithClient and
		* start/stop the problem when needed.
		*
		* @param startWithClient if probe should start automatically when the operation starts.
		*/
		@NonNull
		protected BaseClientMonitor.Callback createALSCallback() {
		return new BaseClientMonitor.Callback() {
		@Override
		public void onClientStarted(@NonNull BaseClientMonitor clientMonitor) {
		setLightSensorLoggingEnabled(getAmbientLightSensor(mSensorManager));
		}

		@Override
		public void onClientFinished(@NonNull BaseClientMonitor clientMonitor,
		boolean success) {
		setLightSensorLoggingEnabled(null);
		}
		};
		protected CallbackWithProbe<Probe> createALSCallback(boolean startWithClient) {
		return new CallbackWithProbe<>(new ALSProbe(), startWithClient);
		}

		/** The sensor to use for ALS logging. */

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

+1 −1

Original line number	Diff line number	Diff line
		@@ -98,7 +98,7 @@ class FaceAuthenticationClient extends AuthenticationClient<ISession> implements
		@NonNull
		@Override
		protected Callback wrapCallbackForStart(@NonNull Callback callback) {
		return new CompositeCallback(createALSCallback(), callback);
		return new CompositeCallback(createALSCallback(true /* startWithClient */), callback);
		}

		@Override

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

+2 −1

Original line number	Diff line number	Diff line
		@@ -109,7 +109,8 @@ public class FaceEnrollClient extends EnrollClient<ISession> {
		@NonNull
		@Override
		protected Callback wrapCallbackForStart(@NonNull Callback callback) {
		return new CompositeCallback(mPreviewHandleDeleterCallback, createALSCallback(), callback);
		return new CompositeCallback(mPreviewHandleDeleterCallback,
		createALSCallback(true /* startWithClient */), callback);
		}

		@Override

services/core/java/com/android/server/biometrics/sensors/face/hidl/FaceAuthenticationClient.java

+1 −1

Original line number	Diff line number	Diff line
		@@ -88,7 +88,7 @@ class FaceAuthenticationClient extends AuthenticationClient<IBiometricsFace> {
		@NonNull
		@Override
		protected Callback wrapCallbackForStart(@NonNull Callback callback) {
		return new CompositeCallback(createALSCallback(), callback);
		return new CompositeCallback(createALSCallback(true /* startWithClient */), callback);
		}

		@Override

services/core/java/com/android/server/biometrics/sensors/face/hidl/FaceEnrollClient.java

+1 −1

Original line number	Diff line number	Diff line
		@@ -69,7 +69,7 @@ public class FaceEnrollClient extends EnrollClient<IBiometricsFace> {
		@NonNull
		@Override
		protected Callback wrapCallbackForStart(@NonNull Callback callback) {
		return new CompositeCallback(createALSCallback(), callback);
		return new CompositeCallback(createALSCallback(true /* startWithClient */), callback);
		}

		@Override