| commit | e5a2aa76cbd0249ecec3818af74033bebdb0b1ad | [log] [tgz] |
|---|---|---|
| author | Jimmy Chen <jimmycmchen@google.com> | Wed Jun 24 08:05:41 2020 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Wed Jun 24 08:05:41 2020 +0000 |
| tree | 4d0c76a7c1f7041e0c6009fb9aa3b91b351af2a3 | |
| parent | f47a449d7a3e330f51acf9db939034d645788c2c [diff] | |
| parent | 7efbbce7b187af28927efa8d609a8b5c49f6b08d [diff] |
wifi: add ocsp field for wifi enterprise config am: 7efbbce7b1 Original change: https://googleplex-android-review.googlesource.com/c/platform/external/sl4a/+/11969791 Change-Id: If559e927ffb9fc5fd58b50bd424dd7c730938ec6
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; }