From cf4cd65707fb8e8fb501754996dea215525503ca Mon Sep 17 00:00:00 2001
From: "Penn (Dapeng) Zhang" <zdapeng@google.com>
Date: Tue, 18 Jan 2022 08:36:23 -0800
Subject: [PATCH] Revert "all: clean up code related to android api level less
 than 19"

This reverts commit 3ad4d9bfb7f7407ec0b9637ee1de508051192676.
---
 api/build.gradle                                         | 2 +-
 auth/build.gradle                                        | 2 +-
 context/build.gradle                                     | 2 +-
 core/build.gradle                                        | 2 +-
 .../main/java/io/grpc/internal/ProxyDetectorImpl.java    | 9 ++++++++-
 okhttp/build.gradle                                      | 2 +-
 protobuf-lite/build.gradle                               | 2 +-
 stub/build.gradle                                        | 2 +-
 8 files changed, 15 insertions(+), 8 deletions(-)

diff --git a/api/build.gradle b/api/build.gradle
index 3c7ff8221e..9f5e616315 100644
--- a/api/build.gradle
+++ b/api/build.gradle
@@ -25,7 +25,7 @@ dependencies {
     jmh project(':grpc-core')
 
     signature "org.codehaus.mojo.signature:java17:1.0@signature"
-    signature "net.sf.androidscents.signature:android-api-level-19:4.4.2_r4@signature"
+    signature "net.sf.androidscents.signature:android-api-level-14:4.0_r4@signature"
 }
 
 javadoc {
diff --git a/auth/build.gradle b/auth/build.gradle
index 791402fce5..233de359b4 100644
--- a/auth/build.gradle
+++ b/auth/build.gradle
@@ -14,5 +14,5 @@ dependencies {
     testImplementation project(':grpc-testing'),
             libraries.google_auth_oauth2_http
     signature "org.codehaus.mojo.signature:java17:1.0@signature"
-    signature "net.sf.androidscents.signature:android-api-level-19:4.4.2_r4@signature"
+    signature "net.sf.androidscents.signature:android-api-level-14:4.0_r4@signature"
 }
diff --git a/context/build.gradle b/context/build.gradle
index ba530df54f..1e69296c82 100644
--- a/context/build.gradle
+++ b/context/build.gradle
@@ -18,5 +18,5 @@ dependencies {
         exclude group: 'junit', module: 'junit'
     }
     signature "org.codehaus.mojo.signature:java17:1.0@signature"
-    signature "net.sf.androidscents.signature:android-api-level-19:4.4.2_r4@signature"
+    signature "net.sf.androidscents.signature:android-api-level-14:4.0_r4@signature"
 }
diff --git a/core/build.gradle b/core/build.gradle
index ed8e540076..bc8231fd9e 100644
--- a/core/build.gradle
+++ b/core/build.gradle
@@ -43,7 +43,7 @@ dependencies {
     jmh project(':grpc-testing')
 
     signature "org.codehaus.mojo.signature:java17:1.0@signature"
-    signature "net.sf.androidscents.signature:android-api-level-19:4.4.2_r4@signature"
+    signature "net.sf.androidscents.signature:android-api-level-14:4.0_r4@signature"
 }
 
 javadoc {
diff --git a/core/src/main/java/io/grpc/internal/ProxyDetectorImpl.java b/core/src/main/java/io/grpc/internal/ProxyDetectorImpl.java
index 0cc1dd3aac..3e7dd010e2 100644
--- a/core/src/main/java/io/grpc/internal/ProxyDetectorImpl.java
+++ b/core/src/main/java/io/grpc/internal/ProxyDetectorImpl.java
@@ -202,7 +202,14 @@ class ProxyDetectorImpl implements ProxyDetector {
 
   private ProxiedSocketAddress detectProxy(InetSocketAddress targetAddr) throws IOException {
     URI uri;
-    String host = GrpcUtil.getHost(targetAddr);
+    String host;
+    try {
+      host = GrpcUtil.getHost(targetAddr);
+    } catch (Throwable t) {
+      // Workaround for Android API levels < 19 if getHostName causes a NetworkOnMainThreadException
+      log.log(Level.WARNING, "Failed to get host for proxy lookup, proceeding without proxy", t);
+      return null;
+    }
     try {
       uri =
           new URI(
diff --git a/okhttp/build.gradle b/okhttp/build.gradle
index 3271118fed..999f21e7c1 100644
--- a/okhttp/build.gradle
+++ b/okhttp/build.gradle
@@ -22,7 +22,7 @@ dependencies {
             project(':grpc-testing'),
             project(':grpc-netty')
     signature "org.codehaus.mojo.signature:java17:1.0@signature"
-    signature "net.sf.androidscents.signature:android-api-level-19:4.4.2_r4@signature"
+    signature "net.sf.androidscents.signature:android-api-level-14:4.0_r4@signature"
 }
 
 project.sourceSets {
diff --git a/protobuf-lite/build.gradle b/protobuf-lite/build.gradle
index 75cca43f0e..7b58309c41 100644
--- a/protobuf-lite/build.gradle
+++ b/protobuf-lite/build.gradle
@@ -18,7 +18,7 @@ dependencies {
     testImplementation project(':grpc-core')
 
     signature "org.codehaus.mojo.signature:java17:1.0@signature"
-    signature "net.sf.androidscents.signature:android-api-level-19:4.4.2_r4@signature"
+    signature "net.sf.androidscents.signature:android-api-level-14:4.0_r4@signature"
 }
 
 compileTestJava {
diff --git a/stub/build.gradle b/stub/build.gradle
index 7d8040a87c..2b5a6a4edb 100644
--- a/stub/build.gradle
+++ b/stub/build.gradle
@@ -14,7 +14,7 @@ dependencies {
     testImplementation libraries.truth,
             project(':grpc-testing')
     signature "org.codehaus.mojo.signature:java17:1.0@signature"
-    signature "net.sf.androidscents.signature:android-api-level-19:4.4.2_r4@signature"
+    signature "net.sf.androidscents.signature:android-api-level-14:4.0_r4@signature"
 }
 
 javadoc {