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

Commit 6939d8d6 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

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

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

Change-Id: I20bb1006d93233dfe7dd73c12a0eaadee229e3d5
parents bce9262c 15d1ab2f

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