Revert 'android-interop-testing: Remove usage of MultiDexApplication' and 'core: Wait for backoff timer on address update in pick_first'

Author: AgraVator

android-interop-testing/build.gradle

@@ -33,11 +33,15 @@ android {
 
     defaultConfig {
         applicationId "io.grpc.android.integrationtest"
-        minSdkVersion 23
+        // Held back to 20 as Gradle fails to build at the 21 level. This is
+        // presumably a Gradle bug that can be revisited later.
+        // Maybe this issue: https://github.com/gradle/gradle/issues/20778
+        minSdkVersion 20
         targetSdkVersion 33
         versionCode 1
         versionName "1.0"
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
+        multiDexEnabled = true
     }
     buildTypes {
         debug { minifyEnabled false }
@@ -58,11 +62,11 @@ android {
 
 dependencies {
     implementation 'androidx.appcompat:appcompat:1.3.0'
+    implementation 'androidx.multidex:multidex:2.0.0'
     implementation libraries.androidx.annotation
     implementation 'com.google.android.gms:play-services-base:18.0.1'
 
     implementation project(':grpc-android'),
-            project(':grpc-api'),
             project(':grpc-core'),
             project(':grpc-census'),
             project(':grpc-okhttp'),

android-interop-testing/src/androidTest/AndroidManifest.xml

@@ -5,7 +5,8 @@
         android:name="androidx.test.runner.AndroidJUnitRunner"
         android:targetPackage="io.grpc.android.integrationtest" />
 
-    <application>
+    <application
+        android:name="android.support.multidex.MultiDexApplication" >
     </application>
 
 </manifest>

android-interop-testing/src/main/AndroidManifest.xml

@@ -14,7 +14,8 @@
         android:allowBackup="true"
         android:icon="@mipmap/ic_launcher"
         android:label="@string/app_name"
-        android:theme="@style/Base.V7.Theme.AppCompat.Light">
+        android:theme="@style/Base.V7.Theme.AppCompat.Light"
+        android:name="androidx.multidex.MultiDexApplication">
         <activity
             android:name=".TesterActivity"
             android:exported="true">

binder/build.gradle

@@ -18,6 +18,7 @@ android {
         versionCode 1
         versionName "1.0"
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
+        multiDexEnabled = true
     }
     lintOptions { abortOnError = false }
     publishing {

core/src/main/java/io/grpc/internal/PickFirstLeafLoadBalancer.java

@@ -496,7 +496,7 @@ private void shutdownRemaining(SubchannelData activeSubchannelData) {
    */
   @Override
   public void requestConnection() {
-    if (!addressIndex.isValid() || rawConnectivityState == SHUTDOWN || reconnectTask != null) {
+    if (!addressIndex.isValid() || rawConnectivityState == SHUTDOWN) {
       return;
     }
 

core/src/test/java/io/grpc/internal/PickFirstLeafLoadBalancerTest.java

@@ -1446,11 +1446,6 @@ public void updateAddresses_disjoint_transient_failure() {
     loadBalancer.acceptResolvedAddresses(
         ResolvedAddresses.newBuilder().setAddresses(newServers).setAttributes(affinity).build());
 
-    if (serializeRetries) {
-      inOrder.verify(mockSubchannel3, never()).start(stateListenerCaptor.capture());
-      forwardTimeByBackoffDelay();
-    }
-
     // subchannel 3 still attempts a connection even though we stay in transient failure
     assertEquals(TRANSIENT_FAILURE, loadBalancer.getConcludedConnectivityState());
     inOrder.verify(mockSubchannel3).start(stateListenerCaptor.capture());

examples/android/clientcache/app/build.gradle

@@ -10,8 +10,9 @@ android {
 
     defaultConfig {
         applicationId "io.grpc.clientcacheexample"
-        minSdkVersion 23
+        minSdkVersion 21
         targetSdkVersion 33
+        multiDexEnabled true
         versionCode 1
         versionName "1.0"
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"