Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Replace LinkedList by a more performant collection

Browse Source 
This is a semi-automatic change.
See https://errorprone.info/bugpattern/JdkObsolete for the rationale.

Test: make
Bug: 221046110
Change-Id: I84591e3963b54e69570e77354e54027e17f17293
Merged-In: I84591e3963b54e69570e77354e54027e17f17293
This commit is contained in:
Nikolas Havrikov
2022-02-23 16:18:52 +01:00
committed by David Zeuthen
parent 140a69e94f
commit 9375c9ce61
3 changed files with 10 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
identity/java/android/security/identity/CredstoreIdentityCredential.java
View File

@@ -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;

5
identity/java/android/security/identity/CredstoreWritableIdentityCredential.java
View File

@@ -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);
} }

5
identity/java/android/security/identity/PersonalizationData.java
View File

@@ -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<>();