summaryrefslogtreecommitdiff
path: root/tests
diff options
context:
space:
mode:
authorJan Nordqvist <jannq@google.com>2016-02-09 17:24:20 +0000
committerAndroid Partner Code Review <android-gerrit-partner@google.com>2016-02-09 17:24:21 +0000
commit676d664bf4b5f59279a53a986ce94363e2bc4fd2 (patch)
tree2c21d2b4e1f25b27081ecfbd36dea4808a81829e /tests
parent68cb8c02b4ad079c54a2ffd4407da921d18c7af9 (diff)
parent3fff4c9bd5db730141e75706a7229814d403b363 (diff)
Merge "Removing Hotspot 2.0 OSU client code from framework." into mm-wireless-dev
Diffstat (limited to 'tests')
-rw-r--r--tests/wifitests/src/com/android/server/wifi/WifiStateMachineTest.java6
1 files changed, 0 insertions, 6 deletions
diff --git a/tests/wifitests/src/com/android/server/wifi/WifiStateMachineTest.java b/tests/wifitests/src/com/android/server/wifi/WifiStateMachineTest.java
index 13df114be..9f99cbf93 100644
--- a/tests/wifitests/src/com/android/server/wifi/WifiStateMachineTest.java
+++ b/tests/wifitests/src/com/android/server/wifi/WifiStateMachineTest.java
@@ -67,7 +67,6 @@ import com.android.server.wifi.hotspot2.NetworkDetail;
import com.android.server.wifi.hotspot2.SupplicantBridge;
import com.android.server.wifi.hotspot2.Utils;
import com.android.server.wifi.hotspot2.omadm.PasspointManagementObjectManager;
-import com.android.server.wifi.hotspot2.osu.OSUManager;
import com.android.server.wifi.p2p.WifiP2pServiceImpl;
import org.junit.After;
@@ -161,11 +160,6 @@ public class WifiStateMachineTest {
IBinder batteryStatsBinder = mockService(BatteryStats.class, IBatteryStats.class);
when(facade.getService(BatteryStats.SERVICE_NAME)).thenReturn(batteryStatsBinder);
- when(facade.makeOsuManager(any(WifiConfigStore.class), any(Context.class), any(
- SupplicantBridge.class),
- any(PasspointManagementObjectManager.class), any(WifiStateMachine.class)))
- .thenReturn(mock(OSUManager.class));
-
when(facade.makeIpManager(any(Context.class), anyString(), any(IpManager.Callback.class)))
.then(new AnswerWithArguments<IpManager>() {
public IpManager answer(