Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Log elusive NPE in BiometricServiceRegistry"

Browse Source
This commit is contained in:
Ilya Matyukhin
2022-09-10 02:22:05 +00:00
committed by Android (Google) Code Review
parent afb238fed9 47fed055f6
commit 3a77534280
1 changed files with 23 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
services/core/java/com/android/server/biometrics/sensors/BiometricServiceRegistry.java
View File

@@ -216,19 +216,31 @@ public abstract class BiometricServiceRegistry<T extends BiometricServiceProvide
return null;
}
if (mAllProps.size() > 1) {
Slog.e(TAG, "getSingleProvider() called but multiple sensors present: "
+ mAllProps.size());
}
// 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());
}
final int sensorId = mAllProps.get(0).sensorId;
final T provider = getProviderForSensor(sensorId);
if (provider != null) {
return new Pair<>(sensorId, provider);
}
final int sensorId = mAllProps.get(0).sensorId;
final T provider = getProviderForSensor(sensorId);
if (provider != null) {
return new Pair<>(sensorId, provider);
}
Slog.e(TAG, "Single sensor: " + sensorId + ", but provider not found");
return null;
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;
}
}
/**