From 5e18ff208aacd1d626716603a8aa57563b399ace Mon Sep 17 00:00:00 2001
From: markb74 <57717302+markb74@users.noreply.github.com>
Date: Wed, 14 Jul 2021 13:10:28 +0200
Subject: [PATCH] Run binderchannel android tests. (#8306)

---
 .../internal/BinderClientTransportTest.java       |  5 -----
 buildscripts/kokoro/android-interop.sh            | 15 +++++++++++++++
 2 files changed, 15 insertions(+), 5 deletions(-)

diff --git a/binder/src/androidTest/java/io/grpc/binder/internal/BinderClientTransportTest.java b/binder/src/androidTest/java/io/grpc/binder/internal/BinderClientTransportTest.java
index 903e4807a6..0d3c3bf4b5 100644
--- a/binder/src/androidTest/java/io/grpc/binder/internal/BinderClientTransportTest.java
+++ b/binder/src/androidTest/java/io/grpc/binder/internal/BinderClientTransportTest.java
@@ -325,11 +325,6 @@ public final class BinderClientTransportTest {
       this.headers = headers;
     }
 
-    @Override
-    public void closed(Status status, Metadata trailers) {
-      this.closedStatus = status;
-    }
-
     @Override
     public void closed(Status status, RpcProgress rpcProgress, Metadata trailers) {
       this.closedStatus = status;
diff --git a/buildscripts/kokoro/android-interop.sh b/buildscripts/kokoro/android-interop.sh
index 5d9774bb12..8a8a2bc7bc 100755
--- a/buildscripts/kokoro/android-interop.sh
+++ b/buildscripts/kokoro/android-interop.sh
@@ -38,3 +38,18 @@ gcloud firebase test android run \
   --device model=Nexus6P,version=23,locale=en,orientation=portrait \
   --device model=Nexus6,version=22,locale=en,orientation=portrait \
   --device model=Nexus6,version=21,locale=en,orientation=portrait
+
+# Build and run binder transport instrumentation tests on Firebase Test Lab
+cd ../binder
+../gradlew assembleDebug
+../gradlew assembleDebugAndroidTest
+gcloud firebase test android run \
+  --type instrumentation \
+  --test build/outputs/apk/androidTest/debug/grpc-binder-debug-androidTest.apk \
+  --device model=Nexus6P,version=27,locale=en,orientation=portrait \
+  --device model=Nexus6P,version=26,locale=en,orientation=portrait \
+  --device model=Nexus6P,version=25,locale=en,orientation=portrait \
+  --device model=Nexus6P,version=24,locale=en,orientation=portrait \
+  --device model=Nexus6P,version=23,locale=en,orientation=portrait \
+  --device model=Nexus6,version=22,locale=en,orientation=portrait \
+  --device model=Nexus6,version=21,locale=en,orientation=portrait