commit | 618296a2ec6b72ac8177c21ea6234d15c038351d | [log] [tgz] |
---|---|---|
author | android-build-team Robot <android-build-team-robot@google.com> | Thu Jun 25 01:09:53 2020 +0000 |
committer | android-build-team Robot <android-build-team-robot@google.com> | Thu Jun 25 01:09:53 2020 +0000 |
tree | 4d0c76a7c1f7041e0c6009fb9aa3b91b351af2a3 | |
parent | c851ae2d0689b3bfc23e045c795b89d6db132e75 [diff] | |
parent | 7efbbce7b187af28927efa8d609a8b5c49f6b08d [diff] |
Snap for 6626121 from 7efbbce7b187af28927efa8d609a8b5c49f6b08d to rvc-release Change-Id: Ib29a622e1ceb6a78018e3bcd96e7696ebd67f56f
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; }