diff options
Diffstat (limited to 'service')
3 files changed, 3 insertions, 1 deletions
diff --git a/service/java/com/android/server/wifi/hotspot2/PasspointManager.java b/service/java/com/android/server/wifi/hotspot2/PasspointManager.java index 7ccca0625..329c330e6 100644 --- a/service/java/com/android/server/wifi/hotspot2/PasspointManager.java +++ b/service/java/com/android/server/wifi/hotspot2/PasspointManager.java @@ -406,6 +406,7 @@ public class PasspointManager { if (!result.isSuccess()) { Log.e(TAG, "Failed to update config in WifiConfigManager"); } else { + mWifiConfigManager.allowAutojoin(result.getNetworkId(), newConfig.allowAutojoin); if (mVerboseLoggingEnabled) { Log.v(TAG, "Updated config in WifiConfigManager"); } diff --git a/service/java/com/android/server/wifi/hotspot2/PasspointNetworkNominateHelper.java b/service/java/com/android/server/wifi/hotspot2/PasspointNetworkNominateHelper.java index e1491aa7a..bf2e460d8 100644 --- a/service/java/com/android/server/wifi/hotspot2/PasspointNetworkNominateHelper.java +++ b/service/java/com/android/server/wifi/hotspot2/PasspointNetworkNominateHelper.java @@ -208,7 +208,7 @@ public class PasspointNetworkNominateHelper { mLocalLog.log("Failed to add passpoint network"); return existingNetwork; } - + mWifiConfigManager.allowAutojoin(result.getNetworkId(), config.allowAutojoin); mWifiConfigManager.enableNetwork(result.getNetworkId(), false, Process.WIFI_UID, null); mWifiConfigManager.setNetworkCandidateScanResult(result.getNetworkId(), candidate.mScanDetail.getScanResult(), 0); diff --git a/service/java/com/android/server/wifi/hotspot2/PasspointProvider.java b/service/java/com/android/server/wifi/hotspot2/PasspointProvider.java index 9174534c7..8e7364d4b 100644 --- a/service/java/com/android/server/wifi/hotspot2/PasspointProvider.java +++ b/service/java/com/android/server/wifi/hotspot2/PasspointProvider.java @@ -514,6 +514,7 @@ public class PasspointProvider { // Check server certificate using OCSP (Online Certificate Status Protocol). wifiConfig.enterpriseConfig.setOcsp(WifiEnterpriseConfig.OCSP_REQUIRE_CERT_STATUS); } + wifiConfig.allowAutojoin = isAutojoinEnabled(); wifiConfig.shared = mIsShared; wifiConfig.fromWifiNetworkSuggestion = mIsFromSuggestion; wifiConfig.ephemeral = mIsFromSuggestion; |