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

Commit a89c51e1 authored by Treehugger Robot's avatar Treehugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Null checker for performance tracker" into main

parents f8df2580 537a3352

services/core/java/com/android/server/biometrics/sensors/face/aidl/FaceProvider.java

+7 −1
Original line number Diff line number Diff line
@@ -895,7 +895,13 @@ public class FaceProvider implements IBinder.DeathRecipient, ServiceProvider { 
            for (int i = 0; i < mFaceSensors.size(); i++) {

                final Sensor sensor = mFaceSensors.valueAt(i);

                final int sensorId = mFaceSensors.keyAt(i);

                PerformanceTracker.getInstanceForSensorId(sensorId).incrementHALDeathCount();

                final PerformanceTracker performanceTracker = PerformanceTracker.getInstanceForSensorId(

                        sensorId);

                if (performanceTracker != null) {

                    performanceTracker.incrementHALDeathCount();

                } else {

                    Slog.w(getTag(), "Performance tracker is null. Not counting HAL death.");

                }

                sensor.onBinderDied();

            }

        });

services/core/java/com/android/server/biometrics/sensors/fingerprint/aidl/FingerprintProvider.java

+7 −1
Original line number Diff line number Diff line
@@ -954,7 +954,13 @@ public class FingerprintProvider implements IBinder.DeathRecipient, ServiceProvi 
            for (int i = 0; i < mFingerprintSensors.size(); i++) {

                final Sensor sensor = mFingerprintSensors.valueAt(i);

                final int sensorId = mFingerprintSensors.keyAt(i);

                PerformanceTracker.getInstanceForSensorId(sensorId).incrementHALDeathCount();

                final PerformanceTracker performanceTracker = PerformanceTracker.getInstanceForSensorId(

                        sensorId);

                if (performanceTracker != null) {

                    performanceTracker.incrementHALDeathCount();

                } else {

                    Slog.w(getTag(), "Performance tracker is null. Not counting HAL death.");

                }

                sensor.onBinderDied();

            }

        });