Revert "Add Immutable annotations"

This reverts commit 8c10242. Reason for revert: the fields are not actually immutable, see https://sponge.corp.google.com/invocation?tab=Build+Log&id=cbe6565d-5515-4e81-98ac-bbda2c3677d0. Change-Id: I2649a15d0ae7c72d66babbd86b996f2760e3aa33
google · Jul 30, 2019 · 2fe33ac · 2fe33ac
1 parent 8c10242
commit 2fe33ac
Show file tree

Hide file tree

Showing 4 changed files with 0 additions and 8 deletions.
diff --git a/server/build.gradle b/server/build.gradle
@@ -31,6 +31,4 @@ dependencies {
     testCompile 'junit:junit:4.12'
     testCompile 'com.google.truth:truth:1.0'
     testCompile 'com.google.truth.extensions:truth-java8-extension:1.0'
-    // ErrorProne for Immutable annotation
-    compile 'com.google.errorprone:error_prone_annotations:2.3.3'
 }
diff --git a/server/src/main/java/com/google/android/attestation/AuthorizationList.java b/server/src/main/java/com/google/android/attestation/AuthorizationList.java
@@ -53,7 +53,6 @@
 import static com.google.android.attestation.Constants.KM_TAG_USER_AUTH_TYPE;
 import static com.google.android.attestation.Constants.KM_TAG_VENDOR_PATCH_LEVEL;
 
-import com.google.errorprone.annotations.Immutable;
 import java.time.Duration;
 import java.time.Instant;
 import java.util.HashMap;
@@ -74,7 +73,6 @@
  * hardware abstraction layer (HAL). You compare these values to the device's current state or to a
  * set of expected values to verify that a key pair is still valid for use in your app.
  */
-@Immutable
 @SuppressWarnings("OptionalUsedAsFieldOrParameterType")
 public class AuthorizationList {
 

diff --git a/server/src/main/java/com/google/android/attestation/ParsedAttestationRecord.java b/server/src/main/java/com/google/android/attestation/ParsedAttestationRecord.java
@@ -28,15 +28,13 @@
 import static com.google.android.attestation.Constants.TEE_ENFORCED_INDEX;
 import static com.google.android.attestation.Constants.UNIQUE_ID_INDEX;
 
-import com.google.errorprone.annotations.Immutable;
 import java.io.IOException;
 import java.security.cert.X509Certificate;
 import org.bouncycastle.asn1.ASN1InputStream;
 import org.bouncycastle.asn1.ASN1OctetString;
 import org.bouncycastle.asn1.ASN1Sequence;
 
 /** Java representation of Key Attestation extension data. */
-@Immutable
 public class ParsedAttestationRecord {
 
   public final int attestationVersion;

diff --git a/server/src/main/java/com/google/android/attestation/RootOfTrust.java b/server/src/main/java/com/google/android/attestation/RootOfTrust.java
@@ -24,12 +24,10 @@
 import static com.google.android.attestation.Constants.ROOT_OF_TRUST_VERIFIED_BOOT_KEY_INDEX;
 import static com.google.android.attestation.Constants.ROOT_OF_TRUST_VERIFIED_BOOT_STATE_INDEX;
 
-import com.google.errorprone.annotations.Immutable;
 import org.bouncycastle.asn1.ASN1OctetString;
 import org.bouncycastle.asn1.ASN1Sequence;
 
 /** This collection of values defines key information about the device's status. */
-@Immutable
 public class RootOfTrust {
 
   public final byte[] verifiedBootKey;