Keystore 2.0 SPI: Fix contract between equals and hashCode 2 am: e36fe6bf46
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1845995 Change-Id: I72f5719d480cd0f68bac07261b298543e94aeb45
This commit is contained in:
@@ -23,7 +23,7 @@ import android.system.keystore2.KeyDescriptor;
|
||||
import android.system.keystore2.KeyMetadata;
|
||||
|
||||
import java.security.PublicKey;
|
||||
import java.util.Objects;
|
||||
import java.util.Arrays;
|
||||
|
||||
/**
|
||||
* {@link PublicKey} backed by Android Keystore.
|
||||
@@ -62,8 +62,8 @@ public abstract class AndroidKeyStorePublicKey extends AndroidKeyStoreKey implem
|
||||
int result = 1;
|
||||
|
||||
result = prime * result + super.hashCode();
|
||||
result = prime * result + ((mCertificate == null) ? 0 : mCertificate.hashCode());
|
||||
result = prime * result + ((mCertificateChain == null) ? 0 : mCertificateChain.hashCode());
|
||||
result = prime * result + Arrays.hashCode(mCertificate);
|
||||
result = prime * result + Arrays.hashCode(mCertificateChain);
|
||||
|
||||
return result;
|
||||
}
|
||||
@@ -83,7 +83,7 @@ public abstract class AndroidKeyStorePublicKey extends AndroidKeyStoreKey implem
|
||||
*/
|
||||
final AndroidKeyStorePublicKey other = (AndroidKeyStorePublicKey) obj;
|
||||
|
||||
return Objects.equals(mCertificate, other.mCertificate) && Objects.equals(mCertificateChain,
|
||||
return Arrays.equals(mCertificate, other.mCertificate) && Arrays.equals(mCertificateChain,
|
||||
other.mCertificateChain);
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user