Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Add EID_TIM to ScanResult.InformationElement" into mm-wireless-dev am: 70fc162330

Browse Source 
am: 5045253e3e

* commit '5045253e3e4b9b1c0cf3feea087843d431ed1d1b':
  Add EID_TIM to ScanResult.InformationElement
This commit is contained in:
Glen Kuhne
2016-02-19 21:44:54 +00:00
committed by android-build-merger
parent b3d7561883 5045253e3e
commit ffeb035420
2 changed files with 12 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
wifi/java/android/net/wifi/ScanResult.java
View File

@@ -331,6 +331,7 @@ public class ScanResult implements Parcelable {
*/ */
public static class InformationElement { public static class InformationElement {
public static final int EID_SSID = 0; 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_BSS_LOAD = 11;
public static final int EID_RSN = 48; public static final int EID_RSN = 48;
public static final int EID_HT_OPERATION = 61; public static final int EID_HT_OPERATION = 61;

12
wifi/java/android/net/wifi/WifiConfiguration.java
View File

@@ -401,6 +401,15 @@ public class WifiConfiguration implements Parcelable {
*/ */
public boolean validatedInternetAccess; 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 * @hide
* Uid of app creating the configuration * Uid of app creating the configuration
@@ -1298,6 +1307,7 @@ public class WifiConfiguration implements Parcelable {
lastUpdateUid = -1; lastUpdateUid = -1;
creatorUid = -1; creatorUid = -1;
shared = true; shared = true;
dtimInterval = 0;
} }
/** /**
@@ -2044,4 +2054,4 @@ public class WifiConfiguration implements Parcelable {
config.allowedKeyManagement.set(in.readInt()); config.allowedKeyManagement.set(in.readInt());
return config; return config;
} }
} }