Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 47fed055 authored by Ilya Matyukhin's avatar Ilya Matyukhin
Browse files

Log elusive NPE in BiometricServiceRegistry 

Bug: 242837110
Test: N/A
Change-Id: I92557679d723016c2ae56c1337b3f4a28f455617
parent 281ab1cc

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;

        }

    }



    /**