commit | a461f20f25d1f27561438f1686cd3b0b335080b6 | [log] [tgz] |
---|---|---|
author | android-build-team Robot <android-build-team-robot@google.com> | Thu Jun 25 03:16:40 2020 +0000 |
committer | android-build-team Robot <android-build-team-robot@google.com> | Thu Jun 25 03:16:40 2020 +0000 |
tree | 4d0c76a7c1f7041e0c6009fb9aa3b91b351af2a3 | |
parent | 8c7ec815417603c7fb7df45db2c509af513e8355 [diff] | |
parent | e5a2aa76cbd0249ecec3818af74033bebdb0b1ad [diff] |
Snap for 6626737 from e5a2aa76cbd0249ecec3818af74033bebdb0b1ad to mainline-release Change-Id: I1dcdcbfd00382017b73cf5166615acb5213757a5
diff --git a/Common/src/com/googlecode/android_scripting/facade/wifi/WifiManagerFacade.java b/Common/src/com/googlecode/android_scripting/facade/wifi/WifiManagerFacade.java index 0978285..97b6b0e 100755 --- a/Common/src/com/googlecode/android_scripting/facade/wifi/WifiManagerFacade.java +++ b/Common/src/com/googlecode/android_scripting/facade/wifi/WifiManagerFacade.java
@@ -635,6 +635,11 @@ Log.v("Setting Domain Suffix Match to " + realm); eConfig.setRealm(realm); } + if (j.has(WifiEnterpriseConfig.OCSP)) { + int ocsp = j.getInt(WifiEnterpriseConfig.OCSP); + Log.v("Setting OCSP to " + ocsp); + eConfig.setOcsp(ocsp); + } return eConfig; }
diff --git a/Common/src/com/googlecode/android_scripting/jsonrpc/JsonBuilder.java b/Common/src/com/googlecode/android_scripting/jsonrpc/JsonBuilder.java index 7ce7fc4..a06adbc 100644 --- a/Common/src/com/googlecode/android_scripting/jsonrpc/JsonBuilder.java +++ b/Common/src/com/googlecode/android_scripting/jsonrpc/JsonBuilder.java
@@ -1155,6 +1155,7 @@ String privateKeyString = Base64.encodeToString(pk.getEncoded(), Base64.DEFAULT); config.put(WifiEnterpriseConfig.PRIVATE_KEY_ID_KEY, privateKeyString); config.put(WifiEnterpriseConfig.PASSWORD_KEY, data.getPassword()); + config.put(WifiEnterpriseConfig.OCSP, data.getOcsp()); return config; }