Tel test: add prefix for all connectivity manager facade SL4A APIs.
And make changes also on python side.
For bug: b/23109565
Change-Id: I425d720df46264d749b12296fecf6582ab39a0be
diff --git a/Common/src/com/googlecode/android_scripting/facade/ConnectivityManagerFacade.java b/Common/src/com/googlecode/android_scripting/facade/ConnectivityManagerFacade.java
index 492cd15..f4c9100 100644
--- a/Common/src/com/googlecode/android_scripting/facade/ConnectivityManagerFacade.java
+++ b/Common/src/com/googlecode/android_scripting/facade/ConnectivityManagerFacade.java
@@ -63,16 +63,15 @@
b.getInt(ConnectivityManager.EXTRA_NETWORK_TYPE,
ConnectivityManager.TYPE_NONE);
- if(netType == ConnectivityManager.TYPE_NONE) {
+ if (netType == ConnectivityManager.TYPE_NONE) {
Log.i("ConnectivityReceiver received change to TYPE_NONE.");
return;
}
/*
- * Technically there is a race condition here, but
- * retrieving the NetworkInfo from the bundle is deprecated.
- * See ConnectivityManager.EXTRA_NETWORK_INFO
- */
+ * Technically there is a race condition here, but retrieving the NetworkInfo from the
+ * bundle is deprecated. See ConnectivityManager.EXTRA_NETWORK_INFO
+ */
for (NetworkInfo info : mManager.getAllNetworkInfo()) {
if (info.getType() == netType) {
mEventFacade.postEvent(TelephonyConstants.EventConnectivityChanged, info);
@@ -99,8 +98,8 @@
}
@Rpc(description = "Listen for connectivity changes")
- public void startTrackingConnectivityStateChange() {
- if( !mTrackingConnectivityStateChange) {
+ public void connectivityStartTrackingConnectivityStateChange() {
+ if (!mTrackingConnectivityStateChange) {
mTrackingConnectivityStateChange = true;
mContext.registerReceiver(mConnectivityReceiver,
new IntentFilter(ConnectivityManager.CONNECTIVITY_ACTION));
@@ -108,15 +107,15 @@
}
@Rpc(description = "Stop listening for connectivity changes")
- public void stopTrackingConnectivityStateChange() {
- if(mTrackingConnectivityStateChange) {
+ public void connectivityStopTrackingConnectivityStateChange() {
+ if (mTrackingConnectivityStateChange) {
mTrackingConnectivityStateChange = false;
mContext.unregisterReceiver(mConnectivityReceiver);
}
}
@Rpc(description = "Get the extra information about the network state provided by lower network layers.")
- public String networkGetActiveConnectionExtraInfo() {
+ public String connectivityNetworkGetActiveConnectionExtraInfo() {
NetworkInfo current = mManager.getActiveNetworkInfo();
if (current == null) {
Log.d("No network is active at the moment.");
@@ -126,7 +125,7 @@
}
@Rpc(description = "Return the subtype name of the current network, null if not connected")
- public String networkGetActiveConnectionSubtypeName() {
+ public String connectivityNetworkGetActiveConnectionSubtypeName() {
NetworkInfo current = mManager.getActiveNetworkInfo();
if (current == null) {
Log.d("No network is active at the moment.");
@@ -136,7 +135,7 @@
}
@Rpc(description = "Return a human-readable name describe the type of the network, e.g. WIFI")
- public String networkGetActiveConnectionTypeName() {
+ public String connectivityNetworkGetActiveConnectionTypeName() {
NetworkInfo current = mManager.getActiveNetworkInfo();
if (current == null) {
Log.d("No network is active at the moment.");
@@ -146,12 +145,12 @@
}
@Rpc(description = "Get connection status information about all network types supported by the device.")
- public NetworkInfo[] networkGetAllInfo() {
+ public NetworkInfo[] connectivityNetworkGetAllInfo() {
return mManager.getAllNetworkInfo();
}
@Rpc(description = "Check whether the active network is connected to the Internet.")
- public Boolean networkIsConnected() {
+ public Boolean connectivityNetworkIsConnected() {
NetworkInfo current = mManager.getActiveNetworkInfo();
if (current == null) {
Log.d("No network is active at the moment.");
@@ -162,7 +161,7 @@
@Rpc(description = "Checks the airplane mode setting.",
returns = "True if airplane mode is enabled.")
- public Boolean checkAirplaneMode() {
+ public Boolean connectivityCheckAirplaneMode() {
try {
return android.provider.Settings.System.getInt(mService.getContentResolver(),
android.provider.Settings.Global.AIRPLANE_MODE_ON) == AIRPLANE_MODE_ON;
@@ -173,15 +172,17 @@
@Rpc(description = "Toggles airplane mode on and off.",
returns = "True if airplane mode is enabled.")
- public void toggleAirplaneMode(@RpcParameter(name = "enabled") @RpcOptional Boolean enabled) {
+ public void connectivityToggleAirplaneMode(@RpcParameter(name = "enabled")
+ @RpcOptional
+ Boolean enabled) {
if (enabled == null) {
- enabled = !checkAirplaneMode();
+ enabled = !connectivityCheckAirplaneMode();
}
mManager.setAirplaneMode(enabled);
}
@Override
public void shutdown() {
- stopTrackingConnectivityStateChange();
+ connectivityStopTrackingConnectivityStateChange();
}
}
