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

Commit 0da518ac authored by Nikolas Havrikov's avatar Nikolas Havrikov Committed by Automerger Merge Worker
Browse files

Replace LinkedList by a more performant collection am: 9375c9ce am: ad76a152 

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



Change-Id: I322f2102f633174a24b573c08b5b89a97487b9cc
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents d12e6dc3 ad76a152

identity/java/android/security/identity/CredstoreIdentityCredential.java

+4 −3
Original line number Original line Diff line number Diff line
@@ -38,8 +38,9 @@ import java.security.cert.CertificateException; 
import java.security.cert.CertificateFactory;

import java.security.cert.CertificateFactory;

import java.security.cert.X509Certificate;

import java.security.cert.X509Certificate;

import java.time.Instant;

import java.time.Instant;

import java.util.ArrayList;

import java.util.Collection;

import java.util.Collection;

import java.util.LinkedList;

import java.util.List;

import java.util.Map;

import java.util.Map;





import javax.crypto.BadPaddingException;

import javax.crypto.BadPaddingException;
@@ -227,7 +228,7 @@ class CredstoreIdentityCredential extends IdentityCredential { 
                throw new RuntimeException("Error decoding certificates", e);

                throw new RuntimeException("Error decoding certificates", e);

            }

            }





            LinkedList<X509Certificate> x509Certs = new LinkedList<>();

            ArrayList<X509Certificate> x509Certs = new ArrayList<>();

            for (Certificate cert : certs) {

            for (Certificate cert : certs) {

                x509Certs.add((X509Certificate) cert);

                x509Certs.add((X509Certificate) cert);

            }

            }
@@ -384,7 +385,7 @@ class CredstoreIdentityCredential extends IdentityCredential { 
    public @NonNull Collection<X509Certificate> getAuthKeysNeedingCertification() {

    public @NonNull Collection<X509Certificate> getAuthKeysNeedingCertification() {

        try {

        try {

            AuthKeyParcel[] authKeyParcels = mBinder.getAuthKeysNeedingCertification();

            AuthKeyParcel[] authKeyParcels = mBinder.getAuthKeysNeedingCertification();

            LinkedList<X509Certificate> x509Certs = new LinkedList<>();

            ArrayList<X509Certificate> x509Certs = new ArrayList<>();

            CertificateFactory factory = CertificateFactory.getInstance("X.509");

            CertificateFactory factory = CertificateFactory.getInstance("X.509");

            for (AuthKeyParcel authKeyParcel : authKeyParcels) {

            for (AuthKeyParcel authKeyParcel : authKeyParcels) {

                Collection<? extends Certificate> certs = null;

                Collection<? extends Certificate> certs = null;

identity/java/android/security/identity/CredstoreWritableIdentityCredential.java

+3 −2
Original line number Original line Diff line number Diff line
@@ -25,8 +25,9 @@ import java.security.cert.Certificate; 
import java.security.cert.CertificateException;

import java.security.cert.CertificateException;

import java.security.cert.CertificateFactory;

import java.security.cert.CertificateFactory;

import java.security.cert.X509Certificate;

import java.security.cert.X509Certificate;

import java.util.ArrayList;

import java.util.Collection;

import java.util.Collection;

import java.util.LinkedList;

import java.util.List;





class CredstoreWritableIdentityCredential extends WritableIdentityCredential {

class CredstoreWritableIdentityCredential extends WritableIdentityCredential {
@@ -61,7 +62,7 @@ class CredstoreWritableIdentityCredential extends WritableIdentityCredential { 
                throw new RuntimeException("Error decoding certificates", e);

                throw new RuntimeException("Error decoding certificates", e);

            }

            }





            LinkedList<X509Certificate> x509Certs = new LinkedList<>();

            ArrayList<X509Certificate> x509Certs = new ArrayList<>();

            for (Certificate cert : certs) {

            for (Certificate cert : certs) {

                x509Certs.add((X509Certificate) cert);

                x509Certs.add((X509Certificate) cert);

            }

            }

identity/java/android/security/identity/PersonalizationData.java

+3 −2
Original line number Original line Diff line number Diff line
@@ -18,10 +18,11 @@ package android.security.identity; 




import android.annotation.NonNull;

import android.annotation.NonNull;





import java.util.ArrayList;

import java.util.Collection;

import java.util.Collection;

import java.util.Collections;

import java.util.Collections;

import java.util.LinkedHashMap;

import java.util.LinkedHashMap;

import java.util.LinkedList;

import java.util.List;





/**

/**

 * An object that holds personalization data.

 * An object that holds personalization data.
@@ -38,7 +39,7 @@ public class PersonalizationData { 
    private PersonalizationData() {

    private PersonalizationData() {

    }

    }





    private LinkedList<AccessControlProfile> mProfiles = new LinkedList<>();

    private ArrayList<AccessControlProfile> mProfiles = new ArrayList<>();





    private LinkedHashMap<String, NamespaceData> mNamespaces = new LinkedHashMap<>();

    private LinkedHashMap<String, NamespaceData> mNamespaces = new LinkedHashMap<>();