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

Commit 97ebb4a0 authored by Kevin Chyn's avatar Kevin Chyn Committed by Automerger Merge Worker
Browse files

Merge "Add additional logging to internalCleanup" into sc-dev am: d0f5da38 

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I32194781e5cb374a94ffbbde043b00c91ed38896
parents 0d0c7f01 d0f5da38

services/core/java/com/android/server/biometrics/sensors/InternalCleanupClient.java

+8 −0
Original line number Diff line number Diff line
@@ -69,6 +69,8 @@ public abstract class InternalCleanupClient<S extends BiometricAuthenticator.Ide 
            final List<BiometricAuthenticator.Identifier> unknownHALTemplates =

                    ((InternalEnumerateClient<T>) mCurrentTask).getUnknownHALTemplates();



            Slog.d(TAG, "Enumerate onClientFinished: " + clientMonitor + ", success: " + success);



            if (!unknownHALTemplates.isEmpty()) {

                Slog.w(TAG, "Adding " + unknownHALTemplates.size() + " templates for deletion");

            }
@@ -90,6 +92,7 @@ public abstract class InternalCleanupClient<S extends BiometricAuthenticator.Ide 
    private final Callback mRemoveCallback = new Callback() {

        @Override

        public void onClientFinished(@NonNull BaseClientMonitor clientMonitor, boolean success) {

            Slog.d(TAG, "Remove onClientFinished: " + clientMonitor + ", success: " + success);

            mCallback.onClientFinished(InternalCleanupClient.this, success);

        }

    };
@@ -115,6 +118,8 @@ public abstract class InternalCleanupClient<S extends BiometricAuthenticator.Ide 
    }



    private void startCleanupUnknownHalTemplates() {

        Slog.d(TAG, "startCleanupUnknownHalTemplates, size: " + mUnknownHALTemplates.size());



        UserTemplate template = mUnknownHALTemplates.get(0);

        mUnknownHALTemplates.remove(template);

        mCurrentTask = getRemovalClient(getContext(), mLazyDaemon, getToken(),
@@ -138,6 +143,8 @@ public abstract class InternalCleanupClient<S extends BiometricAuthenticator.Ide 
        // Start enumeration. Removal will start if necessary, when enumeration is completed.

        mCurrentTask = getEnumerateClient(getContext(), mLazyDaemon, getToken(), getTargetUserId(),

                getOwnerString(), mEnrolledList, mBiometricUtils, getSensorId());



        Slog.d(TAG, "Starting enumerate: " + mCurrentTask);

        mCurrentTask.start(mEnumerateCallback);

    }
@@ -165,6 +172,7 @@ public abstract class InternalCleanupClient<S extends BiometricAuthenticator.Ide 
                    + mCurrentTask.getClass().getSimpleName());

            return;

        }

        Slog.d(TAG, "onEnumerated, remaining: " + remaining);

        ((EnumerateConsumer) mCurrentTask).onEnumerationResult(identifier, remaining);

    }

services/core/java/com/android/server/biometrics/sensors/InternalEnumerateClient.java

+2 −0
Original line number Diff line number Diff line
@@ -82,6 +82,7 @@ public abstract class InternalEnumerateClient<T> extends HalClientMonitor<T> 


    private void handleEnumeratedTemplate(BiometricAuthenticator.Identifier identifier) {

        if (identifier == null) {

            Slog.d(TAG, "Null identifier");

            return;

        }

        Slog.v(TAG, "handleEnumeratedTemplate: " + identifier.getBiometricId());
@@ -103,6 +104,7 @@ public abstract class InternalEnumerateClient<T> extends HalClientMonitor<T> 


    private void doTemplateCleanup() {

        if (mEnrolledList == null) {

            Slog.d(TAG, "Null enrolledList");

            return;

        }