diff options
| author | Pierre Vandwalle <vandwalle@google.com> | 2015-03-25 02:43:53 +0000 |
|---|---|---|
| committer | Android Partner Code Review <android-gerrit-partner@google.com> | 2015-03-25 02:43:54 +0000 |
| commit | e5334732bc63c2d29a7f68b59b417286277b54f1 (patch) | |
| tree | 187098a3b2fc8fc00296b08b993657b6211b92d0 /wifi/java/android | |
| parent | c3902347f50a2978a6ff02af41ec957ee27abbb8 (diff) | |
| parent | ddfd35dbf9aab0ff196e1d7046ebe6bcd972c7a5 (diff) | |
| download | frameworks_base-e5334732bc63c2d29a7f68b59b417286277b54f1.zip frameworks_base-e5334732bc63c2d29a7f68b59b417286277b54f1.tar.gz frameworks_base-e5334732bc63c2d29a7f68b59b417286277b54f1.tar.bz2 | |
Merge "add wifi config for power calculation" into m-wireless-dev
Diffstat (limited to 'wifi/java/android')
| -rw-r--r-- | wifi/java/android/net/wifi/WifiActivityEnergyInfo.java | 1 | ||||
| -rw-r--r-- | wifi/java/android/net/wifi/WifiManager.java | 10 |
2 files changed, 10 insertions, 1 deletions
diff --git a/wifi/java/android/net/wifi/WifiActivityEnergyInfo.java b/wifi/java/android/net/wifi/WifiActivityEnergyInfo.java index 533b8bc..c9a2f07 100644 --- a/wifi/java/android/net/wifi/WifiActivityEnergyInfo.java +++ b/wifi/java/android/net/wifi/WifiActivityEnergyInfo.java @@ -116,6 +116,7 @@ public final class WifiActivityEnergyInfo implements Parcelable { return (int)mControllerIdleTimeMs; } + /** * product of current(mA), voltage(V) and time(ms) * @return energy used diff --git a/wifi/java/android/net/wifi/WifiManager.java b/wifi/java/android/net/wifi/WifiManager.java index 407624c..f8a6e3f 100644 --- a/wifi/java/android/net/wifi/WifiManager.java +++ b/wifi/java/android/net/wifi/WifiManager.java @@ -839,6 +839,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 { @@ -950,7 +958,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); } /** |