diff options
| author | Vinit Deshpande <vinitd@google.com> | 2014-09-09 01:28:44 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-09-09 01:28:45 +0000 |
| commit | 592b95901ef3fa7248bb9b79d8ea9ce3df9628bc (patch) | |
| tree | aa4b23c87f613fc685ae5596fc5b8f47dcae7830 /wifi/java/android | |
| parent | f43f04ed6f20b917e126e8f831ff40a9e9775695 (diff) | |
| parent | 15f89078784d44006f7ed0c0f34a5e3fbc3d840c (diff) | |
| download | frameworks_base-592b95901ef3fa7248bb9b79d8ea9ce3df9628bc.zip frameworks_base-592b95901ef3fa7248bb9b79d8ea9ce3df9628bc.tar.gz frameworks_base-592b95901ef3fa7248bb9b79d8ea9ce3df9628bc.tar.bz2 | |
Merge "Implement getAvailableChannels" into lmp-dev
Diffstat (limited to 'wifi/java/android')
| -rw-r--r-- | wifi/java/android/net/wifi/IWifiScanner.aidl | 3 | ||||
| -rw-r--r-- | wifi/java/android/net/wifi/WifiScanner.java | 11 |
2 files changed, 13 insertions, 1 deletions
diff --git a/wifi/java/android/net/wifi/IWifiScanner.aidl b/wifi/java/android/net/wifi/IWifiScanner.aidl index fef2d11..3984934 100644 --- a/wifi/java/android/net/wifi/IWifiScanner.aidl +++ b/wifi/java/android/net/wifi/IWifiScanner.aidl @@ -17,6 +17,7 @@ package android.net.wifi; import android.os.Messenger; +import android.os.Bundle; /** * {@hide} @@ -24,4 +25,6 @@ import android.os.Messenger; interface IWifiScanner { Messenger getMessenger(); + + Bundle getAvailableChannels(int band); } diff --git a/wifi/java/android/net/wifi/WifiScanner.java b/wifi/java/android/net/wifi/WifiScanner.java index e7bcb23..65c00bd 100644 --- a/wifi/java/android/net/wifi/WifiScanner.java +++ b/wifi/java/android/net/wifi/WifiScanner.java @@ -18,6 +18,7 @@ package android.net.wifi; import android.annotation.SystemApi; import android.content.Context; +import android.os.Bundle; import android.os.Handler; import android.os.HandlerThread; import android.os.Looper; @@ -76,6 +77,9 @@ public class WifiScanner { /** Invalid request */ public static final int REASON_INVALID_REQUEST = -3; + /** @hide */ + public static final String GET_AVAILABLE_CHANNELS_EXTRA = "Channels"; + /** * Generic action callback invocation interface * @hide @@ -92,7 +96,12 @@ public class WifiScanner { * @hide */ public List<Integer> getAvailableChannels(int band) { - return null; + try { + Bundle bundle = mService.getAvailableChannels(band); + return bundle.getIntegerArrayList(GET_AVAILABLE_CHANNELS_EXTRA); + } catch (RemoteException e) { + return null; + } } /** |
