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

Commit 6e3e7a66 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Fix key alias string comparison" am: 15d1ab2f am: 6939d8d6 

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

Change-Id: Ie152bac2dcf7404c66bf69cc8c04fd52da6b6d42
parents a9185e3a 6939d8d6

keystore/java/android/security/keystore2/AndroidKeyStoreSpi.java

+1 −1
Original line number Diff line number Diff line
@@ -579,7 +579,7 @@ public class AndroidKeyStoreSpi extends KeyStoreSpi { 
        //

        // Note: mNamespace == KeyProperties.NAMESPACE_APPLICATION implies that the target domain

        // is Domain.APP and Domain.SELINUX is the target domain otherwise.

        if (alias != descriptor.alias

        if (!alias.equals(descriptor.alias)

                || descriptor.domain != targetDomain

                || (descriptor.domain == Domain.SELINUX && descriptor.nspace != targetNamespace)) {

            throw new KeyStoreException("Can only replace keys with same alias: " + alias