grpc
/
grpc-java
mirror of https://github.com/grpc/grpc-java.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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

This reverts commit 3ad4d9bfb7.
This commit is contained in:
Penn (Dapeng) Zhang 2022-01-18 08:36:23 -08:00 committed by ZHANG Dapeng
parent 3179bc3be0
commit cf4cd65707
8 changed files with 15 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
api/build.gradle
View File

@ -25,7 +25,7 @@ dependencies {
jmh project(':grpc-core') jmh project(':grpc-core')
signature "org.codehaus.mojo.signature:java17:1.0@signature" 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 { javadoc {

2
auth/build.gradle
View File

@ -14,5 +14,5 @@ dependencies {
testImplementation project(':grpc-testing'), testImplementation project(':grpc-testing'),
libraries.google_auth_oauth2_http libraries.google_auth_oauth2_http
signature "org.codehaus.mojo.signature:java17:1.0@signature" 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"
} }

2
context/build.gradle
View File

@ -18,5 +18,5 @@ dependencies {
exclude group: 'junit', module: 'junit' exclude group: 'junit', module: 'junit'
} }
signature "org.codehaus.mojo.signature:java17:1.0@signature" 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"
} }

2
core/build.gradle
View File

@ -43,7 +43,7 @@ dependencies {
jmh project(':grpc-testing') jmh project(':grpc-testing')
signature "org.codehaus.mojo.signature:java17:1.0@signature" 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 { javadoc {

9
core/src/main/java/io/grpc/internal/ProxyDetectorImpl.java
View File

@ -202,7 +202,14 @@ class ProxyDetectorImpl implements ProxyDetector {
private ProxiedSocketAddress detectProxy(InetSocketAddress targetAddr) throws IOException { private ProxiedSocketAddress detectProxy(InetSocketAddress targetAddr) throws IOException {
URI uri; 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 { try {
uri = uri =
new URI( new URI(

2
okhttp/build.gradle
View File

@ -22,7 +22,7 @@ dependencies {
project(':grpc-testing'), project(':grpc-testing'),
project(':grpc-netty') project(':grpc-netty')
signature "org.codehaus.mojo.signature:java17:1.0@signature" 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 { project.sourceSets {

2
protobuf-lite/build.gradle
View File

@ -18,7 +18,7 @@ dependencies {
testImplementation project(':grpc-core') testImplementation project(':grpc-core')
signature "org.codehaus.mojo.signature:java17:1.0@signature" 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 { compileTestJava {

2
stub/build.gradle
View File

@ -14,7 +14,7 @@ dependencies {
testImplementation libraries.truth, testImplementation libraries.truth,
project(':grpc-testing') project(':grpc-testing')
signature "org.codehaus.mojo.signature:java17:1.0@signature" 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 { javadoc {