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

Commit 58604f00 authored by Bo Zhu's avatar Bo Zhu Committed by Android (Google) Code Review
Browse files

Merge "Change two helper methods back to be public ones, to fix issues of... 

Merge "Change two helper methods back to be public ones, to fix issues of mocking them in KeySyncTaskTest.java"
parents d906d809 b502c760

services/core/java/com/android/server/locksettings/recoverablekeystore/TestOnlyInsecureCertificateHelper.java

+2 −2
Original line number Diff line number Diff line
@@ -87,13 +87,13 @@ public class TestOnlyInsecureCertificateHelper { 
                || isTestOnlyCertificateAlias(rootCertificateAlias);

    }



    boolean doesCredentialSupportInsecureMode(int credentialType, String credential) {

    public boolean doesCredentialSupportInsecureMode(int credentialType, String credential) {

        return (credentialType == LockPatternUtils.CREDENTIAL_TYPE_PASSWORD)

            && (credential != null)

            && credential.startsWith(TrustedRootCertificates.INSECURE_PASSWORD_PREFIX);

    }



    Map<String, Pair<SecretKey, byte[]>> keepOnlyWhitelistedInsecureKeys(

    public Map<String, Pair<SecretKey, byte[]>> keepOnlyWhitelistedInsecureKeys(

            Map<String, Pair<SecretKey, byte[]>> rawKeys) {

        if (rawKeys == null) {

            return null;