commit 592b95901ef3fa7248bb9b79d8ea9ce3df9628bc
author Vinit Deshpande <vinitd@google.com> Tue Sep 09 01:28:44 2014 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Tue Sep 09 01:28:45 2014 +0000
tree aa4b23c87f613fc685ae5596fc5b8f47dcae7830
parent f43f04ed6f20b917e126e8f831ff40a9e9775695
parent 15f89078784d44006f7ed0c0f34a5e3fbc3d840c

Merge "Implement getAvailableChannels" into lmp-dev

wifi/java/android/net/wifi/IWifiScanner.aidl

diff --git a/wifi/java/android/net/wifi/IWifiScanner.aidl b/wifi/java/android/net/wifi/IWifiScanner.aidl
index fef2d117..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 @@
 interface IWifiScanner
 {
     Messenger getMessenger();
+
+    Bundle getAvailableChannels(int band);
 }

wifi/java/android/net/wifi/WifiScanner.java

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 @@
 
 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 @@
     /** 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 @@
      * @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;
+        }
     }
 
     /**