diff options
| author | Etan Cohen <etancohen@google.com> | 2015-04-02 03:07:28 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-04-02 03:08:02 +0000 |
| commit | 36711e0e2cee9181a328718a349454dbd834f4e2 (patch) | |
| tree | e431877ac7ecd981a4f0879cb8f8392ee2d5090d /wifi/java/android/net/wifi/WifiManager.java | |
| parent | ae896d318820ca5c4202c57608d4426fc9f3d798 (diff) | |
| parent | 50d47618300016766852523111bfc7ec991f00ea (diff) | |
| download | frameworks_base-36711e0e2cee9181a328718a349454dbd834f4e2.zip frameworks_base-36711e0e2cee9181a328718a349454dbd834f4e2.tar.gz frameworks_base-36711e0e2cee9181a328718a349454dbd834f4e2.tar.bz2 | |
Merge changes from topic 'mwd-merge-040115'
* changes:
Merge (manually) pag/209446: Increase allowed duration to connect to HOGP profile
Merge commit 'd91f193' into merge2
Merge commit '5718646' into merge2
Merge commit '7aa0345' into merge2
Diffstat (limited to 'wifi/java/android/net/wifi/WifiManager.java')
| -rw-r--r-- | wifi/java/android/net/wifi/WifiManager.java | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/wifi/java/android/net/wifi/WifiManager.java b/wifi/java/android/net/wifi/WifiManager.java index 6371891..275c7d1 100644 --- a/wifi/java/android/net/wifi/WifiManager.java +++ b/wifi/java/android/net/wifi/WifiManager.java @@ -861,6 +861,14 @@ public class WifiManager { public static final int WIFI_FEATURE_TDLS_OFFCHANNEL = 0x2000; // Support for TDLS off channel /** @hide */ public static final int WIFI_FEATURE_EPR = 0x4000; // Enhanced power reporting + /** @hide */ + public static final int WIFI_FEATURE_AP_STA = 0x8000; // Support for AP STA Concurrency + /** @hide */ + public static final int WIFI_FEATURE_LINK_LAYER_STATS = 0x10000; // Link layer stats collection + /** @hide */ + public static final int WIFI_FEATURE_LOGGER = 0x20000; // WiFi Logger + /** @hide */ + public static final int WIFI_FEATURE_HAL_EPNO = 0x40000; // WiFi PNO enhanced private int getSupportedFeatures() { try { @@ -972,7 +980,7 @@ public class WifiManager { * @return true if this adapter supports advanced power/performance counters */ public boolean isEnhancedPowerReportingSupported() { - return isFeatureSupported(WIFI_FEATURE_EPR); + return isFeatureSupported(WIFI_FEATURE_LINK_LAYER_STATS); } /** |