From bdfce6e9027284f3dff66b56863e58f1e090c42c Mon Sep 17 00:00:00 2001 From: Aaron Huang Date: Fri, 10 Jan 2020 16:42:00 +0800 Subject: Fix reference to onNewDhcpResults is ambiguous IpClientCallbacks adds a new onNewDhcpResults(DhcpResultsParcelable) and it will cause to ambiguous reference when passing a null object. Note that this needs to change the type to DhcpResultsParcelable after wifi migrates from DhcpResults to DhcpResultsParcelable. Bug: 135998869 Test: build Test: ./frameworks/opt/net/wifi/tests/wifitests/runtests.sh Change-Id: I6b1dfb2f366cdb5e17de40bccbf745e45940bc62 --- tests/wifitests/src/com/android/server/wifi/ClientModeImplTest.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/tests/wifitests/src/com/android/server/wifi/ClientModeImplTest.java b/tests/wifitests/src/com/android/server/wifi/ClientModeImplTest.java index 7896a8f0b..f4db8ed1a 100644 --- a/tests/wifitests/src/com/android/server/wifi/ClientModeImplTest.java +++ b/tests/wifitests/src/com/android/server/wifi/ClientModeImplTest.java @@ -312,7 +312,8 @@ public class ClientModeImplTest { } private void injectDhcpFailure() { - mIpClientCallback.onNewDhcpResults(null); + // TODO: Change argument type to DhcpResultsParcelable after migration. + mIpClientCallback.onNewDhcpResults((DhcpResults) null); mIpClientCallback.onProvisioningFailure(new LinkProperties()); } -- cgit v1.2.3