From 9cef0b96fd275dede1571b55feed636621717d3b Mon Sep 17 00:00:00 2001 From: Jan Nordqvist Date: Thu, 24 Mar 2016 18:17:25 -0700 Subject: Fixed broken Hotspot 2.0 r1 provisioning. Bug=27698600 Change-Id: If398e2388ed8abac746833ea2ae5bef90c1fa2da --- .../java/com/android/server/wifi/configparse/ConfigBuilder.java | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/service/java/com/android/server/wifi/configparse/ConfigBuilder.java b/service/java/com/android/server/wifi/configparse/ConfigBuilder.java index fa37e8a35..070c69b95 100644 --- a/service/java/com/android/server/wifi/configparse/ConfigBuilder.java +++ b/service/java/com/android/server/wifi/configparse/ConfigBuilder.java @@ -169,7 +169,7 @@ public class ConfigBuilder { return buildConfig(homeSP, caCert, clientChain, clientKey); } - public static WifiConfiguration buildConfig(HomeSP homeSP, X509Certificate caCert, + private static WifiConfiguration buildConfig(HomeSP homeSP, X509Certificate caCert, List clientChain, PrivateKey key) throws IOException, GeneralSecurityException { @@ -353,9 +353,8 @@ public class ConfigBuilder { enterpriseConfig.setEapMethod(remapEAPMethod(eapMethodID)); enterpriseConfig.setRealm(homeSP.getCredential().getRealm()); config.enterpriseConfig = enterpriseConfig; - if (homeSP.getUpdateIdentifier() >= 0) { - config.updateIdentifier = Integer.toString(homeSP.getUpdateIdentifier()); - } + // The framework based config builder only ever builds r1 configs: + config.updateIdentifier = null; return config; } -- cgit v1.2.3