| commit | c85d942a3e7808d43908b0ef56e77782ef06e185 | [log] [tgz] |
|---|---|---|
| author | Sorin Basca <sorinbasca@google.com> | Wed Sep 21 22:33:48 2022 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Wed Sep 21 22:33:48 2022 +0000 |
| tree | 71aff29602507da4e5d27089694ec1a25da2283a | |
| parent | 9b65761b465a9ab05892c9b6a9b3aac48f66d86b [diff] | |
| parent | f04e85aafca034fc0c2c12dccc9716d66527aa6e [diff] |
Merge "Fix errorprone 2.15.0 errors" am: f04e85aafc Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2221101 Change-Id: Ib86eb89b06e07aac03b677b0868c06098a5ef2c7 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
diff --git a/Tethering/tests/unit/src/android/net/ip/IpServerTest.java b/Tethering/tests/unit/src/android/net/ip/IpServerTest.java index f242227..5f4454b 100644 --- a/Tethering/tests/unit/src/android/net/ip/IpServerTest.java +++ b/Tethering/tests/unit/src/android/net/ip/IpServerTest.java
@@ -271,6 +271,7 @@ mTestAddress); } + @SuppressWarnings("DoNotCall") // Ignore warning for synchronous to call to Thread.run() private void setUpDhcpServer() throws Exception { doAnswer(inv -> { final IDhcpServerCallbacks cb = inv.getArgument(2);
diff --git a/Tethering/tests/unit/src/com/android/networkstack/tethering/TetheringTest.java b/Tethering/tests/unit/src/com/android/networkstack/tethering/TetheringTest.java index a36d67f..a468d82 100644 --- a/Tethering/tests/unit/src/com/android/networkstack/tethering/TetheringTest.java +++ b/Tethering/tests/unit/src/com/android/networkstack/tethering/TetheringTest.java
@@ -399,6 +399,7 @@ MacAddress.ALL_ZEROS_ADDRESS); } + @SuppressWarnings("DoNotCall") // Ignore warning for synchronous to call to Thread.run() @Override public void makeDhcpServer(String ifName, DhcpServingParamsParcel params, DhcpServerCallbacks cb) {