diff options
| author | Etan Cohen <etancohen@google.com> | 2015-04-01 09:31:43 -0700 |
|---|---|---|
| committer | Etan Cohen <etancohen@google.com> | 2015-04-01 09:31:43 -0700 |
| commit | eb864d4000dacad94d5135a10ed7bdeb29f31881 (patch) | |
| tree | 87ef0388347478c9247f954422a39e623942cc0e /wifi/java | |
| parent | 227542a3d18e7c9637a7bf159df110a8746d2981 (diff) | |
| parent | d91f19354d628e48577128f670afb0f5587e15e8 (diff) | |
| download | frameworks_base-eb864d4000dacad94d5135a10ed7bdeb29f31881.zip frameworks_base-eb864d4000dacad94d5135a10ed7bdeb29f31881.tar.gz frameworks_base-eb864d4000dacad94d5135a10ed7bdeb29f31881.tar.bz2 | |
Merge commit 'd91f193' into merge2
Diffstat (limited to 'wifi/java')
| -rw-r--r-- | wifi/java/android/net/wifi/WifiActivityEnergyInfo.java | 1 | ||||
| -rw-r--r-- | wifi/java/android/net/wifi/WifiEnterpriseConfig.java | 5 | ||||
| -rw-r--r-- | wifi/java/android/net/wifi/WifiManager.java | 10 |
3 files changed, 14 insertions, 2 deletions
diff --git a/wifi/java/android/net/wifi/WifiActivityEnergyInfo.java b/wifi/java/android/net/wifi/WifiActivityEnergyInfo.java index 9284796..0f73342 100644 --- a/wifi/java/android/net/wifi/WifiActivityEnergyInfo.java +++ b/wifi/java/android/net/wifi/WifiActivityEnergyInfo.java @@ -141,6 +141,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/WifiEnterpriseConfig.java b/wifi/java/android/net/wifi/WifiEnterpriseConfig.java index 36fc96b..440ad61 100644 --- a/wifi/java/android/net/wifi/WifiEnterpriseConfig.java +++ b/wifi/java/android/net/wifi/WifiEnterpriseConfig.java @@ -235,8 +235,10 @@ public class WifiEnterpriseConfig implements Parcelable { public static final int SIM = 4; /** EAP-Authentication and Key Agreement */ public static final int AKA = 5; + /** EAP-Authentication and Key Agreement Prime */ + public static final int AKA_PRIME = 6; /** @hide */ - public static final String[] strings = { "PEAP", "TLS", "TTLS", "PWD", "SIM", "AKA" }; + public static final String[] strings = { "PEAP", "TLS", "TTLS", "PWD", "SIM", "AKA", "AKA'" }; /** Prevent initialization */ private Eap() {} @@ -286,6 +288,7 @@ public class WifiEnterpriseConfig implements Parcelable { case Eap.TTLS: case Eap.SIM: case Eap.AKA: + case Eap.AKA_PRIME: mFields.put(EAP_KEY, Eap.strings[eapMethod]); mFields.put(OPP_KEY_CACHING, "1"); break; diff --git a/wifi/java/android/net/wifi/WifiManager.java b/wifi/java/android/net/wifi/WifiManager.java index e1460ef..99a0edc 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); } /** |