commit 5f9385f7eaaacf854bfbe3268eefd3dd39dab05a
author Yuhao Zheng <yuhaozheng@google.com> Mon Jun 30 15:32:08 2014 -0700
committer Yuhao Zheng <yuhaozheng@google.com> Tue Jul 01 16:51:16 2014 -0700
tree c5506d14ddc7166c44e7154cad3caaff3e5e29de
parent cc32bd83e4d420c1adaeb3ea40f8986471e54590

Add two Passpoint fields to WifiConfiguration

We need two new fields in WifiConfiguration for Hotspot 2.0:
requirePMF & updateIdentifier

Change-Id: I288fee7a413286c48eedd034a5aca60a40b831a8

wifi/java/android/net/wifi/WifiConfiguration.java

diff --git a/wifi/java/android/net/wifi/WifiConfiguration.java b/wifi/java/android/net/wifi/WifiConfiguration.java
index 59b48e4..31900ecd7 100644
--- a/wifi/java/android/net/wifi/WifiConfiguration.java
+++ b/wifi/java/android/net/wifi/WifiConfiguration.java
@@ -49,6 +49,10 @@
     /** {@hide} */
     public static final String hiddenSSIDVarName = "scan_ssid";
     /** {@hide} */
+    public static final String pmfVarName = "ieee80211w";
+    /** {@hide} */
+    public static final String updateIdentiferVarName = "update_identifier";
+    /** {@hide} */
     public static final int INVALID_NETWORK_ID = -1;
     /**
      * Recognized key management schemes.
@@ -264,6 +268,18 @@
     public boolean hiddenSSID;
 
     /**
+     * This is a network that requries Protected Management Frames (PMF).
+     * @hide
+     */
+    public boolean requirePMF;
+
+    /**
+     * Update identifier, for Passpoint network.
+     * @hide
+     */
+    public String updateIdentifier;
+
+    /**
      * The set of key management protocols supported by this configuration.
      * See {@link KeyMgmt} for descriptions of the values.
      * Defaults to WPA-PSK WPA-EAP.
@@ -1155,6 +1171,8 @@
         dest.writeInt(wepTxKeyIndex);
         dest.writeInt(priority);
         dest.writeInt(hiddenSSID ? 1 : 0);
+        dest.writeInt(requirePMF ? 1 : 0);
+        dest.writeString(updateIdentifier);
 
         writeBitSet(dest, allowedKeyManagement);
         writeBitSet(dest, allowedProtocols);
@@ -1196,6 +1214,9 @@
                 config.wepTxKeyIndex = in.readInt();
                 config.priority = in.readInt();
                 config.hiddenSSID = in.readInt() != 0;
+                config.requirePMF = in.readInt() != 0;
+                config.updateIdentifier = in.readString();
+
                 config.allowedKeyManagement   = readBitSet(in);
                 config.allowedProtocols       = readBitSet(in);
                 config.allowedAuthAlgorithms  = readBitSet(in);