Add CanIgnoreReturnValue in OdsaResponse builder and suppress AndroidJdkLibsChecker warnings. am: 6b8fb66e89

Original change: https://android-review.googlesource.com/c/platform/frameworks/libs/service_entitlement/+/2706637

Change-Id: Ief6bff8a72cda93ae9a992ac5e358864410ece19
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

2 files changed, 7 insertions, 0 deletions

diff --git a/java/com/android/libraries/entitlement/Ts43Operation.java b/java/com/android/libraries/entitlement/Ts43Operation.java
index 4221514..e603e86 100644
--- a/java/com/android/libraries/entitlement/Ts43Operation.java
+++ b/java/com/android/libraries/entitlement/Ts43Operation.java
@@ -767,6 +767,7 @@ public class Ts43Operation {
      *                                     {@link ServiceEntitlementException#getHttpStatus()}
      */
     @NonNull
+    @SuppressWarnings("AndroidJdkLibsChecker") // java.time.Instant
     public AcquireTemporaryTokenResponse acquireTemporaryToken(
             @NonNull AcquireTemporaryTokenRequest acquireTemporaryTokenRequest)
             throws ServiceEntitlementException {
@@ -933,6 +934,7 @@ public class Ts43Operation {
      * @return The download info.
      */
     @Nullable
+    @SuppressWarnings("AndroidJdkLibsChecker") // java.util.Base64
     private DownloadInfo parseDownloadInfo(
             @NonNull ImmutableList<String> characteristics, @NonNull Ts43XmlDoc ts43XmlDoc) {
         String activationCode =
diff --git a/java/com/android/libraries/entitlement/odsa/OdsaResponse.java b/java/com/android/libraries/entitlement/odsa/OdsaResponse.java
index 18142c6..f81a64b 100644
--- a/java/com/android/libraries/entitlement/odsa/OdsaResponse.java
+++ b/java/com/android/libraries/entitlement/odsa/OdsaResponse.java
@@ -21,6 +21,8 @@ import androidx.annotation.Nullable;
 
 import com.android.libraries.entitlement.EsimOdsaOperation.OdsaOperationResult;
 
+import com.google.errorprone.annotations.CanIgnoreReturnValue;
+
 import java.net.URL;
 
 /** ODSA general response described in GSMA Service Entitlement Configuration section 6.5.1. */
@@ -52,6 +54,7 @@ public abstract class OdsaResponse {
          * @return The builder.
          */
         @NonNull
+        @CanIgnoreReturnValue
         public abstract Builder setOperationResult(@OdsaOperationResult int operationResult);
 
         /**
@@ -62,6 +65,7 @@ public abstract class OdsaResponse {
          * @return The builder.
          */
         @NonNull
+        @CanIgnoreReturnValue
         public abstract Builder setGeneralErrorUrl(@NonNull URL url);
 
         /**
@@ -74,6 +78,7 @@ public abstract class OdsaResponse {
          * @return The builder.
          */
         @NonNull
+        @CanIgnoreReturnValue
         public abstract Builder setGeneralErrorUserData(@NonNull String userData);
     }
 }