commit cc658a827f0e81843307f6fc0e25e30f936aea70
author The Android Automerger <android-build@google.com> Wed Apr 22 06:46:30 2015 -0700
committer The Android Automerger <android-build@google.com> Wed Apr 22 06:46:30 2015 -0700
tree 7abaaa94d41481bd2c06e67456f64ca311e42421
parent aa1f457ade1f84c6f4f9ef1d2c08664b50930d09
parent 794d3c54a62bb0a321d078e291cec6255939b57f

merge in m-wireless-internal-release history after reset to 0f17e0b31ab1dc22c98cf0b86f2878d2be407af1

Common/src/com/googlecode/android_scripting/facade/wifi/WifiManagerFacade.java

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 2068e3f..91f34ae 100755
--- a/Common/src/com/googlecode/android_scripting/facade/wifi/WifiManagerFacade.java
+++ b/Common/src/com/googlecode/android_scripting/facade/wifi/WifiManagerFacade.java
@@ -326,6 +326,11 @@
             Log.v("Setting Alt Subject to " + altSub);
             eConfig.setAltSubjectMatch(altSub);
         }
+        if (j.has(WifiEnterpriseConfig.DOM_SUFFIX_MATCH_KEY)) {
+            String domSuffix = j.getString(WifiEnterpriseConfig.DOM_SUFFIX_MATCH_KEY);
+            Log.v("Setting Domain Suffix Match to " + domSuffix);
+            eConfig.setDomainSuffixMatch(domSuffix);
+        }
         config.enterpriseConfig = eConfig;
         return config;
     }