From 61b5a7689320274ce5fff9a9eae1866d8d696b9b Mon Sep 17 00:00:00 2001
From: Jan Nordqvist <jannq@google.com>
Date: Wed, 30 Mar 2016 16:58:12 -0700
Subject: [PATCH] Fixed incomplete OSEN config code.

Bug=27929688

Change-Id: I8f4a0415576e6dc35d735fa46dc50591478403af
---
 wifi/java/android/net/wifi/WifiConfiguration.java    | 3 +++
 wifi/java/android/net/wifi/WifiEnterpriseConfig.java | 1 +
 2 files changed, 4 insertions(+)

diff --git a/wifi/java/android/net/wifi/WifiConfiguration.java b/wifi/java/android/net/wifi/WifiConfiguration.java
index fb2bdd455c624..b8ef150a361c5 100644
--- a/wifi/java/android/net/wifi/WifiConfiguration.java
+++ b/wifi/java/android/net/wifi/WifiConfiguration.java
@@ -1636,6 +1636,9 @@ public class WifiConfiguration implements Parcelable {
             if (allowedKeyManagement.get(KeyMgmt.WPA_EAP)) {
                 keyMgmt = KeyMgmt.strings[KeyMgmt.WPA_EAP];
             }
+            if (allowedKeyManagement.get(KeyMgmt.OSEN)) {
+                keyMgmt = KeyMgmt.strings[KeyMgmt.OSEN];
+            }
             if (allowedKeyManagement.get(KeyMgmt.IEEE8021X)) {
                 keyMgmt += KeyMgmt.strings[KeyMgmt.IEEE8021X];
             }
diff --git a/wifi/java/android/net/wifi/WifiEnterpriseConfig.java b/wifi/java/android/net/wifi/WifiEnterpriseConfig.java
index 9e15d6009e72a..6c94545c70c16 100644
--- a/wifi/java/android/net/wifi/WifiEnterpriseConfig.java
+++ b/wifi/java/android/net/wifi/WifiEnterpriseConfig.java
@@ -437,6 +437,7 @@ public class WifiEnterpriseConfig implements Parcelable {
         switch (eapMethod) {
             /** Valid methods */
             case Eap.TLS:
+            case Eap.UNAUTH_TLS:
                 setPhase2Method(Phase2.NONE);
                 /* fall through */
             case Eap.PEAP: