Merge "Fix key alias string comparison"

2021-08-24 17:37:06 +00:00
parent 39366563d3 11cce949b6
commit 15d1ab2fdd
1 changed files with 1 additions and 1 deletions
--- a/keystore/java/android/security/keystore2/AndroidKeyStoreSpi.java
+++ b/keystore/java/android/security/keystore2/AndroidKeyStoreSpi.java
@ -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