From ba7d0b05740cb81479c692cf47ae3d3e37832535 Mon Sep 17 00:00:00 2001 From: David Su Date: Wed, 18 Mar 2020 16:33:42 -0700 Subject: WifiCandidatesTest: stop inheriting from ScanResult ScanResult is becoming final. Bug: 149912516 Test: atest FrameworksWifiTests Change-Id: I2d0b4ab983787b5025e28dff80852d5644e0aa1a --- .../src/com/android/server/wifi/WifiCandidatesTest.java | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/tests/wifitests/src/com/android/server/wifi/WifiCandidatesTest.java b/tests/wifitests/src/com/android/server/wifi/WifiCandidatesTest.java index 4b64f71a6..b97b25248 100644 --- a/tests/wifitests/src/com/android/server/wifi/WifiCandidatesTest.java +++ b/tests/wifitests/src/com/android/server/wifi/WifiCandidatesTest.java @@ -66,16 +66,15 @@ public class WifiCandidatesTest extends WifiBaseTest { mWifiCandidates = new WifiCandidates(mWifiScoreCard, mContext); mConfig1 = WifiConfigurationTestUtil.createOpenNetwork(); - mScanResult1 = new ScanResult() {{ - SSID = removeEnclosingQuotes(mConfig1.SSID); - capabilities = "[ESS]"; - BSSID = "00:00:00:00:00:01"; - }}; + mScanResult1 = new ScanResult(); + mScanResult1.SSID = removeEnclosingQuotes(mConfig1.SSID); + mScanResult1.capabilities = "[ESS]"; + mScanResult1.BSSID = "00:00:00:00:00:01"; + mConfig2 = WifiConfigurationTestUtil.createEphemeralNetwork(); - mScanResult2 = new ScanResult() {{ - SSID = removeEnclosingQuotes(mConfig2.SSID); - capabilities = "[ESS]"; - }}; + mScanResult2 = new ScanResult(); + mScanResult2.SSID = removeEnclosingQuotes(mConfig2.SSID); + mScanResult2.capabilities = "[ESS]"; doReturn(mScanResult1).when(mScanDetail1).getScanResult(); doReturn(mScanResult2).when(mScanDetail2).getScanResult(); -- cgit v1.2.3