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

Commit 09eacb96 authored by Eric Biggers's avatar Eric Biggers Committed by Android (Google) Code Review
Browse files

Merge changes Iee462825,I9cd91ecd,Iaccbbd0d,I734c9115,Ibe6f679a, ... into udc-dev 

* changes:
  locksettings: miscellaneous logging cleanups
  locksettings: improve logging of SP and protector changes
  locksettings: improve logging of LSKF verification
  locksettings: clean up logging of cached GK password expiration
  locksettings: clean up logging of password history updates
  locksettings: clean up logging of escrow token operations
  locksettings: only log profile key removal when actually done
  locksettings: only log FRP migration when actually done
  locksettings: move credentialTypeToString to LockPatternUtils
  locksettings: zero-pad IDs when shown as hex
parents 786c9f52 f69babfe

core/java/com/android/internal/widget/LockPatternUtils.java

+15 −0
Original line number Diff line number Diff line
@@ -133,6 +133,21 @@ public class LockPatternUtils { 
    })

    public @interface CredentialType {}



    public static String credentialTypeToString(int credentialType) {

        switch (credentialType) {

            case CREDENTIAL_TYPE_NONE:

                return "NONE";

            case CREDENTIAL_TYPE_PATTERN:

                return "PATTERN";

            case CREDENTIAL_TYPE_PIN:

                return "PIN";

            case CREDENTIAL_TYPE_PASSWORD:

                return "PASSWORD";

            default:

                return "UNKNOWN_" + credentialType;

        }

    }



    /**

     * Flag provided to {@link #verifyCredential(LockscreenCredential, int, int)} . If set, the

     * method will return a handle to the Gatekeeper Password in the

services/core/java/com/android/server/locksettings/LockSettingsService.java

+58 −58

File changed.

Preview size limit exceeded, changes collapsed.

services/core/java/com/android/server/locksettings/SyntheticPasswordManager.java

+22 −6

File changed.

Preview size limit exceeded, changes collapsed.