Revert "all: clean up code related to android api level less than 19"

dapengzhang0 · dapengzhang0 · commit cf4cd65707fb · 2022-01-18T10:14:50.000-08:00
This reverts commit 3ad4d9b.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -202,7 +202,14 @@ public ProxiedSocketAddress proxyFor(SocketAddress targetServerAddress) throws I
 
   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
@@ -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
@@ -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
@@ -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 {

Original file line number	Diff line number	Diff line change
`@@ -25,7 +25,7 @@ dependencies {`
`25`	`25`	`jmh project(':grpc-core')`
`26`	`26`
`27`	`27`	`signature "org.codehaus.mojo.signature:java17:1.0@signature"`
`28`		`- signature "net.sf.androidscents.signature:android-api-level-19:4.4.2_r4@signature"`
	`28`	`+ signature "net.sf.androidscents.signature:android-api-level-14:4.0_r4@signature"`
`29`	`29`	`}`
`30`	`30`
`31`	`31`	`javadoc {`
Original file line number	Diff line number	Diff line change
`@@ -14,5 +14,5 @@ dependencies {`
`14`	`14`	`testImplementation project(':grpc-testing'),`
`15`	`15`	`libraries.google_auth_oauth2_http`
`16`	`16`	`signature "org.codehaus.mojo.signature:java17:1.0@signature"`
`17`		`- signature "net.sf.androidscents.signature:android-api-level-19:4.4.2_r4@signature"`
	`17`	`+ signature "net.sf.androidscents.signature:android-api-level-14:4.0_r4@signature"`
`18`	`18`	`}`
Original file line number	Diff line number	Diff line change
`@@ -18,5 +18,5 @@ dependencies {`
`18`	`18`	`exclude group: 'junit', module: 'junit'`
`19`	`19`	`}`
`20`	`20`	`signature "org.codehaus.mojo.signature:java17:1.0@signature"`
`21`		`- signature "net.sf.androidscents.signature:android-api-level-19:4.4.2_r4@signature"`
	`21`	`+ signature "net.sf.androidscents.signature:android-api-level-14:4.0_r4@signature"`
`22`	`22`	`}`
Original file line number	Diff line number	Diff line change
`@@ -43,7 +43,7 @@ dependencies {`
`43`	`43`	`jmh project(':grpc-testing')`
`44`	`44`
`45`	`45`	`signature "org.codehaus.mojo.signature:java17:1.0@signature"`
`46`		`- signature "net.sf.androidscents.signature:android-api-level-19:4.4.2_r4@signature"`
	`46`	`+ signature "net.sf.androidscents.signature:android-api-level-14:4.0_r4@signature"`
`47`	`47`	`}`
`48`	`48`
`49`	`49`	`javadoc {`
Original file line number	Diff line number	Diff line change
`@@ -22,7 +22,7 @@ dependencies {`
`22`	`22`	`project(':grpc-testing'),`
`23`	`23`	`project(':grpc-netty')`
`24`	`24`	`signature "org.codehaus.mojo.signature:java17:1.0@signature"`
`25`		`- signature "net.sf.androidscents.signature:android-api-level-19:4.4.2_r4@signature"`
	`25`	`+ signature "net.sf.androidscents.signature:android-api-level-14:4.0_r4@signature"`
`26`	`26`	`}`
`27`	`27`
`28`	`28`	`project.sourceSets {`
Original file line number	Diff line number	Diff line change
`@@ -18,7 +18,7 @@ dependencies {`
`18`	`18`	`testImplementation project(':grpc-core')`
`19`	`19`
`20`	`20`	`signature "org.codehaus.mojo.signature:java17:1.0@signature"`
`21`		`- signature "net.sf.androidscents.signature:android-api-level-19:4.4.2_r4@signature"`
	`21`	`+ signature "net.sf.androidscents.signature:android-api-level-14:4.0_r4@signature"`
`22`	`22`	`}`
`23`	`23`
`24`	`24`	`compileTestJava {`
Original file line number	Diff line number	Diff line change
`@@ -14,7 +14,7 @@ dependencies {`
`14`	`14`	`testImplementation libraries.truth,`
`15`	`15`	`project(':grpc-testing')`
`16`	`16`	`signature "org.codehaus.mojo.signature:java17:1.0@signature"`
`17`		`- signature "net.sf.androidscents.signature:android-api-level-19:4.4.2_r4@signature"`
	`17`	`+ signature "net.sf.androidscents.signature:android-api-level-14:4.0_r4@signature"`
`18`	`18`	`}`
`19`	`19`
`20`	`20`	`javadoc {`