Build ESS into the GScan result's Capabilities

Obtain this piece of information from the beacon and build it
into the Capabilities string.

Bug: 27810218
Change-Id: Iffa57f6e1c0997e5705da779a3693de9e3108e37

1 files changed, 6 insertions, 0 deletions

diff --git a/service/java/com/android/server/wifi/util/InformationElementUtil.java b/service/java/com/android/server/wifi/util/InformationElementUtil.java
index b341b4356..6e6dfcc77 100644
--- a/service/java/com/android/server/wifi/util/InformationElementUtil.java
+++ b/service/java/com/android/server/wifi/util/InformationElementUtil.java
@@ -311,6 +311,7 @@ public class InformationElementUtil {
      * by wpa_supplicant.
      */
     public static class Capabilities {
+        private static final int CAP_ESS_BIT_OFFSET = 0;
         private static final int CAP_PRIVACY_BIT_OFFSET = 4;
 
         private static final int WPA_VENDOR_OUI_TYPE_ONE = 0x01f25000;
@@ -526,6 +527,7 @@ public class InformationElementUtil {
                 return capabilities;
             }
 
+            boolean ess = beaconCap.get(CAP_ESS_BIT_OFFSET);
             boolean privacy = beaconCap.get(CAP_PRIVACY_BIT_OFFSET);
 
             for (InformationElement ie : ies) {
@@ -547,6 +549,10 @@ public class InformationElementUtil {
                 capabilities += "[WEP]";
             }
 
+            if (ess) {
+                capabilities += "[ESS]";
+            }
+
             return capabilities;
         }
     }