| commit | 9064d97e97902f600df8fcdc0f41083398a27b03 | [log] [tgz] |
|---|---|---|
| author | Sorin Basca <sorinbasca@google.com> | Wed Sep 21 23:46:16 2022 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Wed Sep 21 23:46:16 2022 +0000 |
| tree | 575bdf03af86f6dfe5f664b3f69d2f6e5fd1c76b | |
| parent | a937200ef71cb2400dc897d6be02bc789d85750c [diff] | |
| parent | 0ba04e53a3180bd54f194fe4d71bf822357ae74a [diff] |
Merge "Fix errorprone 2.15.0 errors" am: f04e85aafc am: c85d942a3e am: 1b20389039 am: 0ba04e53a3 Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2221101 Change-Id: I3c667406493691d71647d3ac91197b8421ca382e 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) {