diff options
| author | 2019-01-19 00:26:07 +0000 | |
|---|---|---|
| committer | 2019-01-19 00:26:07 +0000 | |
| commit | 176af33735566b724c57d723e851f17f2a0441b1 (patch) | |
| tree | 52db161b0a68bc08a9b389e68a19a22d022466e6 | |
| parent | 6152cffb3dc5b02fe21b1ed1d04a019a4ed64e0c (diff) | |
| parent | df3ad8c56a1e072b59e240af78ab42b3cf341d5c (diff) | |
Merge "wifi: extend feature flag from int to long"
| -rw-r--r-- | wifi/java/android/net/wifi/IWifiManager.aidl | 2 | ||||
| -rw-r--r-- | wifi/java/android/net/wifi/WifiManager.java | 4 | ||||
| -rw-r--r-- | wifi/java/com/android/server/wifi/BaseWifiService.java | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/wifi/java/android/net/wifi/IWifiManager.aidl b/wifi/java/android/net/wifi/IWifiManager.aidl index 07f7cb39a78c..46c419130233 100644 --- a/wifi/java/android/net/wifi/IWifiManager.aidl +++ b/wifi/java/android/net/wifi/IWifiManager.aidl @@ -46,7 +46,7 @@ import android.os.WorkSource; */ interface IWifiManager { - int getSupportedFeatures(); + long getSupportedFeatures(); WifiActivityEnergyInfo reportActivityInfo(); diff --git a/wifi/java/android/net/wifi/WifiManager.java b/wifi/java/android/net/wifi/WifiManager.java index 7cc89ac30272..5742bd500795 100644 --- a/wifi/java/android/net/wifi/WifiManager.java +++ b/wifi/java/android/net/wifi/WifiManager.java @@ -2083,7 +2083,7 @@ public class WifiManager { /** @hide */ public static final int WIFI_FEATURE_DPP = 0x80000000; // DPP (Easy-Connect) - private int getSupportedFeatures() { + private long getSupportedFeatures() { try { return mService.getSupportedFeatures(); } catch (RemoteException e) { @@ -2091,7 +2091,7 @@ public class WifiManager { } } - private boolean isFeatureSupported(int feature) { + private boolean isFeatureSupported(long feature) { return (getSupportedFeatures() & feature) == feature; } /** diff --git a/wifi/java/com/android/server/wifi/BaseWifiService.java b/wifi/java/com/android/server/wifi/BaseWifiService.java index 2c96c057e37d..b3ac9f15eb9a 100644 --- a/wifi/java/com/android/server/wifi/BaseWifiService.java +++ b/wifi/java/com/android/server/wifi/BaseWifiService.java @@ -64,7 +64,7 @@ public class BaseWifiService extends IWifiManager.Stub { private static final String TAG = BaseWifiService.class.getSimpleName(); @Override - public int getSupportedFeatures() { + public long getSupportedFeatures() { throw new UnsupportedOperationException(); } |