Skip to content

Commit 3ad4d9b

Browse files
authored
all: clean up code related to android api level less than 19
1 parent 6f22392 commit 3ad4d9b

File tree

9 files changed

+8
-23
lines changed

9 files changed

+8
-23
lines changed

android-interop-testing/src/androidTest/java/io/grpc/android/integrationtest/InteropInstrumentationTest.java

-8
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@
2020

2121
import android.util.Log;
2222
import androidx.test.InstrumentationRegistry;
23-
import androidx.test.rule.ActivityTestRule;
2423
import androidx.test.runner.AndroidJUnit4;
2524
import com.google.android.gms.common.GooglePlayServicesNotAvailableException;
2625
import com.google.android.gms.common.GooglePlayServicesRepairableException;
@@ -30,7 +29,6 @@
3029
import java.io.InputStream;
3130
import java.util.concurrent.TimeUnit;
3231
import org.junit.Before;
33-
import org.junit.Rule;
3432
import org.junit.Test;
3533
import org.junit.runner.RunWith;
3634

@@ -46,12 +44,6 @@ public class InteropInstrumentationTest {
4644
private boolean useTestCa;
4745
private String testCase;
4846

49-
// Ensures Looper is initialized for tests running on API level 15. Otherwise instantiating an
50-
// AsyncTask throws an exception.
51-
@Rule
52-
public ActivityTestRule<TesterActivity> activityRule =
53-
new ActivityTestRule<TesterActivity>(TesterActivity.class);
54-
5547
@Before
5648
public void setUp() throws Exception {
5749
host = InstrumentationRegistry.getArguments().getString("server_host", "10.0.2.2");

api/build.gradle

+1-1
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ dependencies {
2525
jmh project(':grpc-core')
2626

2727
signature "org.codehaus.mojo.signature:java17:1.0@signature"
28-
signature "net.sf.androidscents.signature:android-api-level-14:4.0_r4@signature"
28+
signature "net.sf.androidscents.signature:android-api-level-19:4.4.2_r4@signature"
2929
}
3030

3131
javadoc {

auth/build.gradle

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,5 +14,5 @@ dependencies {
1414
testImplementation project(':grpc-testing'),
1515
libraries.google_auth_oauth2_http
1616
signature "org.codehaus.mojo.signature:java17:1.0@signature"
17-
signature "net.sf.androidscents.signature:android-api-level-14:4.0_r4@signature"
17+
signature "net.sf.androidscents.signature:android-api-level-19:4.4.2_r4@signature"
1818
}

context/build.gradle

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,5 +15,5 @@ dependencies {
1515
exclude group: 'junit', module: 'junit'
1616
}
1717
signature "org.codehaus.mojo.signature:java17:1.0@signature"
18-
signature "net.sf.androidscents.signature:android-api-level-14:4.0_r4@signature"
18+
signature "net.sf.androidscents.signature:android-api-level-19:4.4.2_r4@signature"
1919
}

core/build.gradle

+1-1
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ dependencies {
4343
jmh project(':grpc-testing')
4444

4545
signature "org.codehaus.mojo.signature:java17:1.0@signature"
46-
signature "net.sf.androidscents.signature:android-api-level-14:4.0_r4@signature"
46+
signature "net.sf.androidscents.signature:android-api-level-19:4.4.2_r4@signature"
4747
}
4848

4949
javadoc {

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

+1-8
Original file line numberDiff line numberDiff line change
@@ -202,14 +202,7 @@ public ProxiedSocketAddress proxyFor(SocketAddress targetServerAddress) throws I
202202

203203
private ProxiedSocketAddress detectProxy(InetSocketAddress targetAddr) throws IOException {
204204
URI uri;
205-
String host;
206-
try {
207-
host = GrpcUtil.getHost(targetAddr);
208-
} catch (Throwable t) {
209-
// Workaround for Android API levels < 19 if getHostName causes a NetworkOnMainThreadException
210-
log.log(Level.WARNING, "Failed to get host for proxy lookup, proceeding without proxy", t);
211-
return null;
212-
}
205+
String host = GrpcUtil.getHost(targetAddr);
213206
try {
214207
uri =
215208
new URI(

okhttp/build.gradle

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ dependencies {
2222
project(':grpc-testing'),
2323
project(':grpc-netty')
2424
signature "org.codehaus.mojo.signature:java17:1.0@signature"
25-
signature "net.sf.androidscents.signature:android-api-level-14:4.0_r4@signature"
25+
signature "net.sf.androidscents.signature:android-api-level-19:4.4.2_r4@signature"
2626
}
2727

2828
project.sourceSets {

protobuf-lite/build.gradle

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ dependencies {
1818
testImplementation project(':grpc-core')
1919

2020
signature "org.codehaus.mojo.signature:java17:1.0@signature"
21-
signature "net.sf.androidscents.signature:android-api-level-14:4.0_r4@signature"
21+
signature "net.sf.androidscents.signature:android-api-level-19:4.4.2_r4@signature"
2222
}
2323

2424
compileTestJava {

stub/build.gradle

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ dependencies {
1414
testImplementation libraries.truth,
1515
project(':grpc-testing')
1616
signature "org.codehaus.mojo.signature:java17:1.0@signature"
17-
signature "net.sf.androidscents.signature:android-api-level-14:4.0_r4@signature"
17+
signature "net.sf.androidscents.signature:android-api-level-19:4.4.2_r4@signature"
1818
}
1919

2020
javadoc {

0 commit comments

Comments
 (0)