1 files changed, 32 insertions, 2 deletions
diff --git a/libs/WifiTrackerLib/src/com/android/wifitrackerlib/StandardWifiEntry.java b/libs/WifiTrackerLib/src/com/android/wifitrackerlib/StandardWifiEntry.java
index 19c2619bc..6fef5e961 100644
--- a/libs/WifiTrackerLib/src/com/android/wifitrackerlib/StandardWifiEntry.java
+++ b/libs/WifiTrackerLib/src/com/android/wifitrackerlib/StandardWifiEntry.java
@@ -54,6 +54,9 @@ import android.net.wifi.WifiManager;
 import android.net.wifi.WifiNetworkScoreCache;
 import android.os.Handler;
 import android.os.SystemClock;
+import android.telephony.SubscriptionInfo;
+import android.telephony.SubscriptionManager;
+import android.telephony.TelephonyManager;
 import android.text.TextUtils;
 
 import androidx.annotation.GuardedBy;
@@ -357,8 +360,35 @@ public class StandardWifiEntry extends WifiEntry {
 
     @Override
     public boolean canConnect() {
-        return mLevel != WIFI_LEVEL_UNREACHABLE
-                && getConnectedState() == CONNECTED_STATE_DISCONNECTED;
+        if (mLevel == WIFI_LEVEL_UNREACHABLE
+                || getConnectedState() != CONNECTED_STATE_DISCONNECTED) {
+            return false;
+        }
+        // Allow connection for EAP SIM dependent methods if the SIM of specified carrier ID is
+        // active in the device.
+        if (getSecurity() == SECURITY_EAP && mWifiConfig != null
+                && mWifiConfig.enterpriseConfig != null) {
+            if (!mWifiConfig.enterpriseConfig.isAuthenticationSimBased()) {
+                return true;
+            }
+            List<SubscriptionInfo> activeSubscriptionInfos = ((SubscriptionManager) mContext
+                    .getSystemService(Context.TELEPHONY_SUBSCRIPTION_SERVICE))
+                    .getActiveSubscriptionInfoList();
+            if (activeSubscriptionInfos == null || activeSubscriptionInfos.size() == 0) {
+                return false;
+            }
+            if (mWifiConfig.carrierId == TelephonyManager.UNKNOWN_CARRIER_ID) {
+                // To connect via default subscription.
+                return true;
+            }
+            for (SubscriptionInfo subscriptionInfo : activeSubscriptionInfos) {
+                if (subscriptionInfo.getCarrierId() == mWifiConfig.carrierId) {
+                    return true;
+                }
+            }
+            return false;
+        }
+        return true;
     }
 
     @Override