Move some of the SIM network code out of WifiStateMachine

Also add unit tests

TEST: Unit tests, boots and connects to open network
Bug: 29776729
Change-Id: I79161f87cee55abce464fb1bdbc643a92c069ffb

1 files changed, 4 insertions, 7 deletions

diff --git a/service/java/com/android/server/wifi/WifiMonitor.java b/service/java/com/android/server/wifi/WifiMonitor.java
index 8c0d36a77..18c67e436 100644
--- a/service/java/com/android/server/wifi/WifiMonitor.java
+++ b/service/java/com/android/server/wifi/WifiMonitor.java
@@ -30,21 +30,19 @@ import android.os.Handler;
 import android.os.Message;
 import android.text.TextUtils;
 import android.util.ArraySet;
-import android.util.Base64;
 import android.util.LocalLog;
 import android.util.Log;
 import android.util.SparseArray;
 
+import com.android.internal.util.Protocol;
+import com.android.internal.util.StateMachine;
 import com.android.server.wifi.hotspot2.IconEvent;
 import com.android.server.wifi.hotspot2.Utils;
 import com.android.server.wifi.p2p.WifiP2pServiceImpl.P2pStatus;
-
-import com.android.internal.util.Protocol;
-import com.android.internal.util.StateMachine;
+import com.android.server.wifi.util.TelephonyUtil.SimAuthRequestData;
 
 import java.io.IOException;
 import java.util.HashMap;
-import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
@@ -1338,8 +1336,7 @@ public class WifiMonitor {
         } else if (requestName.startsWith(SIM_STR)) {
             Matcher matchGsm = mRequestGsmAuthPattern.matcher(requestName);
             Matcher matchUmts = mRequestUmtsAuthPattern.matcher(requestName);
-            WifiStateMachine.SimAuthRequestData data =
-                    new WifiStateMachine.SimAuthRequestData();
+            SimAuthRequestData data = new SimAuthRequestData();
             if (matchGsm.find()) {
                 data.networkId = Integer.parseInt(matchGsm.group(1));
                 data.protocol = WifiEnterpriseConfig.Eap.SIM;