Merge "Add EID_TIM to ScanResult.InformationElement" into mm-wireless-dev

am: 70fc162330

* commit '70fc1623301ab5268c54bb203329893893ed35cb':
  Add EID_TIM to ScanResult.InformationElement

wifi/java/android/net/wifi/ScanResult.java

@@ -331,6 +331,7 @@ public class ScanResult implements Parcelable {
      */
     public static class InformationElement {
         public static final int EID_SSID = 0;
+        public static final int EID_TIM = 5;
         public static final int EID_BSS_LOAD = 11;
         public static final int EID_RSN = 48;
         public static final int EID_HT_OPERATION = 61;

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

@@ -401,6 +401,15 @@ public class WifiConfiguration implements Parcelable {
      */
     public boolean validatedInternetAccess;
 
+    /**
+     * @hide
+     * The number of beacon intervals between Delivery Traffic Indication Maps (DTIM)
+     * This value is populated from scan results that contain Beacon Frames, which are infrequent.
+     * The value is not guaranteed to be set or current (Although it SHOULDNT change once set)
+     * Valid values are from 1 - 255. Initialized here as 0, use this to check if set.
+     */
+    public int dtimInterval = 0;
+
     /**
      * @hide
      * Uid of app creating the configuration
@@ -1298,6 +1307,7 @@ public class WifiConfiguration implements Parcelable {
         lastUpdateUid = -1;
         creatorUid = -1;
         shared = true;
+        dtimInterval = 0;
     }
 
     /**
@@ -2044,4 +2054,4 @@ public class WifiConfiguration implements Parcelable {
         config.allowedKeyManagement.set(in.readInt());
         return config;
     }
-}
+}