diff options
author | Manikanta Tadikonda <mtadikonda@google.com> | 2023-08-15 04:01:02 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2023-08-15 04:01:02 +0000 |
commit | d2511aa09f89d230aa5eb2370f8981a9bff72095 (patch) | |
tree | 9847ffa05a35d61383c1c99d6ad56d54bd2e3883 | |
parent | 89b71489410f4fc9342a78c23f600bab5081f926 (diff) | |
parent | ee0bc1440f34300714a2bb43f6f52bb5d123f7be (diff) | |
download | service_entitlement-d2511aa09f89d230aa5eb2370f8981a9bff72095.tar.gz |
Add CanIgnoreReturnValue in OdsaResponse builder and suppress AndroidJdkLibsChecker warnings. am: 6b8fb66e89 am: 759666cdd6 am: ee0bc1440f
Original change: https://android-review.googlesource.com/c/platform/frameworks/libs/service_entitlement/+/2706637
Change-Id: I0af644473e8bce68320c6e87a9e60c9ccfaf75df
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-rw-r--r-- | java/com/android/libraries/entitlement/Ts43Operation.java | 2 | ||||
-rw-r--r-- | java/com/android/libraries/entitlement/odsa/OdsaResponse.java | 5 |
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); } } |