From d8f630f09895cd3d7943156bf32021367f3e1c77 Mon Sep 17 00:00:00 2001
From: Chengyuan Zhang <chengyuanzhang@google.com>
Date: Fri, 27 Mar 2020 17:22:58 -0700
Subject: [PATCH] android-interop-testing: resolve build warnings (#6870)

Suppressed compiler warnings caused by protobug-javalite and errorrprone warnings from grpc-interop-testing + "throw-in-finally".
---
 android-interop-testing/build.gradle                   | 10 ++++++++++
 .../io/grpc/android/integrationtest/InteropTask.java   |  1 +
 2 files changed, 11 insertions(+)

diff --git a/android-interop-testing/build.gradle b/android-interop-testing/build.gradle
index 0c619f6b586c..36d3d21d53b3 100644
--- a/android-interop-testing/build.gradle
+++ b/android-interop-testing/build.gradle
@@ -87,4 +87,14 @@ task checkStyleTest(type: Checkstyle) {
 
 project.tasks['check'].dependsOn checkStyleMain, checkStyleTest
 
+import net.ltgt.gradle.errorprone.CheckSeverity
+
+tasks.withType(JavaCompile) {
+    options.compilerArgs += [
+            "-Xlint:-cast"
+    ]
+    // Reuses source code from grpc-interop-testing, which targets Java 7 (no method references)
+    options.errorprone.check("UnnecessaryAnonymousClass", CheckSeverity.OFF)
+}
+
 configureProtoCompilation()
diff --git a/android-interop-testing/src/main/java/io/grpc/android/integrationtest/InteropTask.java b/android-interop-testing/src/main/java/io/grpc/android/integrationtest/InteropTask.java
index 993a62555ff7..a2dae13b5917 100644
--- a/android-interop-testing/src/main/java/io/grpc/android/integrationtest/InteropTask.java
+++ b/android-interop-testing/src/main/java/io/grpc/android/integrationtest/InteropTask.java
@@ -53,6 +53,7 @@ protected void onPreExecute() {
     tester.setUp();
   }
 
+  @SuppressWarnings("Finally")
   @Override
   protected String doInBackground(Void... ignored) {
     try {