Snap for 7711521 from ada5e056608d28a4f4ad964627c45c6e6619d056 to sc-qpr1-release (d72d6125) · Commits · e / os / android_frameworks_base

core/java/android/hardware/fingerprint/FingerprintManager.java

+0 −20

Original line number	Diff line number	Diff line
		@@ -849,26 +849,6 @@ public class FingerprintManager implements BiometricAuthenticator, BiometricFing
		return hasEnrolledFingerprints(userId);
		}

		/**
		* Checks if the specified user has enrollments in any of the specified sensors.
		* @hide
		*/
		@RequiresPermission(USE_BIOMETRIC_INTERNAL)
		public boolean hasEnrolledTemplatesForAnySensor(int userId,
		@NonNull List<FingerprintSensorPropertiesInternal> sensors) {
		if (mService == null) {
		Slog.w(TAG, "hasEnrolledTemplatesForAnySensor: no fingerprint service");
		return false;
		}

		try {
		return mService.hasEnrolledTemplatesForAnySensor(userId, sensors,
		mContext.getOpPackageName());
		} catch (RemoteException e) {
		throw e.rethrowFromSystemServer();
		}
		}

		/**
		* @hide
		*/

+6 −1

Original line number	Diff line number	Diff line
		@@ -49,5 +49,10 @@ public abstract class FingerprintStateListener extends IFingerprintStateListener
		* Defines behavior in response to state update
		* @param newState new state of fingerprint sensor
		*/
		public abstract void onStateChanged(@FingerprintStateListener.State int newState);
		public void onStateChanged(@FingerprintStateListener.State int newState) {};

		/**
		* Invoked when enrollment state changes for the specified user
		*/
		public void onEnrollmentsChanged(int userId, int sensorId, boolean hasEnrollments) {};
		}

+0 −3

Original line number	Diff line number	Diff line
		@@ -120,9 +120,6 @@ interface IFingerprintService {
		// Determine if a user has at least one enrolled fingerprint.
		boolean hasEnrolledFingerprints(int sensorId, int userId, String opPackageName);

		// Determine if a user has at least one enrolled fingerprint in any of the specified sensors
		boolean hasEnrolledTemplatesForAnySensor(int userId, in List<FingerprintSensorPropertiesInternal> sensors, String opPackageName);

		// Return the LockoutTracker status for the specified user
		int getLockoutModeForUser(int sensorId, int userId);

+1 −0

Original line number	Diff line number	Diff line
		@@ -24,4 +24,5 @@ import android.hardware.fingerprint.Fingerprint;
		*/
		oneway interface IFingerprintStateListener {
		void onStateChanged(int newState);
		void onEnrollmentsChanged(int userId, int sensorId, boolean hasEnrollments);
		}

+2 −2

Original line number	Diff line number	Diff line
		@@ -70,7 +70,7 @@
		android:id="@+id/wifi_summary"
		android:textDirection="locale"
		android:layout_width="wrap_content"
		android:layout_height="20dp"
		android:layout_height="wrap_content"
		android:gravity="start\|center_vertical"
		android:ellipsize="end"
		android:textColor="?android:attr/textColorSecondary"
		@@ -85,7 +85,7 @@
		android:clickable="false"
		android:layout_gravity="end\|center_vertical">
		<ImageView
		android:id="@+id/wifi_locked_icon"
		android:id="@+id/wifi_end_icon"
		android:layout_gravity="end\|center_vertical"
		android:layout_width="wrap_content"
		android:layout_height="wrap_content"/>