applying terminology of java apis
Change-Id: Ia3720262c8e1f77d99ca0c80a9478833921a0bbc
diff --git a/Common/src/com/googlecode/android_scripting/facade/WifiFacade.java b/Common/src/com/googlecode/android_scripting/facade/WifiManagerFacade.java
similarity index 97%
rename from Common/src/com/googlecode/android_scripting/facade/WifiFacade.java
rename to Common/src/com/googlecode/android_scripting/facade/WifiManagerFacade.java
index bd521df..cc67e97 100644
--- a/Common/src/com/googlecode/android_scripting/facade/WifiFacade.java
+++ b/Common/src/com/googlecode/android_scripting/facade/WifiManagerFacade.java
@@ -27,7 +27,7 @@
*/
//TODO: make methods handle various wifi states properly
//e.g. wifi connection result will be null when flight mode is on
-public class WifiFacade extends RpcReceiver {
+public class WifiManagerFacade extends RpcReceiver {
private final Service mService;
private final WifiManager mWifi;
private final IntentFilter mIntentFilter;
@@ -35,7 +35,7 @@
private WifiLock mLock;
private static int WifiScanCnt;
- public WifiFacade(FacadeManager manager) {
+ public WifiManagerFacade(FacadeManager manager) {
super(manager);
mService = manager.getService();
mWifi = (WifiManager) mService.getSystemService(Context.WIFI_SERVICE);
@@ -57,7 +57,7 @@
* Object of EventFacade
*/
class WifiScanReceiver extends BroadcastReceiver {
- private final static String mEventType = "WiFiScan";
+ private final static String mEventType = "WiFiManager";
private final EventFacade mEventFacade;
private final Bundle mResults;
diff --git a/Common/src/com/googlecode/android_scripting/facade/WifiPasspointFacade.java b/Common/src/com/googlecode/android_scripting/facade/WifiPasspointManagerFacade.java
similarity index 94%
rename from Common/src/com/googlecode/android_scripting/facade/WifiPasspointFacade.java
rename to Common/src/com/googlecode/android_scripting/facade/WifiPasspointManagerFacade.java
index fa85c1b..7bd5d11 100644
--- a/Common/src/com/googlecode/android_scripting/facade/WifiPasspointFacade.java
+++ b/Common/src/com/googlecode/android_scripting/facade/WifiPasspointManagerFacade.java
@@ -42,9 +42,9 @@
/**
* Exposes WifiPasspointManger functionality.
*/
-public class WifiPasspointFacade extends RpcReceiver {
+public class WifiPasspointManagerFacade extends RpcReceiver {
- private final static String mEventType = "ANQPInfo";
+ private final static String mEventType = "WifiPasspointManager";
private final Service mService;
private final EventFacade mEventFacade;
private final WifiPasspointManager mWifiPasspointMgr;
@@ -52,7 +52,7 @@
private Hashtable<Integer, WifiPasspointChannelActionListener> mWifiPasspointChannelAlList;
private List<ScanResult> mScanResults;
- public WifiPasspointFacade(FacadeManager facadeManager){
+ public WifiPasspointManagerFacade(FacadeManager facadeManager){
super(facadeManager);
mService = facadeManager.getService();
mEventFacade = facadeManager.getReceiver(EventFacade.class);
@@ -135,7 +135,7 @@
@RpcStartEvent("ANQPInfo")
public Integer requestAnqpInfoOfPasspoints(@RpcParameter(name = "scanIndex") Integer scanIndex,
@RpcParameter(name = "mask") Integer mask) {
- ScanFacade.getWifiScanResult(scanIndex, mScanResults);
+ WifiScannerFacade.getWifiScanResult(scanIndex, mScanResults);
if(mScanResults != null && mScanResults.size() >= 0) {
WifiPasspointChannelActionListener mWifiPpChannelAL = genWifiPasspointChannelAL();
mWifiPasspointMgr.requestAnqpInfo(mWifiPpChannelAL.mChannel, mScanResults, mask, mWifiPpChannelAL);
diff --git a/Common/src/com/googlecode/android_scripting/facade/ScanFacade.java b/Common/src/com/googlecode/android_scripting/facade/WifiScannerFacade.java
similarity index 92%
rename from Common/src/com/googlecode/android_scripting/facade/ScanFacade.java
rename to Common/src/com/googlecode/android_scripting/facade/WifiScannerFacade.java
index af960eb..48f7444 100644
--- a/Common/src/com/googlecode/android_scripting/facade/ScanFacade.java
+++ b/Common/src/com/googlecode/android_scripting/facade/WifiScannerFacade.java
@@ -36,10 +36,10 @@
import java.util.concurrent.Callable;
/**
- * ScanManager functions.
+ * WifiScanner functions.
*
*/
-public class ScanFacade extends RpcReceiver {
+public class WifiScannerFacade extends RpcReceiver {
private final Service mService;
private final EventFacade mEventFacade;
private final WifiScanner mScan;
@@ -53,7 +53,7 @@
private final Hashtable<Integer, WifiHotspotListener> wifiHotspotListenerList;
private static Hashtable<Integer, ScanResult[]> wifiScannerResultList;
- public ScanFacade(FacadeManager manager) {
+ public WifiScannerFacade(FacadeManager manager) {
super(manager);
mService = manager.getService();
mScan = (WifiScanner) mService.getSystemService(Context.WIFI_SCANNING_SERVICE);
@@ -131,7 +131,7 @@
}
private class WifiScanListener implements WifiScanner.ScanListener {
- private static final String mEventType = "WifiBackgroundScan";
+ private static final String mEventType = "WifiScannerScan";
protected final Bundle mScanResults;
private final WifiActionListener mWAL;
public int mIndex;
@@ -193,7 +193,7 @@
}
private class ChangeListener implements WifiScanner.WifiChangeListener {
- private static final String mEventType = "TrackChanges";
+ private static final String mEventType = "WifiScannerChange";
protected final Bundle mResults;
private final WifiActionListener mWAL;
public int mIndex;
@@ -242,7 +242,7 @@
}
private class WifiHotspotListener implements WifiScanner.HotspotListener {
- private static final String mEventType = "TrackHotspot";
+ private static final String mEventType = "WifiScannerHotspot";
protected final Bundle mResults;
private final WifiActionListener mWAL;
public int mIndex;
@@ -273,14 +273,14 @@
/** RPC Method Section */
/**
- * Starts periodic wifi background scan
+ * Starts periodic WifiScanner scan
* @param periodInMs
* @param channel_freqs frequencies of channels to scan
* @return the id of the scan listener associated with this scan
*/
- @Rpc(description = "Starts a periodic Wifi scan in background.")
- @RpcStartEvent("WifiScan")
- public Integer startWifiBackgroundScan(@RpcParameter(name = "periodInMs") Integer periodInMs,
+ @Rpc(description = "Starts a periodic WifiScanner scan")
+ @RpcStartEvent("WifiScannerScan")
+ public Integer startWifiScannerScan(@RpcParameter(name = "periodInMs") Integer periodInMs,
@RpcParameter(name = "channel_freqs") Integer[] channel_freqs) {
WifiScanner.ScanSettings ss = new WifiScanner.ScanSettings();
ss.channels = new WifiScanner.ChannelSpec[channel_freqs.length];
@@ -288,9 +288,9 @@
ss.channels[i] = new WifiScanner.ChannelSpec(channel_freqs[i]);
}
ss.periodInMs = periodInMs;
- Log.d("startWifiBackgroundScan periodInMs " + ss.periodInMs);
+ Log.d("startWifiScannerScan periodInMs " + ss.periodInMs);
for(int i=0; i<ss.channels.length; i++) {
- Log.d("startWifiBackgroundScan " + ss.channels[i].frequency + " " + ss.channels[i].passive + " " + ss.channels[i].dwellTimeMS);
+ Log.d("startWifiScannerScan " + ss.channels[i].frequency + " " + ss.channels[i].passive + " " + ss.channels[i].dwellTimeMS);
}
WifiScanListener mListener = genWifiScanListener();
mScan.startBackgroundScan(ss, mListener);
@@ -298,14 +298,14 @@
}
/**
- * Stops a wifi background scan
+ * Stops a WifiScanner scan
* @param listener_mIndex the id of the scan listener whose scan to stop
*/
- @Rpc(description = "Stops an ongoing periodic Wifi scan in background")
- @RpcStopEvent("WifiScan")
- public void stopWifiBackgroundScan(@RpcParameter(name = "listener") Integer listener_index) {
+ @Rpc(description = "Stops an ongoing periodic WifiScanner scan")
+ @RpcStopEvent("WifiScannerScan")
+ public void stopWifiScannerScan(@RpcParameter(name = "listener") Integer listener_index) {
WifiScanListener mListener = wifiScannerListenerList.get(listener_index);
- Log.d("stopWifiBackgroundScan mListener "+ mListener.mIndex );
+ Log.d("stopWifiScannerScan mListener "+ mListener.mIndex );
mScan.stopBackgroundScan(mListener);
synchronized (wifiScannerResultList) {
wifiScannerResultList.remove(listener_index);
@@ -404,7 +404,7 @@
public void shutdown() {
if(!wifiScannerListenerList.isEmpty()) {
for(int i : wifiScannerListenerList.keySet()) {
- this.stopWifiBackgroundScan(i);
+ this.stopWifiScannerScan(i);
}
}
if(!wifiChangeListenerList.isEmpty()) {
diff --git a/ScriptingLayer/src/com/googlecode/android_scripting/facade/FacadeConfiguration.java b/ScriptingLayer/src/com/googlecode/android_scripting/facade/FacadeConfiguration.java
index 31ca648..14e6820 100644
--- a/ScriptingLayer/src/com/googlecode/android_scripting/facade/FacadeConfiguration.java
+++ b/ScriptingLayer/src/com/googlecode/android_scripting/facade/FacadeConfiguration.java
@@ -78,7 +78,7 @@
sFacadeClassList.add(SpeechRecognitionFacade.class);
sFacadeClassList.add(ToneGeneratorFacade.class);
sFacadeClassList.add(WakeLockFacade.class);
- sFacadeClassList.add(WifiFacade.class);
+ sFacadeClassList.add(WifiManagerFacade.class);
sFacadeClassList.add(UiFacade.class);
sFacadeClassList.add(BatteryManagerFacade.class);
sFacadeClassList.add(ActivityResultFacade.class);
@@ -104,10 +104,11 @@
}
if (sSdkLevel >= 18) {
- sFacadeClassList.add(ScanFacade.class);
- sFacadeClassList.add(WifiPasspointFacade.class);
sFacadeClassList.add(BluetoothLeScanFacade.class);
sFacadeClassList.add(BluetoothLeAdvertiseFacade.class);
+ sFacadeClassList.add(WifiScannerFacade.class);
+ sFacadeClassList.add(WifiPasspointManagerFacade.class);
+
}
for (Class<? extends RpcReceiver> recieverClass : sFacadeClassList) {
