| commit | 6d9f8cc5a1338677b5d24dbe78ccd925568f42a4 | [log] [tgz] |
|---|---|---|
| author | Diya Bera <diyab@google.com> | Wed Jun 26 20:40:36 2024 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Wed Jun 26 20:40:36 2024 +0000 |
| tree | 79781c11ca87bef0a440d49169f1c5ab50d6c248 | |
| parent | 0bf84c39af37f72cf7e181f3e596b53366cda331 [diff] | |
| parent | 8630853a8bb2ed34ac777c7938f52dad1be9d100 [diff] |
Merge "[Fingerprint][BugFix]: add null judgement" into main am: 39474c5368 am: 8630853a8b Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/3136213 Change-Id: Id71aecc537d146efb4bd59edeebf9fa2677c25aa Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
diff --git a/services/core/java/com/android/server/biometrics/sensors/BiometricServiceRegistry.java b/services/core/java/com/android/server/biometrics/sensors/BiometricServiceRegistry.java index 6a2731d..5a493e4 100644 --- a/services/core/java/com/android/server/biometrics/sensors/BiometricServiceRegistry.java +++ b/services/core/java/com/android/server/biometrics/sensors/BiometricServiceRegistry.java
@@ -120,11 +120,13 @@ // Register each sensor individually with BiometricService final List<P> allProps = new ArrayList<>(); for (T provider : providers) { - final List<P> props = provider.getSensorProperties(); - for (P prop : props) { - registerService(biometricService, prop); + if(provider != null) { + final List<P> props = provider.getSensorProperties(); + for (P prop : props) { + registerService(biometricService, prop); + } + allProps.addAll(props); } - allProps.addAll(props); } finishRegistration(providers, allProps);