commit 5eb1190cbe38a9b928e73980f492c3c7dc210f8a
author Navtej Singh Mann <navtejsingh@google.com> Tue Jul 01 11:10:41 2014 -0700
committer Ang Li <angli@google.com> Tue Jul 08 14:23:08 2014 -0700
tree b1d96c41d285a9f167018fb8aa3a872de7a83646
parent 81f23e8c365c758a4c0ef23918114d8c179b563c

Added support of private apis in WifiManagerFacade

Merging kwd commit 74424864b0cdcc7712aa78009e220261849f2b97
Change-Id: I8b41bb1e71ef2b5a761869de3322a1e2f16494e1

Common/src/com/googlecode/android_scripting/facade/WifiManagerFacade.java

diff --git a/Common/src/com/googlecode/android_scripting/facade/WifiManagerFacade.java b/Common/src/com/googlecode/android_scripting/facade/WifiManagerFacade.java
index cc67e97..da75cca 100644
--- a/Common/src/com/googlecode/android_scripting/facade/WifiManagerFacade.java
+++ b/Common/src/com/googlecode/android_scripting/facade/WifiManagerFacade.java
@@ -28,10 +28,12 @@
 //TODO: make methods handle various wifi states properly
 //e.g. wifi connection result will be null when flight mode is on
 public class WifiManagerFacade extends RpcReceiver {
+  private final static String mEventType = "WiFiManager";
   private final Service mService;
   private final WifiManager mWifi;
   private final IntentFilter mIntentFilter;
   private final WifiScanReceiver mReceiver;
+  private final WifiActionListener mWifiActionListener;
   private WifiLock mLock;
   private static int WifiScanCnt;
 
@@ -42,6 +44,7 @@
     mLock = null;
     mIntentFilter = new IntentFilter(WifiManager.SCAN_RESULTS_AVAILABLE_ACTION);
     mReceiver = new WifiScanReceiver(manager.getReceiver(EventFacade.class));
+    mWifiActionListener = new WifiActionListener(manager.getReceiver(EventFacade.class));
   }
 
   private void makeLock(int wifiMode) {
@@ -57,7 +60,6 @@
    *        Object of EventFacade
    */
   class WifiScanReceiver extends BroadcastReceiver {
-    private final static String mEventType = "WiFiManager";
     private final EventFacade mEventFacade;
     private final Bundle mResults;
 
@@ -76,6 +78,32 @@
     }
   }
 
+  class WifiActionListener implements WifiManager.ActionListener{
+    private final EventFacade mEventFacade;
+    private final Bundle mResults;
+
+    public WifiActionListener(EventFacade eventFacade) {
+      mEventFacade = eventFacade;
+      mResults = new Bundle();
+    }
+    @Override
+    public void onSuccess() {
+      Log.d("WifiActionListener  "+ mEventType);
+      mResults.putString("Type", "onSuccess");
+      mEventFacade.postEvent(mEventType, mResults.clone());
+      mResults.clear();
+    }
+
+    @Override
+    public void onFailure(int reason) {
+      Log.d("WifiActionListener  "+ mEventType);
+      mResults.putString("Type", "onFailure");
+      mEventFacade.postEvent(mEventType, mResults.clone());
+      mResults.clear();
+    }
+
+  }
+
   @Rpc(description = "Returns the list of access points found during the most recent Wifi scan.")
   public List<ScanResult> wifiGetScanResults() {
     mService.unregisterReceiver(mReceiver);
@@ -141,8 +169,39 @@
   }
 
   /**
+   * Connects to a wifi network with priority
+   *
+   * @param wifiSSID
+   *          SSID of the wifi network
+   * @param wifiPassword
+   *          password for the wifi network
+   */
+  @Rpc(description = "Connects a wifi network as priority by pasing ssid")
+  public void wifiPriorityConnect(@RpcParameter(name = "wifiSSID") String wifiSSID,
+      @RpcParameter(name = "wifiPassword") String wifiPassword) {
+    WifiConfiguration wifiConfig = new WifiConfiguration();
+    wifiConfig.SSID = "\"" + wifiSSID + "\"";
+    if(wifiPassword == null)
+      wifiConfig.allowedKeyManagement.set(WifiConfiguration.KeyMgmt.NONE);
+    else
+      wifiConfig.preSharedKey = "\"" + wifiPassword + "\"";
+    mWifi.connect(wifiConfig, mWifiActionListener);
+  }
+
+  /**
+   * Forget to a wifi network with priority
+   *
+   * @param networkID
+   *          Id of wifi network
+   */
+  @Rpc(description = "Forget a wifi network with priority")
+  public void wifiForgetNetwork(@RpcParameter(name = "wifiSSID") Integer newtorkId ) {
+    mWifi.forget(newtorkId, mWifiActionListener);
+  }
+
+  /**
    * Connects to a WPA protected wifi network
-   * 
+   *
    * @param wifiSSID
    *          SSID of the wifi network
    * @param wifiPassword
@@ -150,7 +209,7 @@
    * @return true on success
    * @throws ConnectException
    */
-  @Rpc(description = "Connects a WPA protected wifi network by ssid", returns = "True if the operation succeeded.")
+  @Rpc(description = "Connects a wifi network by ssid", returns = "True if the operation succeeded.")
   public Boolean wifiConnectWPA(@RpcParameter(name = "wifiSSID") String wifiSSID,
       @RpcParameter(name = "wifiPassword") String wifiPassword) throws ConnectException {
     WifiConfiguration wifiConfig = new WifiConfiguration();