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

Commit 7e1c31bc authored by Janis Danisevskis's avatar Janis Danisevskis Committed by Automerger Merge Worker
Browse files

Keystore 2.0 SPI: Fix contract between equals and hashCode 2 am: e36fe6bf... 

Keystore 2.0 SPI: Fix contract between equals and hashCode 2 am: e36fe6bf am: 03118ee1 am: 57af2175

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

Change-Id: Id43524b6779fee4dc0d5460076388812c9da72ab
parents ac0a8c9d 57af2175

keystore/java/android/security/keystore2/AndroidKeyStorePublicKey.java

+4 −4
Original line number Diff line number Diff line
@@ -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);

    }

}