| commit | b45f4d34140d520e9b9b54666476f555895209b9 | [log] [tgz] |
|---|---|---|
| author | android-build-team Robot <android-build-team-robot@google.com> | Thu Jun 25 01:03:59 2020 +0000 |
| committer | android-build-team Robot <android-build-team-robot@google.com> | Thu Jun 25 01:03:59 2020 +0000 |
| tree | 8c2372a067645cb9231a4979682601b7c54db703 | |
| parent | 9ac2b426e5313faaf650a7ffbc77e80992baa64f [diff] | |
| parent | 7ec79b38a628486d807c68f9d03d7bf058fd2920 [diff] |
Snap for 6626136 from 7ec79b38a628486d807c68f9d03d7bf058fd2920 to rvc-d1-release Change-Id: I81c0d440f9934a659af3ca6beef8cce55a483124
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; }