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

Commit 8308d814 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 am: 7e1c31bc am: 45155ab2

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

Change-Id: Ic5dcb6461a4ff4528fa1b1de356a26bf832f44f6
parents ab0ddf1f 45155ab2
Loading
Loading
Loading
Loading
+4 −4
Original line number Original line Diff line number Diff line
@@ -23,7 +23,7 @@ import android.system.keystore2.KeyDescriptor;
import android.system.keystore2.KeyMetadata;
import android.system.keystore2.KeyMetadata;


import java.security.PublicKey;
import java.security.PublicKey;
import java.util.Objects;
import java.util.Arrays;


/**
/**
 * {@link PublicKey} backed by Android Keystore.
 * {@link PublicKey} backed by Android Keystore.
@@ -62,8 +62,8 @@ public abstract class AndroidKeyStorePublicKey extends AndroidKeyStoreKey implem
        int result = 1;
        int result = 1;


        result = prime * result + super.hashCode();
        result = prime * result + super.hashCode();
        result = prime * result + ((mCertificate == null) ? 0 : mCertificate.hashCode());
        result = prime * result + Arrays.hashCode(mCertificate);
        result = prime * result + ((mCertificateChain == null) ? 0 : mCertificateChain.hashCode());
        result = prime * result + Arrays.hashCode(mCertificateChain);


        return result;
        return result;
    }
    }
@@ -83,7 +83,7 @@ public abstract class AndroidKeyStorePublicKey extends AndroidKeyStoreKey implem
         */
         */
        final AndroidKeyStorePublicKey other = (AndroidKeyStorePublicKey) obj;
        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);
                other.mCertificateChain);
    }
    }
}
}