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

Merge "Replace com.android.internal.util.Preconditions.checkNotNull with java.util.Objects.requireNonNull"

Browse Source
This commit is contained in:
TreeHugger Robot
2019-12-19 19:17:11 +00:00
committed by Android (Google) Code Review
parent c117d0ebb5 75519c08f1
commit 1e0398dc47
5 changed files with 18 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
core/java/android/security/keystore/recovery/KeyChainProtectionParams.java
View File

@@ -22,11 +22,10 @@ import android.annotation.SystemApi;
import android.os.Parcel;
import android.os.Parcelable;
import com.android.internal.util.Preconditions;
import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy;
import java.util.Arrays;
import java.util.Objects;
/**
* A {@link KeyChainSnapshot} is protected with a key derived from the user's lock screen. This
@@ -220,8 +219,8 @@ public final class KeyChainProtectionParams implements Parcelable {
if (mInstance.mUserSecretType == null) {
mInstance.mUserSecretType = TYPE_LOCKSCREEN;
}
Preconditions.checkNotNull(mInstance.mLockScreenUiFormat);
Preconditions.checkNotNull(mInstance.mKeyDerivationParams);
Objects.requireNonNull(mInstance.mLockScreenUiFormat);
Objects.requireNonNull(mInstance.mKeyDerivationParams);
if (mInstance.mSecret == null) {
mInstance.mSecret = new byte[]{};
}

7
core/java/android/security/keystore/recovery/KeyChainSnapshot.java
View File

@@ -27,6 +27,7 @@ import com.android.internal.util.Preconditions;
import java.security.cert.CertPath;
import java.security.cert.CertificateException;
import java.util.List;
import java.util.Objects;
/**
* A snapshot of a version of the keystore. Two events can trigger the generation of a new snapshot:
@@ -272,9 +273,9 @@ public final class KeyChainSnapshot implements Parcelable {
"keyChainProtectionParams");
Preconditions.checkCollectionElementsNotNull(mInstance.mEntryRecoveryData,
"entryRecoveryData");
Preconditions.checkNotNull(mInstance.mEncryptedRecoveryKeyBlob);
Preconditions.checkNotNull(mInstance.mServerParams);
Preconditions.checkNotNull(mInstance.mCertPath);
Objects.requireNonNull(mInstance.mEncryptedRecoveryKeyBlob);
Objects.requireNonNull(mInstance.mServerParams);
Objects.requireNonNull(mInstance.mCertPath);
return mInstance;
}
}

5
core/java/android/security/keystore/recovery/KeyDerivationParams.java
View File

@@ -22,10 +22,9 @@ import android.annotation.SystemApi;
import android.os.Parcel;
import android.os.Parcelable;
import com.android.internal.util.Preconditions;
import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy;
import java.util.Objects;
/**
* Collection of parameters which define a key derivation function.
@@ -109,7 +108,7 @@ public final class KeyDerivationParams implements Parcelable {
private KeyDerivationParams(@KeyDerivationAlgorithm int algorithm, @NonNull byte[] salt,
int memoryDifficulty) {
mAlgorithm = algorithm;
mSalt = Preconditions.checkNotNull(salt);
mSalt = Objects.requireNonNull(salt);
mMemoryDifficulty = memoryDifficulty;
}

9
core/java/android/security/keystore/recovery/RecoveryCertPath.java
View File

@@ -20,13 +20,12 @@ import android.annotation.NonNull;
import android.os.Parcel;
import android.os.Parcelable;
import com.android.internal.util.Preconditions;
import java.io.ByteArrayInputStream;
import java.security.cert.CertPath;
import java.security.cert.CertificateEncodingException;
import java.security.cert.CertificateException;
import java.security.cert.CertificateFactory;
import java.util.Objects;
/**
* The certificate path of the recovery service.
@@ -67,7 +66,7 @@ public final class RecoveryCertPath implements Parcelable {
}
private RecoveryCertPath(@NonNull byte[] encodedCertPath) {
mEncodedCertPath = Preconditions.checkNotNull(encodedCertPath);
mEncodedCertPath = Objects.requireNonNull(encodedCertPath);
}
private RecoveryCertPath(Parcel in) {
@@ -98,13 +97,13 @@ public final class RecoveryCertPath implements Parcelable {
@NonNull
private static byte[] encodeCertPath(@NonNull CertPath certPath)
throws CertificateEncodingException {
Preconditions.checkNotNull(certPath);
Objects.requireNonNull(certPath);
return certPath.getEncoded(CERT_PATH_ENCODING);
}
@NonNull
private static CertPath decodeCertPath(@NonNull byte[] bytes) throws CertificateException {
Preconditions.checkNotNull(bytes);
Objects.requireNonNull(bytes);
CertificateFactory certFactory;
try {
certFactory = CertificateFactory.getInstance("X.509");

10
core/java/android/security/keystore/recovery/WrappedApplicationKey.java
View File

@@ -22,7 +22,7 @@ import android.annotation.SystemApi;
import android.os.Parcel;
import android.os.Parcelable;
import com.android.internal.util.Preconditions;
import java.util.Objects;
/**
* Helper class with data necessary recover a single application key, given a recovery key.
@@ -106,8 +106,8 @@ public final class WrappedApplicationKey implements Parcelable {
* @throws NullPointerException if some required fields were not set.
*/
public @NonNull WrappedApplicationKey build() {
Preconditions.checkNotNull(mInstance.mAlias);
Preconditions.checkNotNull(mInstance.mEncryptedKeyMaterial);
Objects.requireNonNull(mInstance.mAlias);
Objects.requireNonNull(mInstance.mEncryptedKeyMaterial);
return mInstance;
}
}
@@ -120,8 +120,8 @@ public final class WrappedApplicationKey implements Parcelable {
*/
@Deprecated
public WrappedApplicationKey(@NonNull String alias, @NonNull byte[] encryptedKeyMaterial) {
mAlias = Preconditions.checkNotNull(alias);
mEncryptedKeyMaterial = Preconditions.checkNotNull(encryptedKeyMaterial);
mAlias = Objects.requireNonNull(alias);
mEncryptedKeyMaterial = Objects.requireNonNull(encryptedKeyMaterial);
}
/**