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

Commit 6d531250 authored by Grace Cheng's avatar Grace Cheng Committed by Automerger Merge Worker
Browse files

Merge "Adding counter logging instances of multiple BiometricLogger ALS... 

Merge "Adding counter logging instances of multiple BiometricLogger ALS subscriptions" into tm-qpr-dev am: 9a71b13d am: b54714f6

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19241037



Change-Id: Ia7e3a0a0a98d6f66d1fa76fa38a47d774d541523
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents c2832239 b54714f6

packages/SystemUI/src/com/android/systemui/biometrics/UdfpsController.java

+2 −2
Original line number Diff line number Diff line
@@ -609,7 +609,7 @@ public class UdfpsController implements DozeReceiver { 
            @NonNull SystemUIDialogManager dialogManager,

            @NonNull LatencyTracker latencyTracker,

            @NonNull ActivityLaunchAnimator activityLaunchAnimator,

            @NonNull Optional<AlternateUdfpsTouchProvider> aternateTouchProvider,

            @NonNull Optional<AlternateUdfpsTouchProvider> alternateTouchProvider,

            @BiometricsBackground Executor biometricsExecutor) {

        mContext = context;

        mExecution = execution;
@@ -639,7 +639,7 @@ public class UdfpsController implements DozeReceiver { 
        mUnlockedScreenOffAnimationController = unlockedScreenOffAnimationController;

        mLatencyTracker = latencyTracker;

        mActivityLaunchAnimator = activityLaunchAnimator;

        mAlternateTouchProvider = aternateTouchProvider.orElse(null);

        mAlternateTouchProvider = alternateTouchProvider.orElse(null);

        mBiometricExecutor = biometricsExecutor;



        mOrientationListener = new BiometricDisplayListener(

services/core/java/com/android/server/biometrics/log/BiometricLogger.java

+28 −2
Original line number Diff line number Diff line
@@ -28,8 +28,10 @@ import android.hardware.biometrics.BiometricsProtoEnums; 
import android.hardware.biometrics.common.OperationContext;

import android.hardware.face.FaceManager;

import android.hardware.fingerprint.FingerprintManager;

import android.util.Log;

import android.util.Slog;



import com.android.internal.annotations.GuardedBy;

import com.android.internal.annotations.VisibleForTesting;

import com.android.internal.util.FrameworkStatsLog;

import com.android.server.biometrics.Utils;
@@ -41,6 +43,10 @@ public class BiometricLogger { 


    public static final String TAG = "BiometricLogger";

    public static final boolean DEBUG = false;

    private static final Object sLock = new Object();



    @GuardedBy("sLock")

    private static int sAlsCounter;



    private final int mStatsModality;

    private final int mStatsAction;
@@ -345,13 +351,33 @@ public class BiometricLogger { 
            if (!mLightSensorEnabled) {

                mLightSensorEnabled = true;

                mLastAmbientLux = 0;

                int localAlsCounter;

                synchronized (sLock) {

                    localAlsCounter = sAlsCounter++;

                }



                if (localAlsCounter == 0) {

                    mSensorManager.registerListener(mLightSensorListener, lightSensor,

                            SensorManager.SENSOR_DELAY_NORMAL);

                } else {

                    Slog.e(TAG, "Ignoring request to subscribe to ALSProbe due to non-zero ALS"

                            + " counter: " + localAlsCounter);

                    Slog.e(TAG, Log.getStackTraceString(new Throwable()));

                }

            }

        } else {

            mLightSensorEnabled = false;

            mLastAmbientLux = 0;

            mSensorManager.unregisterListener(mLightSensorListener);

            int localAlsCounter;

            synchronized (sLock) {

                localAlsCounter = --sAlsCounter;

            }

            if (localAlsCounter != 0) {

                Slog.e(TAG, "Non-zero ALS counter after unsubscribing from ALSProbe: "

                        + localAlsCounter);

                Slog.e(TAG, Log.getStackTraceString(new Throwable()));

            }

        }

    }

}