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

Commit 4513c0a2 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Fix key alias string comparison" into sc-qpr1-dev am: 1e1fa115 

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

Change-Id: I8015c03c376e7995ff02103e992ae904a4e43030
parents d3758a91 1e1fa115

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