Merge "Log elusive NPE in BiometricServiceRegistry" (3a775342) · Commits · e / os / android_frameworks_base

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

+23 −11

Original line number	Diff line number	Diff line
		@@ -216,6 +216,8 @@ public abstract class BiometricServiceRegistry<T extends BiometricServiceProvide
		return null;
		}

		// TODO(b/242837110): remove the try-catch once the bug is fixed.
		try {
		if (mAllProps.size() > 1) {
		Slog.e(TAG, "getSingleProvider() called but multiple sensors present: "
		+ mAllProps.size());
		@@ -229,6 +231,16 @@ public abstract class BiometricServiceRegistry<T extends BiometricServiceProvide

		Slog.e(TAG, "Single sensor: " + sensorId + ", but provider not found");
		return null;
		} catch (NullPointerException e) {
		final String extra;
		if (mAllProps == null) {
		extra = "mAllProps: null";
		} else {
		extra = "mAllProps.size(): " + mAllProps.size();
		}
		Slog.e(TAG, "This shouldn't happen. " + extra, e);
		throw e;
		}
		}

		/**