Merge "Fix key alias string comparison" into sc-qpr1-dev (1e1fa115) · Commits · e / os / android_frameworks_base

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

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -579,7 +579,7 @@ public class AndroidKeyStoreSpi extends KeyStoreSpi {
	//		//
	// Note: mNamespace == KeyProperties.NAMESPACE_APPLICATION implies that the target domain		// Note: mNamespace == KeyProperties.NAMESPACE_APPLICATION implies that the target domain
	// is Domain.APP and Domain.SELINUX is the target domain otherwise.		// 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 != targetDomain
	\|\| (descriptor.domain == Domain.SELINUX && descriptor.nspace != targetNamespace)) {		\|\| (descriptor.domain == Domain.SELINUX && descriptor.nspace != targetNamespace)) {
	throw new KeyStoreException("Can only replace keys with same alias: " + alias		throw new KeyStoreException("Can only replace keys with same alias: " + alias